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(), whitespace

This commit is contained in:
rlar 2017-11-18 21:43:40 +01:00
parent 6b5606edc1
commit 6c1d3ba34a
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1217,20 +1217,20 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
goto Lend; 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");
} else { } else {
err = evaluate_expr(dico, &qstr, s, kptr); err = evaluate_expr(dico, &qstr, s, kptr);
if (err) { if (err) {
err = message(dico, "Cannot compute substitute\n"); err = message(dico, "Cannot compute substitute\n");
goto Lend; goto Lend;
}
} }
}
s = kptr + 1; s = kptr + 1;
ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir)); ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
} else if (c == Intro) { } else if (c == Intro) {
/* skip "&&" which may occur in B source */ /* skip "&&" which may occur in B source */
@ -1266,7 +1266,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
goto Lend; goto Lend;
} }
err = evaluate_expr(dico, &qstr, s, kptr); err = evaluate_expr(dico, &qstr, s, kptr);
if (err) { if (err) {
message(dico, "Cannot compute &(expression)\n"); message(dico, "Cannot compute &(expression)\n");
goto Lend; goto Lend;
@ -1290,7 +1290,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
s = kptr; s = kptr;
} }
ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir)); ir = ir + (int) (insertnumber(dico, r + ir, &qstr) - (r + ir));
} }
} }