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

With the new inp_deckcopy_ln treat the first line 

in the deck equal to all other lines.
This commit is contained in:
Holger Vogt 2020-12-10 17:42:55 +01:00
parent 8b376b4581
commit 8c253524af
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/frontend/subckt.c
View File

@ -887,7 +887,6 @@ struct card *inp_deckcopy_oc(struct card * deck)
/* /*
* Copy a deck, without the ->actualLine lines, without comment lines, and * Copy a deck, without the ->actualLine lines, without comment lines, and
* without .control section(s). * without .control section(s).
* First line is always copied (except being .control).
* Keep the line numbers. * Keep the line numbers.
*/ */
struct card* inp_deckcopy_ln(struct card* deck) struct card* inp_deckcopy_ln(struct card* deck)
@ -911,6 +910,11 @@ struct card* inp_deckcopy_ln(struct card* deck)
deck = deck->nextcard; deck = deck->nextcard;
continue; continue;
} }
else if (*(deck->line) == '*') {
deck = deck->nextcard;
continue;
}
if (nd) { /* First card already found */ if (nd) { /* First card already found */
/* d is the card at the end of the deck */ /* d is the card at the end of the deck */
d = d->nextcard = TMALLOC(struct card, 1); d = d->nextcard = TMALLOC(struct card, 1);
@ -928,9 +932,6 @@ struct card* inp_deckcopy_ln(struct card* deck)
} }
d->actualLine = NULL; d->actualLine = NULL;
deck = deck->nextcard; deck = deck->nextcard;
while (deck && *(deck->line) == '*') { /* skip comments */
deck = deck->nextcard;
}
} /* end of loop over cards in the source deck */ } /* end of loop over cards in the source deck */
return nd; return nd;