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 return on error

This commit is contained in:
rlar 2016-05-05 22:38:18 +02:00
parent cba740f88d
commit 6b5606edc1
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1190,7 +1190,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
spice_dstring_init(&qstr); spice_dstring_init(&qstr);
const char * const s_end = strchr(s, '\0'); const char * const s_end = strchr(s, '\0');
while ((s < s_end) && !err) { while (s < s_end) {
char c = *s++; char c = *s++;
@ -1214,22 +1214,23 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
if (*kptr == '\0') { if (*kptr == '\0') {
err = message(dico, "Closing \"}\" not found.\n"); err = message(dico, "Closing \"}\" not found.\n");
} else { goto Lend;
}
/* exeption made for .meas */ /* exeption made for .meas */
if (s + 4 == kptr && strncasecmp(s, "LAST", 4) == 0) { if (s + 4 == kptr && strncasecmp(s, "LAST", 4) == 0) {
spice_dstring_reinit(&qstr); spice_dstring_reinit(&qstr);
sadd(&qstr, "last"); sadd(&qstr, "last");
err = 0;
} else { } else {
err = evaluate_expr(dico, &qstr, s, kptr); err = evaluate_expr(dico, &qstr, s, kptr);
if (err) {
err = message(dico, "Cannot compute substitute\n");
goto Lend;
}
} }
}
s = kptr + 1; s = kptr + 1;
if (!err)
ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir)); ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
else
err = message(dico, "Cannot compute substitute\n");
} else if (c == Intro) { } else if (c == Intro) {
/* skip "&&" which may occur in B source */ /* skip "&&" which may occur in B source */
@ -1262,8 +1263,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
if (kptr >= s_end) { if (kptr >= s_end) {
err = message(dico, "Closing \")\" not found.\n"); err = message(dico, "Closing \")\" not found.\n");
} else { goto Lend;
}
err = evaluate_expr(dico, &qstr, s, kptr); err = evaluate_expr(dico, &qstr, s, kptr);
if (err) {
message(dico, "Cannot compute &(expression)\n");
goto Lend;
} }
s = kptr + 1; s = kptr + 1;
@ -1277,16 +1283,18 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
break; break;
err = evaluate_variable(dico, &qstr, s, kptr); err = evaluate_variable(dico, &qstr, s, kptr);
if (err) {
message(dico, "Cannot compute &identifier\n");
goto Lend;
}
s = kptr; s = kptr;
} }
if (!err)
ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir)); ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
else
message(dico, "Cannot compute &(expression)\n");
} }
} }
Lend:
spice_dstring_free(&qstr); spice_dstring_free(&qstr);
return err; return err;