luke
/
xschem
mirror of https://github.com/StefanSchippers/xschem.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

windows lack regexp search--> use substring search

This commit is contained in:
Stefan Frederik 2022-01-21 03:27:32 +01:00
parent 7ee2c1bbc9
commit 609d0d0fdf
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/hilight.c
View File

@ -625,7 +625,8 @@ int search(const char *tok, const char *val, int sub, int sel)
if( (!regexec(&re, str,0 , NULL, 0) && !sub) || /* 20071120 regex instead of strcmp */ if( (!regexec(&re, str,0 , NULL, 0) && !sub) || /* 20071120 regex instead of strcmp */
(!strcmp(str, val) && sub && !bus) || (strstr(str,val) && sub && bus)) (!strcmp(str, val) && sub && !bus) || (strstr(str,val) && sub && bus))
#else #else
if ((!strcmp(str, val) && sub && !bus) || (strstr(str,val) && sub && bus)) if( (strstr(str,val) && !sub) ||
(!strcmp(str, val) && sub && !bus) || (strstr(str,val) && sub && bus))
#endif #endif
{ {
if(!sel) { if(!sel) {

4
src/scheduler.c
View File

@ -2773,7 +2773,7 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
else if(!strcmp(argv[1],"wire")) else if(!strcmp(argv[1],"wire"))
{ {
double x1,y1,x2,y2; double x1,y1,x2,y2;
int pos, save, sel = 0; int pos = -1, save, sel = 0;
const char *prop=NULL; const char *prop=NULL;
cmd_found = 1; cmd_found = 1;
if(argc>=6) { if(argc>=6) {
@ -2782,11 +2782,9 @@ int xschem(ClientData clientdata, Tcl_Interp *interp, int argc, const char * arg
x2=atof(argv[4]); x2=atof(argv[4]);
y2=atof(argv[5]); y2=atof(argv[5]);
ORDER(x1,y1,x2,y2); ORDER(x1,y1,x2,y2);
pos=-1;
if(argc >= 7) pos=atoi(argv[6]); if(argc >= 7) pos=atoi(argv[6]);
if(argc >= 8) prop = argv[7]; if(argc >= 8) prop = argv[7];
if(argc >= 9) sel = atoi(argv[8]); if(argc >= 9) sel = atoi(argv[8]);
else prop = NULL;
xctx->push_undo(); xctx->push_undo();
storeobject(pos, x1,y1,x2,y2,WIRE,0,sel,prop); storeobject(pos, x1,y1,x2,y2,WIRE,0,sel,prop);
xctx->prep_hi_structs=0; xctx->prep_hi_structs=0;