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

getword(), i ==> iptr - (const) s

This commit is contained in:
rlar 2016-05-15 20:42:29 +02:00
parent 051c3f4137
commit 51dc7037d3
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1320,23 +1320,24 @@ static void
getword(const char * const s, SPICE_DSTRINGPTR tstr_p, const char **pi)
/* isolate a word from s after position "after". return i= last read+1 */
{
int i = (int) (*pi - s);
const char *iptr;
(iptr - s) = (int) (*pi - s);
int ls;
ls = (int) strlen(s);
do
i++;
while ((i < ls) && !alfa(s[i - 1]));
(iptr - s)++;
while (((iptr - s) < ls) && !alfa(s[(iptr - s) - 1]));
spice_dstring_reinit(tstr_p);
while ((i <= ls) && (alfa(s[i - 1]) || isdigit_c(s[i - 1]))) {
cadd(tstr_p, toupper_c(s[i - 1]));
i++;
while (((iptr - s) <= ls) && (alfa(s[(iptr - s) - 1]) || isdigit_c(s[(iptr - s) - 1]))) {
cadd(tstr_p, toupper_c(s[(iptr - s) - 1]));
(iptr - s)++;
}
*pi = s + i;
*pi = s + (iptr - s);
}