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-15 20:21:05 +02:00
parent 53b23cf4b6
commit 03abdc65f5
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1231,7 +1231,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
if (d == '\0') {
err = message(dico, "Closing \"}\" not found.\n");
} else {
pscopy(&tstr, s + (iptr - s), (iptr - s) - (iptr - s), (int) (kptr - iptr - 1));
pscopy(&tstr, iptr, 0, (int) (kptr - iptr - 1));
/* exeption made for .meas */
if (strcasecmp(spice_dstring_value(&tstr), "LAST") == 0) {
spice_dstring_reinit(&qstr);
@ -1285,7 +1285,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
if (kptr > s_end) {
err = message(dico, "Closing \")\" not found.\n");
} else {
pscopy(&tstr, s + (iptr - s), (iptr - s) - (iptr - s), (int) (kptr - iptr - 1));
pscopy(&tstr, iptr, 0, (int) (kptr - iptr - 1));
const char *xx = spice_dstring_value(&tstr);
err = evaluate_expr(dico, &qstr, xx, xx + strlen(xx));
}
@ -1305,7 +1305,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
} while ((kptr <= s_end) && (d > ' '));
pscopy(&tstr, s + (iptr - s - 1), (iptr - s)-1 - (iptr - s - 1), (int) (kptr - iptr));
pscopy(&tstr, iptr - 1, 0, (int) (kptr - iptr));
const char *xx = spice_dstring_value(&tstr);
err = evaluate_variable(dico, &qstr, xx, xx + strlen(xx));
iptr = kptr - 1;