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

subckt.c, cleanup `doit()', polish

This commit is contained in:
rlar 2014-07-16 19:55:47 +02:00
parent 87c88f02c2
commit 82039a1166
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/frontend/subckt.c
View File

@ -439,7 +439,7 @@ doit(struct line *deck, wordlist *modnames) {
while (c) { while (c) {
if (ciprefix(sbend, c->li_line)) { /* if line == .ends */ if (ciprefix(sbend, c->li_line)) { /* if line == .ends */
fprintf(cp_err, "Error: misplaced %s line: %s\n", sbend, fprintf(cp_err, "Error: misplaced %s line: %s\n", sbend,
c->li_line); c->li_line);
return (NULL); return (NULL);
@ -450,15 +450,13 @@ doit(struct line *deck, wordlist *modnames) {
struct line *prev_of_ends = find_ends(c); struct line *prev_of_ends = find_ends(c);
struct line *ends = prev_of_ends->li_next; struct line *ends = prev_of_ends->li_next;
/* Check to see if we have looped through remainder of deck without finding .ends */
if (!ends) { if (!ends) {
fprintf(cp_err, "Error: no %s line.\n", sbend); fprintf(cp_err, "Error: no %s line.\n", sbend);
return (NULL); return (NULL);
} }
/* c is the opening .subckt card */ /* c points to the opening .subckt card */
/* ends is the terminating .ends card */ /* ends points to the terminating .ends card */
/* prev_of_ends is one card before, which is the c body card */
if (use_numparams == FALSE) if (use_numparams == FALSE)
prev_of_ends->li_next = NULL; /* shouldn't we free some memory here????? */ prev_of_ends->li_next = NULL; /* shouldn't we free some memory here????? */
@ -495,8 +493,9 @@ doit(struct line *deck, wordlist *modnames) {
} }
} }
/* push `sss' onto the `subs' list */
sss->su_next = subs; sss->su_next = subs;
subs = sss; /* Now that sss is built, assign it to subs */ subs = sss;
line_free_x(c, FALSE); line_free_x(c, FALSE);
c = ends->li_next; c = ends->li_next;
@ -504,8 +503,9 @@ doit(struct line *deck, wordlist *modnames) {
/*gp */ /*gp */
ends->li_next = NULL; /* Numparam needs line ends */ ends->li_next = NULL; /* Numparam needs line ends */
ends->li_line[0] = '*'; /* comment it out */ ends->li_line[0] = '*'; /* comment it out */
} else { /* line is neither .ends nor .subckt. */
/* make prev_of_c point to this card, and advance c to next card. */ } else {
prev_of_c = c; prev_of_c = c;
c = c->li_next; c = c->li_next;
} }