luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

numparam/xpressn.c, split `evaluate()' into two functions

This commit is contained in:
rlar 2017-11-04 18:33:47 +01:00
parent 6da961c3f1
commit a9a8afa12d
1 changed files with 45 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1101,16 +1101,14 @@ double_to_string(SPICE_DSTRINGPTR qstr_p, double value)
} }
/* expand parameter in string `t' to result `q' */
static bool static bool
evaluate(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode) evaluate_variable(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t)
{ {
/* transform t to result q. mode 0: expression, mode 1: simple variable */
entry_t *entry; entry_t *entry;
spice_dstring_reinit(qstr_p); spice_dstring_reinit(qstr_p);
if (mode == 1) {
/* string? */
stupcase(t); stupcase(t);
entry = entrynb(dico, t); entry = entrynb(dico, t);
@ -1118,11 +1116,10 @@ evaluate(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode)
return message(dico, return message(dico,
"\"%s\" not evaluated. Lookup failure.\n", t); "\"%s\" not evaluated. Lookup failure.\n", t);
/* data type: Real or String */
if (entry->tp == NUPA_REAL) { if (entry->tp == NUPA_REAL) {
double_to_string(qstr_p, entry->vl); double_to_string(qstr_p, entry->vl);
return 0; }
} else if (entry->tp == NUPA_STRING) { else if (entry->tp == NUPA_STRING) {
/* suppose source text "..." at */ /* suppose source text "..." at */
int j = entry->ivl + 1; int j = entry->ivl + 1;
@ -1135,14 +1132,26 @@ evaluate(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode)
cadd(qstr_p, c); cadd(qstr_p, c);
} }
} }
} else {
bool err = 0;
double u = formula(dico, t, t + strlen(t), &err);
if (err)
return err;
double_to_string(qstr_p, u);
return 0; return 0;
} }
/* transform exression in string `t' to result q */
static bool
evaluate_expr(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t)
{
bool err = 0;
double u;
spice_dstring_reinit(qstr_p);
u = formula(dico, t, t + strlen(t), &err);
if (err)
return err;
double_to_string(qstr_p, u);
return 0; return 0;
} }
@ -1233,7 +1242,7 @@ nupa_substitute(dico_t *dico, char *s, char *r, bool err)
sadd(&qstr, "last"); sadd(&qstr, "last");
err = 0; err = 0;
} else { } else {
err = evaluate(dico, &qstr, spice_dstring_value(&tstr), 0); err = evaluate_expr(dico, &qstr, spice_dstring_value(&tstr));
} }
} }
@ -1280,7 +1289,7 @@ nupa_substitute(dico_t *dico, char *s, char *r, bool err)
err = message(dico, "Closing \")\" not found.\n"); err = message(dico, "Closing \")\" not found.\n");
} else { } else {
pscopy(&tstr, s, i, k - i - 1); pscopy(&tstr, s, i, k - i - 1);
err = evaluate(dico, &qstr, spice_dstring_value(&tstr), 0); err = evaluate_expr(dico, &qstr, spice_dstring_value(&tstr));
} }
i = k; i = k;
@ -1299,7 +1308,7 @@ nupa_substitute(dico_t *dico, char *s, char *r, bool err)
} while ((k <= ls) && (d > ' ')); } while ((k <= ls) && (d > ' '));
pscopy(&tstr, s, i-1, k - i); pscopy(&tstr, s, i-1, k - i);
err = evaluate(dico, &qstr, spice_dstring_value(&tstr), 1); err = evaluate_variable(dico, &qstr, spice_dstring_value(&tstr));
i = k - 1; i = k - 1;
} }