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(), #3/6 refactor fetchid(), pass substring, include `upcase()'

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

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

@ -620,7 +620,7 @@ findsubckt(dico_t *dico, char *s, SPICE_DSTRINGPTR subname)
/************ input scanner stuff **************/ /************ input scanner stuff **************/
static unsigned char static unsigned char
keyword(const char *keys, const char *s) keyword(const char *keys, const char *s, const char *s_end)
{ {
/* return 0 if s not found in list keys, else the ordinal number */ /* return 0 if s not found in list keys, else the ordinal number */
unsigned char j = 1; unsigned char j = 1;
@ -630,9 +630,9 @@ keyword(const char *keys, const char *s)
for (;;) { for (;;) {
const char *p = s; const char *p = s;
while (*p && (*p == *keys)) while ((p < s_end) && (upcase(*p) == *keys))
p++, keys++; p++, keys++;
if (!*p && (*keys <= ' ')) if ((p >= s_end) && (*keys <= ' '))
return j; return j;
keys = strchr(keys, ' '); keys = strchr(keys, ' ');
if (!keys) if (!keys)
@ -1008,7 +1008,7 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
for (t = s; t < s_next;) for (t = s; t < s_next;)
cadd(&tstr, upcase(*t++)); cadd(&tstr, upcase(*t++));
{ {
fu = keyword(fmathS, spice_dstring_value(&tstr)); /* numeric function? */ fu = keyword(fmathS, s, s_next); /* numeric function? */
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 {