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, formula(), #2/6 move dstring buildup out of `fetchid()'

This commit is contained in:
rlar 2015-10-11 14:39:05 +02:00
parent d6ce788539
commit 1d9592c591
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -663,18 +663,14 @@ parseunit(const char *s)
static const char * static const char *
fetchid(SPICE_DSTRINGPTR t, const char *s, const char *s_end) fetchid(const char *s, const char *s_end)
{ {
spice_dstring_reinit(t);
for (; s < s_end; s++) { for (; s < s_end; s++) {
char c = *s; char c = *s;
if (!(alfanum(c) || c == '.')) if (!(alfanum(c) || c == '.'))
return s; return s;
cadd(t, upcase(c));
} }
return s; return s;
@ -1006,7 +1002,11 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
s = kptr; s = kptr;
fu = 0; fu = 0;
} else if (alfa(c)) { } else if (alfa(c)) {
s = fetchid(&tstr, s, s_end); /* user id, but sort out keywords */ const char *s_next = fetchid(s, s_end);
const char *t;
spice_dstring_reinit(&tstr);
for (t = s; t < s_next;)
cadd(&tstr, upcase(*t++));
{ {
fu = keyword(fmathS, spice_dstring_value(&tstr)); /* numeric function? */ fu = keyword(fmathS, spice_dstring_value(&tstr)); /* numeric function? */
if (fu > 0) { if (fu > 0) {
@ -1016,6 +1016,7 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
state = S_atom; state = S_atom;
} }
} }
s = s_next;
} else if (((c == '.') || ((c >= '0') && (c <= '9')))) { } else if (((c == '.') || ((c >= '0') && (c <= '9')))) {
u = fetchnumber(dico, &s, &error); u = fetchnumber(dico, &s, &error);
if (negate) { if (negate) {