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

Handle .if ... .else ... .endif before .csparam is executed, 

thus allowing parameter entry to .control section being dependent
on .if
This commit is contained in:
Holger Vogt 2022-07-24 15:54:29 +02:00
parent 09e48350eb
commit 0b3383546c
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/frontend/inp.c
View File

@ -882,6 +882,10 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
else else
fprintf(stderr, "Warning: Cannot open file debug-out2.txt for saving debug info\n"); fprintf(stderr, "Warning: Cannot open file debug-out2.txt for saving debug info\n");
} }
/* handle .if ... .elseif ... .else ... .endif statements. */
dotifeval(deck);
for (dd = deck; dd; dd = dd->nextcard) { for (dd = deck; dd; dd = dd->nextcard) {
/* get csparams and create vectors, being /* get csparams and create vectors, being
available in .control section, in plot 'const' */ available in .control section, in plot 'const' */
@ -902,9 +906,6 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
} }
} }
/* handle .if ... .elseif ... .else ... .endif statements. */
dotifeval(deck);
/* merge the two option line structs /* merge the two option line structs
com_options (comfile == TRUE, filled in from spinit, .spiceinit, and *ng_sript), and com_options (comfile == TRUE, filled in from spinit, .spiceinit, and *ng_sript), and
options (comfile == FALSE, filled in from circuit with .OPTIONS) options (comfile == FALSE, filled in from circuit with .OPTIONS)