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(), #15/15 cleanup

This commit is contained in:
rlar 2015-10-10 16:21:07 +02:00
parent ba9c7f060b
commit 0390736faa
1 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -697,21 +697,13 @@ parseunit(const char *s)
static const char * static const char *
fetchid(SPICE_DSTRINGPTR t, const char *s, const char *s_end) fetchid(SPICE_DSTRINGPTR t, const char *s, const char *s_end)
/* copy next identifier from s into t, advance and return scan index i */
{ {
spice_dstring_reinit(t); spice_dstring_reinit(t);
// facts: alfa(*s) == true && s < s_end
// facts: alfa(c) == true && s <= s_end
for (; s < s_end; s++) { for (; s < s_end; s++) {
char c = *s; char c = *s;
// facts: upcase('\0') == '\0'
// facts: alfanum('\0') == false
// facts: alfanum(upcase(x)) == alfanum(x)
if (!(alfanum(c) || c == '.')) if (!(alfanum(c) || c == '.'))
return s; return s;
@ -1047,7 +1039,6 @@ 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;
{ {