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

Bug fix: B source pwl lines don't get special handling, 

but standard numparam handling of {} tokens
This commit is contained in:
Holger Vogt 2018-02-19 20:31:33 +01:00
parent c879294a8b
commit ffb3800e34
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontend/inpcom.c
View File

@ -5169,8 +5169,9 @@ replace_token(char *string, char *token, int wherereplace, int total)
}
/* lines for B sources: no parsing in numparam code, just replacement of parameters.
Parsing done in B source parser.
/* lines for B sources (except for pwl lines): no parsing in numparam code,
just replacement of parameters. pwl lines are still handled in numparam.
Parsing for all other B source lines are done in the B source parser.
To achive this, do the following:
Remove all '{' and '}' --> no parsing of equations in numparam
Place '{' and '}' directly around all potential parameters,
@ -5204,6 +5205,9 @@ inp_bsource_compat(struct card *card)
/* remove white spaces of everything inside {}*/
card->line = inp_remove_ws(card->line);
curr_line = card->line;
/* exclude special pwl lines */
if (strstr(curr_line, "=pwl("))
continue;
/* store starting point for later parsing, beginning of {expression} */
equal_ptr = strchr(curr_line, '=');
/* check for errors */