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(), #6/6 simplify

This commit is contained in:
rlar 2015-11-07 19:11:54 +01:00
parent a805fe6b56
commit b137930330
1 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -665,13 +665,9 @@ parseunit(const char *s)
static const char * static const char *
fetchid(const char *s, const char *s_end) fetchid(const char *s, const char *s_end)
{ {
for (; s < s_end; s++) { for (; s < s_end; s++)
if (!(alfanum(*s) || *s == '.'))
char c = *s;
if (!(alfanum(c) || c == '.'))
return s; return s;
}
return s; return s;
} }
@ -1007,10 +1003,9 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
if (fu > 0) { if (fu > 0) {
state = S_init; /* S_init means: ignore for the moment */ state = S_init; /* S_init means: ignore for the moment */
} else { } else {
const char *t;
spice_dstring_reinit(&tstr); spice_dstring_reinit(&tstr);
for (t = s; t < s_next;) while (s < s_next)
cadd(&tstr, upcase(*t++)); cadd(&tstr, upcase(*s++));
u = fetchnumentry(dico, spice_dstring_value(&tstr), &error); u = fetchnumentry(dico, spice_dstring_value(&tstr), &error);
state = S_atom; state = S_atom;
} }