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(), move code down to a better place

This commit is contained in:
rlar 2017-11-25 15:09:20 +01:00
parent 1987559e89
commit fa1c710f68
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1508,13 +1508,6 @@ nupa_subcktcall(dico_t *dico, char *s, char *x, char *inst_name)
spice_dstring_init(&vstr); spice_dstring_init(&vstr);
spice_dstring_init(&idlist); spice_dstring_init(&idlist);
/*
skip over instance name -- fixes bug where instance 'x1' is
same name as subckt 'x1'
*/
while (*x && *x != ' ')
x++;
/***** first, analyze the subckt definition line */ /***** first, analyze the subckt definition line */
n = 0; /* number of parameters if any */ n = 0; /* number of parameters if any */
ls = (int) strlen(s); ls = (int) strlen(s);
@ -1585,6 +1578,12 @@ nupa_subcktcall(dico_t *dico, char *s, char *x, char *inst_name)
/***** next, analyze the circuit call line */ /***** next, analyze the circuit call line */
if (!err) { if (!err) {
/*
skip over instance name -- fixes bug where instance 'x1' is
same name as subckt 'x1'
*/
while (*x && *x != ' ')
x++;
scopy_up(&tstr, x); scopy_up(&tstr, x);
j = 0; j = 0;