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

ALTERPARAM did not insert braces. 

Allow to enter .param strings as .param #word#. The
.param `word` syntax clashes with backtick as used in control sections.
Formula() can now return a string as a special case (when there is
only one string variable in the expression and no operators).
This commit is contained in:
mhx 2017-01-07 01:55:39 +01:00
parent 1cf2de3d88
commit 0e89d94a9c
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/frontend/inp.c
View File

@ -1382,7 +1382,8 @@ com_alterparam(wordlist *wl)
curr_line = dd->li_line; curr_line = dd->li_line;
char *start = gettok_char(&curr_line, '=', TRUE, FALSE); char *start = gettok_char(&curr_line, '=', TRUE, FALSE);
tfree(dd->li_line); tfree(dd->li_line);
dd->li_line = tprintf("%s%s", start, pval); /* mhx: re-inserted braces. It works/ed (sometimes) without them. */
dd->li_line = tprintf("%s{%s}", start, pval);
found = TRUE; found = TRUE;
tfree(start); tfree(start);
} }

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

@ -1134,7 +1134,15 @@ formula(dico_t *dico, const char *s, const char *s_end, bool *perror)
return accu[topop]; return accu[topop];
} }
/*
mhx: formula() cannot return a string. Currently there are no functions
operating on strings that evaluate to another string, with the trivial
exception of an expression "$var" where var is a string variable.
Instead of adapting formula()'s internal logic and have it return
the union of a char* and a double, for now we simply check the
input s to have one and only one string variable. If that is the
case, change its mode from 0 (expression) to 1 (simple variable).
*/
static bool static bool
evaluate(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode) evaluate(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode)
{ {
@ -1151,6 +1159,8 @@ evaluate(dico_t *dico, SPICE_DSTRINGPTR qstr_p, char *t, unsigned char mode)
numeric = 0; numeric = 0;
err = 0; err = 0;
if (t[0] == '$' && !strchr(t + 1, '$')) mode = 1; /* force simple variable */
if (t[0] == '%') { type = '%'; t++; } if (t[0] == '%') { type = '%'; t++; }
else if (t[0] == '$') { type = '$'; t++; } else if (t[0] == '$') { type = '$'; t++; }
else type = '0'; else type = '0';
@ -1441,12 +1451,13 @@ getexpress(char *s, SPICE_DSTRINGPTR tstr_p, int *pi)
while ((ia < ls) && (s[ia - 1] <= ' ')) while ((ia < ls) && (s[ia - 1] <= ' '))
ia++; /*white space ? */ ia++; /*white space ? */
if (s[ia - 1] == '"') { if (s[ia - 1] == '"' || s[ia - 1] == '#') {
/* string constant */ /* string constant */
ia++; /* mhx: allow also #xxx# strings */
ia++;
i = ia; i = ia;
while ((i < ls) && (s[i - 1] != '"')) while ((i < ls) && ((s[i - 1] != '"') || (s[i - 1] != '#')))
i++; i++;
tpe = 'S'; tpe = 'S';
@ -1562,9 +1573,14 @@ nupa_assignment(dico_t *dico, char *s, char mode)
if (i > ls) if (i > ls)
error = message(dico, " = sign expected.\n"); error = message(dico, " = sign expected.\n");
for (ix = i; ix < ls - 1; ix++) { /* change delimiters {` and `} to double quotes */ for (ix = i; ix < ls - 1; ix++) { /* change delimiters {# and #} to double quotes */
if (s[ix] == '{' && s[ix + 1] == '`') { s[ix] = ' '; s[ix + 1] = '"'; strptr = &s[ix + 1]; } int ssharp = 0;
if (s[ix] == '`' && s[ix + 1] == '}') { s[ix] = '"'; s[ix + 1] = '\0'; } if (s[ix] == '{' && s[ix + 1] == '#') { s[ix] = ' '; s[ix + 1] = '"'; strptr = &s[ix + 1]; }
if (s[ix] == '#' && s[ix + 1] == '}') { s[ix] = '"'; s[ix + 1] = '\0'; }
if (s[ix] == '#' && !s[ix + 1] == '}') {
s[ix] = '"'; ssharp++;
if (ssharp == 2) { s[ix + 1] = '\0'; ssharp = 0; }
}
} }
dtype = getexpress(s, &ustr, &i); dtype = getexpress(s, &ustr, &i);
@ -1577,7 +1593,7 @@ nupa_assignment(dico_t *dico, char *s, char mode)
" Formula() error.\n" " Formula() error.\n"
" %s\n", s); " %s\n", s);
} else if (dtype == 'S') { } else if (dtype == 'S') {
wval = i; wval = 0;
} }
err = nupa_define(dico, spice_dstring_value(&tstr), mode /* was ' ' */ , err = nupa_define(dico, spice_dstring_value(&tstr), mode /* was ' ' */ ,