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(), k ==> kptr - (const) s

This commit is contained in:
rlar 2016-05-15 20:04:29 +02:00
parent 551aae4b05
commit ccf34637b3
1 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1194,7 +1194,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
bug: wont flag overflow!
*/
{
int i, k, level, nnest, ir = 0;
int i, level, nnest, ir = 0;
char c, d;
bool err = 0;
@ -1205,6 +1205,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
spice_dstring_init(&tstr);
i = 0;
const char * const s_end = strchr(s, '\0');
const char *kptr;
while ((i < (s_end - s)) && !err) {
i++;
@ -1212,13 +1213,13 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
if (c == '{') {
/* try ps expression syntax */
k = i;
(kptr - s) = i;
nnest = 1;
do
{
k++;
d = s[k - 1];
(kptr - s)++;
d = s[(kptr - s) - 1];
if (d == '{')
nnest++;
else if (d == '}')
@ -1229,7 +1230,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
if (d == '\0') {
err = message(dico, "Closing \"}\" not found.\n");
} else {
pscopy(&tstr, s, i , k - i - 1);
pscopy(&tstr, s, i , (int) (kptr - s) - i - 1);
/* exeption made for .meas */
if (strcasecmp(spice_dstring_value(&tstr), "LAST") == 0) {
spice_dstring_reinit(&qstr);
@ -1241,7 +1242,7 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
}
}
i = k;
i = (int) (kptr - s);
if (!err)
ir = insertnumber(dico, ir, r, &qstr);
else
@ -1259,54 +1260,54 @@ nupa_substitute(dico_t *dico, char * const s, char *r)
while ((i < (s_end - s)) && (s[i - 1] <= ' '))
i++;
k = i;
(kptr - s) = i;
if (s[k - 1] == '(') {
if (s[(kptr - s) - 1] == '(') {
/* sub-formula */
level = 1;
do
{
k++;
if (k > (s_end - s))
(kptr - s)++;
if ((kptr - s) > (s_end - s))
d = '\0';
else
d = s[k - 1];
d = s[(kptr - s) - 1];
if (d == '(')
level++;
else if (d == ')')
level--;
} while ((k <= (s_end - s)) && !((d == ')') && (level <= 0)));
} while (((kptr - s) <= (s_end - s)) && !((d == ')') && (level <= 0)));
if (k > (s_end - s)) {
if ((kptr - s) > (s_end - s)) {
err = message(dico, "Closing \")\" not found.\n");
} else {
pscopy(&tstr, s, i, k - i - 1);
pscopy(&tstr, s, i, (int) (kptr - s) - i - 1);
const char *xx = spice_dstring_value(&tstr);
err = evaluate_expr(dico, &qstr, xx, xx + strlen(xx));
}
i = k;
i = (int) (kptr - s);
} else {
/* simple identifier may also be string? */
do
{
k++;
if (k > (s_end - s))
(kptr - s)++;
if ((kptr - s) > (s_end - s))
d = '\0';
else
d = s[k - 1];
d = s[(kptr - s) - 1];
} while ((k <= (s_end - s)) && (d > ' '));
} while (((kptr - s) <= (s_end - s)) && (d > ' '));
pscopy(&tstr, s, i-1, k - i);
pscopy(&tstr, s, i-1, (int) (kptr - s) - i);
const char *xx = spice_dstring_value(&tstr);
err = evaluate_variable(dico, &qstr, xx, xx + strlen(xx));
i = k - 1;
i = (int) (kptr - s) - 1;
}
if (!err)