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

findsubname(), fix lvalues

This commit is contained in:
rlar 2017-11-23 18:25:37 +01:00
parent a7c2253c8a
commit 8df5717017
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/spicenum.c
View File

@ -155,21 +155,21 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
char * const s = spice_dstring_value(dstr_p); char * const s = spice_dstring_value(dstr_p);
char * const ls_ptr = s + spice_dstring_length(dstr_p); char * const ls_ptr = s + spice_dstring_length(dstr_p);
int (p - s - 1) = (int) (ls_ptr - s) - 1; char *p = s + 1 + (int) (ls_ptr - s) - 1;
spice_dstring_init(&name); spice_dstring_init(&name);
while ((p - s - 1) >= 0) { while ((p - s - 1) >= 0) {
/* skip space, then non-space */ /* skip space, then non-space */
while (((p - s - 1) >= 0) && (s[(p - s - 1)] <= ' ')) while (((p - s - 1) >= 0) && (s[(p - s - 1)] <= ' '))
(p - s - 1)--; p--;
int h = (int) (p - s - 1) + 1; /* at h: space */ int h = (int) (p - s - 1) + 1; /* at h: space */
while (((p - s - 1) >= 0) && (s[(p - s - 1)] > ' ')) { while (((p - s - 1) >= 0) && (s[(p - s - 1)] > ' ')) {
if (s[(p - s - 1)] == '}') { if (s[(p - s - 1)] == '}') {
int nest = 1; int nest = 1;
(p - s - 1)--; p--;
while ((nest > 0) && ((p - s - 1) >= 0)) { while ((nest > 0) && ((p - s - 1) >= 0)) {
if (s[(p - s - 1)] == '{') if (s[(p - s - 1)] == '{')
@ -177,12 +177,12 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
else if (s[(p - s - 1)] == '}') else if (s[(p - s - 1)] == '}')
nest++; nest++;
(p - s - 1)--; p--;
} }
h = (int) (p - s - 1) + 1; /* h points to '{' */ h = (int) (p - s - 1) + 1; /* h points to '{' */
} else { } else {
(p - s - 1)--; p--;
} }
} }