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

inpc, preserve sequence of option, last option given 

will override others with same name
This commit is contained in:
h_vogt 2016-08-27 17:54:29 +02:00
parent d1271c252a
commit 6e868d81bd
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/frontend/inp.c
View File

@ -295,6 +295,22 @@ line_free_x(struct line *deck, bool recurse)
}
}
/* reverse the linked list struct line */
struct line *
line_reverse(struct line *head)
{
struct line *prev = NULL;
struct line *next;
while (head) {
next = head->li_next;
head->li_next = prev;
prev = head;
head = next;
}
return prev;
}
/* free mc_deck */
void
@ -687,17 +703,17 @@ inp_spsource(FILE *fp, bool comfile, char *filename, bool intfile)
if (!options && com_options)
options = inp_deckcopy(com_options);
else if (options && com_options) {
/* move to end of copy from com_options and add options */
struct line *tmp_options = inp_deckcopy(com_options);
struct line *new_options = tmp_options;
while (tmp_options) {
if (!tmp_options->li_next)
/* add a copy from com_options to end of options */
struct line *new_options = options;
while (options) {
if (!options->li_next)
break;
tmp_options = tmp_options->li_next;
options = options->li_next;
}
tmp_options->li_next = options;
options->li_next = inp_deckcopy(com_options);
options = new_options;
}
options = line_reverse(options);
/* prepare parse trees from 'temper' expressions */
if (expr_w_temper)