luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Start replacing identifiers by func only after the first '='

This commit is contained in:
Holger Vogt 2021-06-18 16:18:40 +02:00
parent 36069467fb
commit d0ca6a4773
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/frontend/inpcom.c
View File

@ -863,6 +863,7 @@ struct card *inp_readall(FILE *fp, const char *dir_name,
int ii; int ii;
for (ii = 0; ii < 5; ii++) for (ii = 0; ii < 5; ii++)
inp_fix_agauss_in_param(working, statfcn[ii]); inp_fix_agauss_in_param(working, statfcn[ii]);
inp_fix_temper_in_param(working); inp_fix_temper_in_param(working);
inp_expand_macros_in_deck(NULL, working); inp_expand_macros_in_deck(NULL, working);
@ -7109,7 +7110,10 @@ static char *inp_functionalise_identifier(char *curr_line, char *identifier)
size_t len = strlen(identifier); size_t len = strlen(identifier);
char *p, *str = curr_line; char *p, *str = curr_line;
for (p = str; (p = search_identifier(p, identifier, str)) != NULL;) /* Start replacing identifier by func only after the first '=' */
char* estr = strchr(curr_line, '=');
for (p = estr; (p = search_identifier(p, identifier, str)) != NULL;)
if (p[len] != '(') { if (p[len] != '(') {
int prefix_len = (int) (p + len - str); int prefix_len = (int) (p + len - str);
char *x = str; char *x = str;