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, fetchid(), #3/15 express some facts

This commit is contained in:
rlar 2015-10-10 14:34:41 +02:00
parent 7142e0e1fc
commit e8fa81e382
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -702,8 +702,10 @@ fetchid(SPICE_DSTRINGPTR t, const char *s, const char *s_end)
char c; char c;
bool ok; bool ok;
// facts: alfa(*s) == true && s < s_end
c = *s++; c = *s++;
// facts: alfa(c) == true && s <= s_end
while (!alfa(c) && (s < s_end)) while (!alfa(c) && (s < s_end))
c = *s++; c = *s++;
@ -1053,6 +1055,7 @@ 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)) {
// facts: c == *s && s < s_end && alfa(c) == true
s = fetchid(&tstr, s, s_end); /* user id, but sort out keywords */ s = fetchid(&tstr, s, s_end); /* user id, but sort out keywords */
state = S_atom; state = S_atom;
{ {