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(), split personality of `t_p'

This commit is contained in:
rlar 2017-11-19 11:43:25 +01:00
parent f17521fa4c
commit c133f21ef7
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1497,7 +1497,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
SPICE_DSTRING idlist; SPICE_DSTRING idlist;
SPICE_DSTRING parsebuf; SPICE_DSTRING parsebuf;
char *buf, *token; char *buf, *token;
char *t_p; char *t_p1;
char *u_p; char *u_p;
bool found; bool found;
bool err = 0; bool err = 0;
@ -1517,12 +1517,12 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
if (j1 >= 0) { if (j1 >= 0) {
j1 = j1 + 6; /* fetch its name - skip subckt */ j1 = j1 + 6; /* fetch its name - skip subckt */
t_p = spice_dstring_value(&tstr); t_p1 = spice_dstring_value(&tstr);
while (t_p[j1] && (t_p[j1] <= ' ')) while (t_p1[j1] && (t_p1[j1] <= ' '))
j1++; j1++;
while (t_p[j1] && (t_p[j1] != ' ')) { while (t_p1[j1] && (t_p1[j1] != ' ')) {
cadd(&subname, t_p[j1]); cadd(&subname, t_p1[j1]);
j1++; j1++;
} }
} else { } else {
@ -1584,6 +1584,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
scopy_up(&tstr, skip_non_ws(x)); scopy_up(&tstr, skip_non_ws(x));
int j = 0; int j = 0;
char * const t_p = spice_dstring_value(&tstr);
const int ls = spice_dstring_length(&tstr); const int ls = spice_dstring_length(&tstr);
spice_dstring_init(&parsebuf); spice_dstring_init(&parsebuf);
@ -1609,7 +1610,6 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
if (found) { if (found) {
j = j + spice_dstring_length(&subname) + 1; /* 1st position of arglist: j */ j = j + spice_dstring_length(&subname) + 1; /* 1st position of arglist: j */
t_p = spice_dstring_value(&tstr);
while ((j < ls) && ((t_p[j] <= ' ') || (t_p[j] == ','))) while ((j < ls) && ((t_p[j] <= ' ') || (t_p[j] == ',')))
j++; j++;