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(), make use of the transformations

This commit is contained in:
rlar 2016-05-15 20:31:07 +02:00
parent 2a446c2119
commit 06501162e5
1 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1199,10 +1199,8 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
bool err = 0;
SPICE_DSTRING qstr; /* temp result dynamic string */
SPICE_DSTRING tstr; /* temp dynamic string */
spice_dstring_init(&qstr);
spice_dstring_init(&tstr);
const char * const s_end = strchr(s, '\0');
const char *kptr;
@ -1229,15 +1227,13 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
if (d == '\0') {
err = message(dico, "Closing \"}\" not found.\n");
} else {
pscopy(&tstr, s, 0, (int) (kptr - s - 1));
/* exeption made for .meas */
if (s + 4 == kptr - 1 && strncasecmp(s, "LAST", 4) == 0) {
spice_dstring_reinit(&qstr);
sadd(&qstr, "last");
err = 0;
} else {
const char *xx = spice_dstring_value(&tstr);
err = evaluate_expr(dico, &qstr, xx, xx + strlen(xx));
err = evaluate_expr(dico, &qstr, s, kptr - 1);
}
}
@ -1284,9 +1280,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
if (kptr > s_end) {
err = message(dico, "Closing \")\" not found.\n");
} else {
pscopy(&tstr, s, 0, (int) (kptr - s - 1));
const char *xx = spice_dstring_value(&tstr);
err = evaluate_expr(dico, &qstr, xx, xx + strlen(xx));
err = evaluate_expr(dico, &qstr, s, kptr - 1);
}
s = kptr;
@ -1305,9 +1299,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
} while ((kptr <= s_end) && (d > ' '));
pscopy(&tstr, s - 1, 0, (int) (kptr - s));
const char *xx = spice_dstring_value(&tstr);
err = evaluate_variable(dico, &qstr, xx, xx + strlen(xx));
err = evaluate_variable(dico, &qstr, s - 1, kptr - 1);
s = kptr - 1;
}
@ -1319,7 +1311,6 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
}
spice_dstring_free(&qstr);
spice_dstring_free(&tstr);
return err;
}