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

findsubname(), k ==> p - (const) s - 1

This commit is contained in:
rlar 2017-11-23 18:25:01 +01:00
parent 623436c9f9
commit a7c2253c8a
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src/frontend/numparam/spicenum.c
View File

@ -155,42 +155,42 @@ findsubname(dico_t *dico, SPICE_DSTRINGPTR dstr_p)
char * const s = spice_dstring_value(dstr_p); char * const s = spice_dstring_value(dstr_p);
char * const ls_ptr = s + spice_dstring_length(dstr_p); char * const ls_ptr = s + spice_dstring_length(dstr_p);
int k = (int) (ls_ptr - s) - 1; int (p - s - 1) = (int) (ls_ptr - s) - 1;
spice_dstring_init(&name); spice_dstring_init(&name);
while (k >= 0) { while ((p - s - 1) >= 0) {
/* skip space, then non-space */ /* skip space, then non-space */
while ((k >= 0) && (s[k] <= ' ')) while (((p - s - 1) >= 0) && (s[(p - s - 1)] <= ' '))
k--; (p - s - 1)--;
int h = k + 1; /* at h: space */ int h = (int) (p - s - 1) + 1; /* at h: space */
while ((k >= 0) && (s[k] > ' ')) { while (((p - s - 1) >= 0) && (s[(p - s - 1)] > ' ')) {
if (s[k] == '}') { if (s[(p - s - 1)] == '}') {
int nest = 1; int nest = 1;
k--; (p - s - 1)--;
while ((nest > 0) && (k >= 0)) { while ((nest > 0) && ((p - s - 1) >= 0)) {
if (s[k] == '{') if (s[(p - s - 1)] == '{')
nest--; nest--;
else if (s[k] == '}') else if (s[(p - s - 1)] == '}')
nest++; nest++;
k--; (p - s - 1)--;
} }
h = k + 1; /* h points to '{' */ h = (int) (p - s - 1) + 1; /* h points to '{' */
} else { } else {
k--; (p - s - 1)--;
} }
} }
if ((k >= 0) && alfanum(s[k + 1])) { /* suppose an identifier */ if (((p - s - 1) >= 0) && alfanum(s[(p - s - 1) + 1])) { /* suppose an identifier */
entry_t *entry; entry_t *entry;
/* check for known subckt name */ /* check for known subckt name */
spice_dstring_reinit(&name); spice_dstring_reinit(&name);
int j = k + 1; int j = (int) (p - s - 1) + 1;
while (alfanum(s[j])) { while (alfanum(s[j])) {
cadd(&name, toupper_c(s[j])); cadd(&name, toupper_c(s[j]));
j++; j++;