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

xpressn.c, implement a?b:c in the "formula" parser

This commit is contained in:
rlar 2013-10-15 19:20:52 +02:00
parent 1b959e6a50
commit 1ac45bfd57
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -973,6 +973,12 @@ fetchoperator(tdico *dico,
level = 7; level = 7;
} else if (c == '!') { } else if (c == '!') {
state = S_unop; state = S_unop;
} else if (c == '?') {
state = S_binop;
level = 9;
} else if (c == ':') {
state = S_binop;
level = 8;
} else { } else {
state = S_init; state = S_init;
if (c > ' ') if (c > ' ')
@ -1322,10 +1328,30 @@ formula(tdico *dico, const char *s, const char *s_end, bool *perror)
if ((state == S_binop) || (state == S_stop)) { if ((state == S_binop) || (state == S_stop)) {
/* do pending binaries of priority Upto "level" */ /* do pending binaries of priority Upto "level" */
for (i = 1; i <= level; i++) { for (i = 1; i <= level; i++) {
if (i < level && oper[i] == ':' && (oper[i+1] == '?' || oper[i+1] == 'x')) {
if (oper[i+1] == 'x') {
/* this is a `first-of-triple' op */
accu[i+1] = accu[i+1];
c = 'x'; /* transform next '?' to 'first-of-triple' */
} else if (accu[i+1] != 0.0) {
/* this is a `true' ternary */
accu[i+1] = accu[i];
c = 'x'; /* transform next '?' to `first-of-triple' */
} else {
/* this is a `false' ternary */
accu[i+1] = accu[i-1];
}
accu[i-1] = 0.0;
oper[i] = ' '; /* reset intermediates */
i++;
accu[i-1] = 0.0;
oper[i] = ' '; /* reset intermediates */
} else {
/* not yet speed optimized! */ /* not yet speed optimized! */
accu[i] = operate(oper[i], accu[i], accu[i - 1]); accu[i] = operate(oper[i], accu[i], accu[i - 1]);
accu[i - 1] = 0.0; accu[i - 1] = 0.0;
oper[i] = ' '; /* reset intermediates */ oper[i] = ' '; /* reset intermediates */
}
} }
oper[level] = c; oper[level] = c;