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

inp.c, remove bug with handling of options: options stemming from a command file are kept, options from sourced circuit are removed with ckt

This commit is contained in:
h_vogt 2016-06-01 00:10:30 +02:00 committed by rlar
parent 7382f0fa62
commit 78e30eb3df
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/frontend/inp.c
View File

@ -319,6 +319,11 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
double startTime, endTime; double startTime, endTime;
#ifdef HAS_PROGREP
if (!comfile)
SetAnalyse("Source Deck", 0);
#endif
/* read in the deck from a file */ /* read in the deck from a file */
char *dir_name = ngdirname(filename ? filename : "."); char *dir_name = ngdirname(filename ? filename : ".");
@ -582,25 +587,21 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
/* handle .if ... .elseif ... .else ... .endif statements. */ /* handle .if ... .elseif ... .else ... .endif statements. */
dotifeval(deck); dotifeval(deck);
/*merge the two option line structs*/ /* merge the two option line structs,
keep com_options, options is loaded into circuit and freed
when circuit is removed */
if (!options && com_options) if (!options && com_options)
options = com_options; options = inp_deckcopy(com_options);
else if (options && com_options) { else if (options && com_options) {
/* move to end of options /* move to end of copy from com_options and add options */
struct line *tmp_options = options; struct line *tmp_options = inp_deckcopy(com_options);
while (tmp_options) {
if (!tmp_options->li_next) break;
tmp_options = tmp_options->li_next;
}
tmp_options->li_next = com_options;*/
/* move to end of com_options */
struct line *tmp_options = com_options;
while (tmp_options) { while (tmp_options) {
if (!tmp_options->li_next) if (!tmp_options->li_next)
break; break;
tmp_options = tmp_options->li_next; tmp_options = tmp_options->li_next;
} }
tmp_options->li_next = options; tmp_options->li_next = options;
options = tmp_options;
} }
/* prepare parse trees from 'temper' expressions */ /* prepare parse trees from 'temper' expressions */
@ -615,6 +616,7 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
inp_dodeck(deck, tt, wl_first, FALSE, options, filename); inp_dodeck(deck, tt, wl_first, FALSE, options, filename);
/* inp_dodeck did take ownership */ /* inp_dodeck did take ownership */
tt = NULL; tt = NULL;
options = NULL;
} /* if (deck->li_next) */ } /* if (deck->li_next) */