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

nupa_subcktcall(), ls ==> ls_ptr - (const) t_p

This commit is contained in:
rlar 2016-05-16 11:54:17 +02:00
parent 701dcad9a4
commit ec9636e078
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontend/numparam/xpressn.c
View File

@ -1579,7 +1579,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
int j0 = 0; int j0 = 0;
char * const t_p = spice_dstring_value(&tstr); char * const t_p = spice_dstring_value(&tstr);
const int ls = spice_dstring_length(&tstr); const int (ls_ptr - t_p) = spice_dstring_length(&tstr);
spice_dstring_init(&parsebuf); spice_dstring_init(&parsebuf);
scopyd(&parsebuf, &tstr); scopyd(&parsebuf, &tstr);
@ -1604,10 +1604,10 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
if (found) { if (found) {
char *jp = t_p + j0 + spice_dstring_length(&subname) + 1; /* 1st position of arglist: jp */ char *jp = t_p + j0 + spice_dstring_length(&subname) + 1; /* 1st position of arglist: jp */
while (((jp - t_p) < ls) && ((t_p[(jp - t_p)] <= ' ') || (t_p[(jp - t_p)] == ','))) while (((jp - t_p) < (ls_ptr - t_p)) && ((t_p[(jp - t_p)] <= ' ') || (t_p[(jp - t_p)] == ',')))
jp++; jp++;
while ((jp - t_p) < ls) { while ((jp - t_p) < (ls_ptr - t_p)) {
/* try to fetch valid arguments */ /* try to fetch valid arguments */
char *kp = t_p + (int) (jp - t_p); char *kp = t_p + (int) (jp - t_p);
@ -1625,7 +1625,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
char *gp = t_p + (int) (kp - t_p); char *gp = t_p + (int) (kp - t_p);
int nest = 1; int nest = 1;
while ((nest > 0) && ((gp - t_p) < ls)) { while ((nest > 0) && ((gp - t_p) < (ls_ptr - t_p))) {
gp++; gp++;
if (t_p[(gp - t_p)] == '(') if (t_p[(gp - t_p)] == '(')
nest++; nest++;
@ -1633,7 +1633,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
nest--; nest--;
} }
if (((gp - t_p) < ls) && (nest == 0)) if (((gp - t_p) < (ls_ptr - t_p)) && (nest == 0))
t_p[(gp - t_p)] = '}'; t_p[(gp - t_p)] = '}';
} }
} }