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

findsubname(), drop `found', which is constantly 0 

because of the previous commit
This commit is contained in:
rlar 2017-11-23 18:07:14 +01:00
parent f0cead24b8
commit 45f3749bb1
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/frontend/numparam/spicenum.c
View File

@ -154,17 +154,15 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
SPICE_DSTRING name; /* extract a name */ SPICE_DSTRING name; /* extract a name */
char *s; /* current dstring */ char *s; /* current dstring */
int h, j, k, nest, ls; int h, j, k, nest, ls;
int found;
h = 0; h = 0;
ls = spice_dstring_length(dstr_p); ls = spice_dstring_length(dstr_p);
s = spice_dstring_value(dstr_p); s = spice_dstring_value(dstr_p);
k = ls - 1; /* now a C - string */ k = ls - 1; /* now a C - string */
found = 0;
spice_dstring_init(&name); spice_dstring_init(&name);
while ((k >= 0) && (!found)) { while (k >= 0) {
/* skip space, then non-space */ /* skip space, then non-space */
while ((k >= 0) && (s[k] <= ' ')) while ((k >= 0) && (s[k] <= ' '))
@ -192,8 +190,7 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
} }
} }
found = (k >= 0) && alfanum(s[k + 1]); /* suppose an identifier */ if ((k >= 0) && alfanum(s[k + 1])) { /* suppose an identifier */
if (found) {
entry_t *entry; entry_t *entry;
/* check for known subckt name */ /* check for known subckt name */
spice_dstring_reinit(&name); spice_dstring_reinit(&name);
@ -203,17 +200,13 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
j++; j++;
} }
entry = entrynb(dico, spice_dstring_value(&name)); entry = entrynb(dico, spice_dstring_value(&name));
found = entry && (entry->tp == NUPA_SUBCKT); if (entry && (entry->tp == NUPA_SUBCKT)) {
if (found) { if (h < ls)
if (found && (h < ls))
pscopy(dstr_p, s, 0, h); pscopy(dstr_p, s, 0, h);
return; return;
} }
} }
} }
if (found && (h < ls))
pscopy(dstr_p, s, 0, h);
} }