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

adding expressions in {} as pwl parameters 

not complete, still requires caring about the FIXME above.
This commit is contained in:
Holger Vogt 2022-03-13 11:39:06 +01:00
parent 509c2347cc
commit dec3fd0fd9
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/frontend/inpcom.c
View File

@ -5661,6 +5661,8 @@ static void inp_compat(struct card *card)
'}' (braces around token after '=') */ '}' (braces around token after '=') */
if ((str_ptr = strchr(cut_line, '=')) != NULL) if ((str_ptr = strchr(cut_line, '=')) != NULL)
*str_ptr = ' '; *str_ptr = ' ';
/* FIXME: To enable adding expressions in {} as pwl parameters, we need an intelligent
removal of {}, not just brute force as following now. */
if ((str_ptr = strchr(cut_line, '{')) != NULL) if ((str_ptr = strchr(cut_line, '{')) != NULL)
*str_ptr = ' '; *str_ptr = ' ';
if ((str_ptr = strchr(cut_line, '}')) != NULL) if ((str_ptr = strchr(cut_line, '}')) != NULL)
@ -5681,7 +5683,15 @@ static void inp_compat(struct card *card)
int ipairs = 0; int ipairs = 0;
char* pair_line = cut_line; char* pair_line = cut_line;
while (*cut_line != '\0') { while (*cut_line != '\0') {
/* If we have expressions in {}, we copy the complete expression,
otherwise only the next token. */
if (*cut_line == '{')
firstno = gettok_char(&cut_line, '}', TRUE, TRUE);
else
firstno = gettok_node(&cut_line); firstno = gettok_node(&cut_line);
if (*cut_line == '{')
secondno = gettok_char(&cut_line, '}', TRUE, TRUE);
else
secondno = gettok_node(&cut_line); secondno = gettok_node(&cut_line);
if ((!firstno && secondno) || (firstno && !secondno)) { if ((!firstno && secondno) || (firstno && !secondno)) {
fprintf(stderr, "Error: Missing token in %s\n", fprintf(stderr, "Error: Missing token in %s\n",