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

inpcom.c, teemper bug fix, rewrite `inp_functionalise_identifier()' 

do not compare against `VALIDCHARS'
  which is much to broad with respect to our operators
This commit is contained in:
rlar 2014-12-13 22:30:46 +01:00
parent 9579b78091
commit 726f1d3fb8
1 changed files with 22 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/frontend/inpcom.c
View File

@ -6065,13 +6065,14 @@ inp_fix_temper_in_param(struct line *deck)
new_str = inp_functionalise_identifier(curr_line, new_func->funcname); new_str = inp_functionalise_identifier(curr_line, new_func->funcname);
if (new_str) { if (new_str == curr_line) {
tfree(firsttok_str);
continue;
}
/* restore first part of the line */ /* restore first part of the line */
new_str = INPstrCat(firsttok_str, new_str, " "); new_str = INPstrCat(firsttok_str, new_str, " ");
new_str = inp_remove_ws(new_str); new_str = inp_remove_ws(new_str);
}
else
continue;
/* if we have inserted into a .param line, convert to .func */ /* if we have inserted into a .param line, convert to .func */
if (prefix(".param", new_str)) { if (prefix(".param", new_str)) {
@ -6100,46 +6101,22 @@ inp_fix_temper_in_param(struct line *deck)
static char * static char *
inp_functionalise_identifier(char *curr_line, char *identifier) inp_functionalise_identifier(char *curr_line, char *identifier)
{ {
/* This is the new code - it finds each variable name and checks it against `identifier' */ int len = strlen(identifier);
int state; char *p, *str = curr_line;
char *var_name, *chp_start, *chp, *new_str = NULL;
for (state = 0, var_name = chp_start = chp = curr_line; ; chp++) { for (p = str; (p = search_identifier(p, identifier, str)) != NULL; )
switch(state) if (p[len] != '(') {
{ int prefix_len = (int) (p - str) + len;
case 0: char *x = str;
/* in state 0 we are looking for the first character of a variable name, str = tprintf("%.*s()%s", prefix_len, str, str + prefix_len);
which has to be an alphabetic character. */ if (x != curr_line)
if (isalpha(*chp)) tfree(x);
{ p = str + prefix_len + 2;
state = 1; } else {
var_name = chp; p ++;
} }
break;
case 1: return str;
/* In state 1 we are looking for the last character of a variable name.
The variable name consists of alphanumeric characters and special characters,
which are defined above as VALIDCHARS. */
state = (*chp) && (isalphanum(*chp) || strchr(VALIDCHARS, *chp));
if (!state) {
char ch = *chp;
*chp = '\0';
if (strcmp(var_name, identifier) == 0 && ch != '(') {
new_str = INPstrCat(new_str, copy(chp_start), "");
new_str = INPstrCat(new_str, copy("()"), "");
chp_start=chp;
}
*chp = ch;
}
break;
}
if (!(*chp))
break;
}
if (new_str) {
/* add final part of line */
new_str = INPstrCat(new_str, copy(chp_start), "");
}
return new_str;
} }