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(), move final kptr incrementation out of the loop

This commit is contained in:
rlar 2016-05-14 13:44:56 +02:00
parent f5448025a8
commit d38804d7c0
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1210,14 +1210,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
nnest--;
if (nnest == 0) {
kptr++;
break;
}
if (d == '\0') {
kptr++;
break;
}
}
kptr++;
if (d == '\0') {
err = message(dico, "Closing \"}\" not found.\n");
@ -1268,14 +1267,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
level--;
if (kptr >= s_end) {
kptr++;
break;
}
if ((d == ')') && (level <= 0)) {
kptr++;
break;
}
}
kptr++;
if (kptr > s_end) {
err = message(dico, "Closing \")\" not found.\n");
@ -1297,14 +1295,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
d = *kptr;
if (kptr >= s_end) {
kptr++;
break;
}
if (d <= ' ') {
kptr++;
break;
}
}
kptr++;
err = evaluate_variable(dico, &qstr, s - 1, kptr - 1);
s = kptr - 1;