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

fix @spice_get_*_*(...) regex

This commit is contained in:
stefan schippers 2025-02-14 13:32:17 +01:00
parent e9c927d882
commit 05434cb5e4
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/token.c
View File

@ -3826,11 +3826,11 @@ const char *translate(int inst, const char* s)
#ifdef __unix__ #ifdef __unix__
if(!get_sp_cur) { if(!get_sp_cur) {
get_sp_cur = my_malloc(_ALLOC_ID_, sizeof(regex_t)); get_sp_cur = my_malloc(_ALLOC_ID_, sizeof(regex_t));
/* @spice_get_current_param(...) or @spice_get_modelparam_param(...) */ /* @spice_get_current_<param>(...) or @spice_get_modelparam_<param>(...) */
/* @spice_get_current(...) or @spice_get_modelparam(...) */ /* @spice_get_current(...) or @spice_get_modelparam(...) */
/* @spice_get_modelvoltage(...) or @spice_get_modelvoltage_param(...) */ /* @spice_get_modelvoltage(...) or @spice_get_modelvoltage_<param>(...) */
regcomp(get_sp_cur, regcomp(get_sp_cur,
"^@spice_get_(current|modelparam|modelvoltage)([_a-zA-Z][a-zA-Z0-9_]*)*\\(", REG_NOSUB | REG_EXTENDED); "^@spice_get_(current|modelparam|modelvoltage)(_[a-zA-Z][a-zA-Z0-9_]*)*\\(", REG_NOSUB | REG_EXTENDED);
} }
#endif #endif
@ -4158,16 +4158,16 @@ const char *translate(int inst, const char* s)
} }
} }
} }
/* @spice_get_current(...) or @spice_get_current_param(...) /* @spice_get_current(...) or @spice_get_current_<param>(...)
* @spice_get_modelparam(...) or @spice_get_modelparam_param(...) * @spice_get_modelparam(...) or @spice_get_modelparam_<param>(...)
* @spice_get_modelvoltage(...) or @spice_get_modelvoltage_param(...) * @spice_get_modelvoltage(...) or @spice_get_modelvoltage_<param>(...)
* *
* Only @spice_get_current(...) and @spice_get_current_param(...) are processed * Only @spice_get_current(...) and @spice_get_current_<param>(...) are processed
* the other types are ignored */ * the other types are ignored */
#ifdef __unix__ #ifdef __unix__
else if(!regexec(get_sp_cur, token, 0 , NULL, 0) ) else if(!regexec(get_sp_cur, token, 0 , NULL, 0) )
# else # else
else if ((win_regexec(NULL/*options*/, "^@spice_get_(current|modelparam|modelvoltage)([_a-zA-Z][a-zA-Z0-9_]*)*\\(", token))) else if ((win_regexec(NULL/*options*/, "^@spice_get_(current|modelparam|modelvoltage)(_[a-zA-Z][a-zA-Z0-9_]*)*\\(", token)))
#endif #endif
{ {
int start_level; /* hierarchy level where waves were loaded */ int start_level; /* hierarchy level where waves were loaded */
@ -4194,7 +4194,8 @@ const char *translate(int inst, const char* s)
n = sscanf(token + 19, "%[^)]", dev); n = sscanf(token + 19, "%[^)]", dev);
} else { } else {
param = my_malloc(_ALLOC_ID_, tmp); param = my_malloc(_ALLOC_ID_, tmp);
n = sscanf(token, "@spice_get_current_%s(%[^)]", param, dev); n = sscanf(token, "@spice_get_current_%[^(](%[^)]", param, dev);
dbg(1, "token=%s, param=%s, dev=%s\n", token, param, dev);
if(n < 2) { if(n < 2) {
my_free(_ALLOC_ID_, &param); my_free(_ALLOC_ID_, &param);
n = sscanf(token, "@spice_get_current[^(](%[^)]", dev); n = sscanf(token, "@spice_get_current[^(](%[^)]", dev);
@ -4219,6 +4220,7 @@ const char *translate(int inst, const char* s)
my_snprintf(fqdev, len, "i(@%c.%s%s.%s[%s])", prefix, path, instname, dev, param ? param : "ic"); my_snprintf(fqdev, len, "i(@%c.%s%s.%s[%s])", prefix, path, instname, dev, param ? param : "ic");
} else if(prefix == 'd' || prefix == 'm') { } else if(prefix == 'd' || prefix == 'm') {
my_snprintf(fqdev, len, "i(@%c.%s%s.%s[%s])", prefix, path, instname, dev, param ? param : "id"); my_snprintf(fqdev, len, "i(@%c.%s%s.%s[%s])", prefix, path, instname, dev, param ? param : "id");
dbg(1, "translate(): fqdev=%s\n", fqdev);
} else if(prefix == 'i') { } else if(prefix == 'i') {
my_snprintf(fqdev, len, "i(@%c.%s%s.%s[current])", prefix, path, instname, dev); my_snprintf(fqdev, len, "i(@%c.%s%s.%s[current])", prefix, path, instname, dev);
} else { } else {