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

nupa_substitute(), cleanup

This commit is contained in:
rlar 2016-05-01 15:53:22 +02:00
parent 81cb1ed674
commit c036fa0519
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1207,8 +1207,8 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
const char *kptr; const char *kptr;
while ((s < s_end) && !err) { while ((s < s_end) && !err) {
s++;
c = s[-1]; c = *s++;
if (c == '{') { if (c == '{') {
/* try ps expression syntax */ /* try ps expression syntax */
@ -1217,8 +1217,8 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
do do
{ {
kptr++; d = *kptr++;
d = kptr[-1];
if (d == '{') if (d == '{')
nnest++; nnest++;
else if (d == '}') else if (d == '}')
@ -1267,11 +1267,12 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
do do
{ {
kptr++; if (kptr >= s_end)
if (kptr > s_end)
d = '\0'; d = '\0';
else else
d = kptr[-1]; d = *kptr;
kptr++;
if (d == '(') if (d == '(')
level++; level++;
@ -1295,11 +1296,12 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
do do
{ {
kptr++; if (kptr >= s_end)
if (kptr > s_end)
d = '\0'; d = '\0';
else else
d = kptr[-1]; d = *kptr;
kptr++;
} while ((kptr <= s_end) && (d > ' ')); } while ((kptr <= s_end) && (d > ' '));