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

nupa_substitute(), delay kptr assignment

This commit is contained in:
rlar 2016-05-14 15:48:55 +02:00
parent ca84d10d0a
commit bd335cb5be
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1190,7 +1190,6 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
spice_dstring_init(&qstr);
const char * const s_end = strchr(s, '\0');
const char *kptr;
while ((s < s_end) && !err) {
@ -1198,7 +1197,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
if (c == '{') {
/* try ps expression syntax */
kptr = s;
const char *kptr = s;
nnest = 1;
do
@ -1243,10 +1242,9 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
while ((s < s_end) && (s[-1] <= ' '))
s++;
kptr = s;
if (kptr[-1] == '(') {
if (s[-1] == '(') {
/* sub-formula */
const char *kptr = s;
level = 1;
do
@ -1276,6 +1274,7 @@ nupa_substitute(dico_t *dico, const char *s, char *r)
} else {
/* simple identifier may also be string? */
const char *kptr = s;
do
{
if (kptr >= s_end)