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

stripbraces(), fix lvalue and cleanup

This commit is contained in:
rlar 2017-11-17 17:16:53 +01:00
parent 686329dcaf
commit 186352b7e5
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,16 +109,16 @@ stripbraces(SPICE_DSTRINGPTR dstr_p)
/* something to strip */ /* something to strip */
j_ptr - s = i + 1; const char *j_ptr = s + i + 1;
nest = 1; nest = 1;
n++; n++;
while ((nest > 0) && s[j_ptr - s]) { while ((nest > 0) && *j_ptr) {
if (s[j_ptr - s] == '{') if (*j_ptr == '{')
nest++; nest++;
else if (s[j_ptr - s] == '}') else if (*j_ptr == '}')
nest--; nest--;
(j_ptr - s)++; j_ptr++;
} }
pscopy(&tstr, s, 0, i); pscopy(&tstr, s, 0, i);
@ -134,11 +134,11 @@ stripbraces(SPICE_DSTRINGPTR dstr_p)
} }
cadd(&tstr, ' '); cadd(&tstr, ' ');
if (s[j_ptr - s] >= ' ') if (*j_ptr >= ' ')
cadd(&tstr, ' '); cadd(&tstr, ' ');
int ilen = spice_dstring_length(&tstr); int ilen = spice_dstring_length(&tstr);
sadd(&tstr, s + (j_ptr - s)); sadd(&tstr, j_ptr);
scopyd(dstr_p, &tstr); scopyd(dstr_p, &tstr);
s0 = spice_dstring_value(dstr_p); s0 = spice_dstring_value(dstr_p);
i = ilen; i = ilen;