luke
/
ngspice
mirror of https://git.code.sf.net/p/ngspice/ngspice
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

formula(), kptr++ to the for loop epilogue

This commit is contained in:
rlar 2016-05-14 12:31:51 +02:00
parent c761b4432a
commit 2010e6b4fb
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -892,10 +892,10 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
const char *arg3 = NULL; const char *arg3 = NULL;
level = 1; level = 1;
for (;;) for (;; kptr++)
{ {
char d = *kptr++; char d = *kptr;
if (kptr > s_end) if (kptr >= s_end)
d = '\0'; d = '\0';
if (d == '(') if (d == '(')
@ -905,15 +905,17 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
if ((d == ',') && (level == 1)) { if ((d == ',') && (level == 1)) {
if (arg2 == NULL) if (arg2 == NULL)
arg2 = kptr; arg2 = kptr + 1;
else else
arg3 = kptr; /* kludge for more than 2 args (ternary expression) */ arg3 = kptr + 1; /* kludge for more than 2 args (ternary expression) */
} /* comma list? */ } /* comma list? */
if (kptr > s_end) { if (kptr >= s_end) {
kptr++;
break; break;
} }
if ((d == ')') && (level <= 0)) { if ((d == ')') && (level <= 0)) {
kptr++;
break; break;
} }
} }