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

keep sign together with number when preparing B source pwl (and others) 

Seems to be optional, B Source handles numbers with offset sign
This commit is contained in:
Holger Vogt 2017-12-31 10:27:37 +01:00
parent 113060473e
commit 8d89202161
1 changed files with 21 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontend/inpcom.c
View File

@ -5637,6 +5637,9 @@ inp_modify_exp(char* expr)
s = expr;
while (*(s = skip_ws(s))) {
static bool c_arith_prev = FALSE;
bool c_arith = FALSE;
char c_prev;
char c = *s;
wl_append_word(&wlist, &wl, NULL);
@ -5649,10 +5652,26 @@ inp_modify_exp(char* expr)
if ((c == '*') && (s[1] == '*')) {
wl->wl_word = tprintf("**");
s += 2;
} else if (c == '-' && c_arith_prev && c_prev != ')') {
/* enter whole number string if '-' is a sign */
int error1;
/* allow 100p, 5MEG etc. */
double dvalue = INPevaluate(&s, &error1, 0);
if(error1) {
wl->wl_word = tprintf("%c", c);
s++;
}
else {
wl->wl_word = tprintf("%18.10e", dvalue);
/* skip the `unit', FIXME INPevaluate() should do this */
while (isalpha_c(*s))
s++;
}
} else {
wl->wl_word = tprintf("%c", c);
s++;
}
c_arith = TRUE;
} else if ((c == '>') || (c == '<') ||
(c == '!') || (c == '='))
{
@ -5727,6 +5746,8 @@ inp_modify_exp(char* expr)
printf("Preparing expression for numparam\nWhat is this?\n%s\n", s);
wl->wl_word = tprintf("%c", *s++);
}
c_prev = c;
c_arith_prev = c_arith;
}
expr = wl_flatten(wlist);