Browse Source

getexpress(), transform `<' etc comparisons

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

8
src/frontend/numparam/xpressn.c

@ -1365,7 +1365,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi)
do do
p++; p++;
while ((p <= ls_ptr - 1) && (*p <= ' '));
while ((p < ls_ptr) && (*p <= ' '));
} else { } else {
@ -1378,7 +1378,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi)
{ {
p++; p++;
if (p > ls_ptr - 1)
if (p >= ls_ptr)
c = ';'; c = ';';
else else
c = *p; c = *p;
@ -1390,7 +1390,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi)
{ {
p++; p++;
if (p > ls_ptr - 1)
if (p >= ls_ptr)
d = '\0'; d = '\0';
else else
d = *p; d = *p;
@ -1400,7 +1400,7 @@ getexpress(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi)
else if (d == ')') else if (d == ')')
level--; level--;
} while ((p <= ls_ptr - 1) && !((d == ')') && (level <= 0)));
} while ((p < ls_ptr) && !((d == ')') && (level <= 0)));
} }
} while (!strchr(",;)}", c)); /* legal separators */ } while (!strchr(",;)}", c)); /* legal separators */

Loading…
Cancel
Save