Browse Source

getexpress(), drop `c' and cleanup

pre-master-46
rlar 8 years ago
parent
commit
33b8936a3b
  1. 18
      src/frontend/numparam/xpressn.c

18
src/frontend/numparam/xpressn.c

@ -1347,37 +1347,33 @@ getexpress(nupa_type *type, SPICE_DSTRINGPTR tstr_p, const char *s)
while ((s < ls_ptr - 1) && (*s <= ' ')) while ((s < ls_ptr - 1) && (*s <= ' '))
s++; /*white space ? */ s++; /*white space ? */
if (*s == '"') {
/* string constant */
if (*s == '"') { /* string constant */
s++; s++;
p = s; p = s;
while ((p < ls_ptr - 1) && (*p != '"')) while ((p < ls_ptr - 1) && (*p != '"'))
p++; p++;
tpe = NUPA_STRING;
do do
p++; p++;
while ((p < ls_ptr) && (*p <= ' ')); while ((p < ls_ptr) && (*p <= ' '));
tpe = NUPA_STRING;
} else { } else {
if (*s == '{') if (*s == '{')
s++; s++;
p = s - 1;
p++;
p = s;
for (; p < ls_ptr; p++) { for (; p < ls_ptr; p++) {
char c = *p;
if (strchr(",;)}", c)) /* legal separators */
if (strchr(",;)}", *p)) /* legal separators */
break; break;
if (c == '(') {
if (*p == '(') {
/* sub-formula */ /* sub-formula */
int level = 1; int level = 1;
p++; p++;

Loading…
Cancel
Save