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 `j'

This commit is contained in:
rlar 2016-05-14 20:52:26 +02:00
parent 13d9ecd517
commit 81e02154be
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1489,7 +1489,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
x= a matching subckt call line, with actual params x= a matching subckt call line, with actual params
*/ */
{ {
int n, i, j, found_j, k, g, h, narg = 0, ls, nest; int n, i, j1, found_j, k, g, h, narg = 0, ls, nest;
SPICE_DSTRING subname; SPICE_DSTRING subname;
SPICE_DSTRING tstr; SPICE_DSTRING tstr;
SPICE_DSTRING ustr; SPICE_DSTRING ustr;
@ -1514,17 +1514,17 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
scopy_up(&tstr, s); scopy_up(&tstr, s);
j = spos_("SUBCKT", spice_dstring_value(&tstr)); j1 = spos_("SUBCKT", spice_dstring_value(&tstr));
if (j >= 0) { if (j1 >= 0) {
j = j + 6; /* fetch its name - skip subckt */ j1 = j1 + 6; /* fetch its name - skip subckt */
t_p = spice_dstring_value(&tstr); t_p = spice_dstring_value(&tstr);
while ((j < ls) && (t_p[j] <= ' ')) while ((j1 < ls) && (t_p[j1] <= ' '))
j++; j1++;
while ((j < ls) && (t_p[j] != ' ')) { while ((j1 < ls) && (t_p[j1] != ' ')) {
cadd(&subname, t_p[j]); cadd(&subname, t_p[j1]);
j++; j1++;
} }
} else { } else {
err = message(dico, " ! a subckt line!\n"); err = message(dico, " ! a subckt line!\n");
@ -1583,7 +1583,7 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
same name as subckt 'x1' same name as subckt 'x1'
*/ */
scopy_up(&tstr, skip_non_ws(x)); scopy_up(&tstr, skip_non_ws(x));
j = 0; int j = 0;
ls = spice_dstring_length(&tstr); ls = spice_dstring_length(&tstr);