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

nupa_subcktcall(), k ==> kp - (const) t_p

This commit is contained in:
rlar 2016-05-16 11:44:39 +02:00
parent d991296b82
commit cc932725ac
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1610,19 +1610,19 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
while ((jp - t_p) < ls) {
/* try to fetch valid arguments */
int k = (int) (jp - t_p);
int (kp - t_p) = (int) (jp - t_p);
spice_dstring_reinit(&ustr);
if (t_p[k] == Intro) {
if (t_p[(kp - t_p)] == Intro) {
/* handle historical syntax... */
if (alfa(t_p[k + 1])) {
k++;
} else if (t_p[k + 1] == '(') {
if (alfa(t_p[(kp - t_p) + 1])) {
(kp - t_p)++;
} else if (t_p[(kp - t_p) + 1] == '(') {
/* transform to braces... */
k++;
t_p[k] = '{';
int g = k;
(kp - t_p)++;
t_p[(kp - t_p)] = '{';
int g = (int) (kp - t_p);
int nest = 1;
while ((nest > 0) && (g < ls)) {
@ -1638,19 +1638,19 @@ nupa_subcktcall(dico_t *dico, char *s, char * const x, char * const inst_name)
}
}
if (alfanum(t_p[k]) || t_p[k] == '.') {
if (alfanum(t_p[(kp - t_p)]) || t_p[(kp - t_p)] == '.') {
/* number, identifier */
int h = k;
while (t_p[k] > ' ')
k++;
pscopy(&ustr, t_p, h, k - h);
jp = t_p + k;
} else if (t_p[k] == '{') {
int h = (int) (kp - t_p);
while (t_p[(kp - t_p)] > ' ')
(kp - t_p)++;
pscopy(&ustr, t_p, h, (int) (kp - t_p) - h);
jp = t_p + (kp - t_p);
} else if (t_p[(kp - t_p)] == '{') {
jp = t_p + (int) (getexpress(NULL, &ustr, t_p + (jp - t_p)) - t_p);
} else {
jp++;
if (t_p[k] > ' ')
message(dico, "Subckt call, symbol %c not understood\n", t_p[k]);
if (t_p[(kp - t_p)] > ' ')
message(dico, "Subckt call, symbol %c not understood\n", t_p[(kp - t_p)]);
}
char * const u_p = spice_dstring_value(&ustr);