luke/ngspice
1
0
Fork 0
mirror of https://git.code.sf.net/p/ngspice/ngspice synced 2026-09-06 20:46:42 +02:00
Code Issues Packages Projects Releases Wiki Activity

nupa_substitute(), break sooner

Browse Source
This commit is contained in:
rlar
2018-02-17 19:15:55 +01:00
parent baf76512b3
commit c06dddc4db
1 changed files with 8 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/frontend/numparam/xpressn.c
+8 -16
View File
@@ -1202,6 +1202,8 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
for (;; kptr++) {
char d = *kptr;
if (d == '\0')
break;
if (d == '{')
nnest++;
@@ -1211,9 +1213,6 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
if (nnest == 0) {
break;
}
if (d == '\0') {
break;
}
}
if (*kptr == '\0') {
@@ -1255,19 +1254,16 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
for (;; kptr++) {
char d;
if (kptr >= s_end)
d = '\0';
else
d = *kptr;
if (kptr >= s_end) {
break;
}
d = *kptr;
if (d == '(')
level++;
else if (d == ')')
level--;
if (kptr >= s_end) {
break;
}
if ((d == ')') && (level <= 0)) {
break;
}
@@ -1289,13 +1285,9 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
char d;
if (kptr >= s_end)
d = '\0';
else
d = *kptr;
if (kptr >= s_end) {
break;
}
d = *kptr;
if (d <= ' ') {
break;
}