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

doit, shrink scope of `s'

This commit is contained in:
rlar 2012-03-08 20:03:23 +01:00
parent 0cee0467e2
commit 8f73a4dd23
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

@ -398,7 +398,6 @@ static struct line *
doit(struct line *deck) { doit(struct line *deck) {
struct line *c, *lcc; struct line *c, *lcc;
struct subs *sssfree = NULL, *sss = NULL; /* *sss temporarily hold decks to substitute */ struct subs *sssfree = NULL, *sss = NULL; /* *sss temporarily hold decks to substitute */
char *s;
int nest, numpasses = MAXNEST; int nest, numpasses = MAXNEST;
bool gotone; bool gotone;
wordlist *tmodnames = modnames; wordlist *tmodnames = modnames;
@ -477,9 +476,9 @@ doit(struct line *deck) {
/* Now put the .subckt definition found into sss */ /* Now put the .subckt definition found into sss */
sss->su_def = last->li_next; sss->su_def = last->li_next;
s = last->li_line;
{ {
char *s = last->li_line;
int i; int i;
txfree(gettok(&s)); txfree(gettok(&s));
sss->su_name = gettok(&s); sss->su_name = gettok(&s);
@ -547,7 +546,7 @@ doit(struct line *deck) {
for (c = deck, lc = NULL; c; ) { for (c = deck, lc = NULL; c; ) {
if (ciprefix(invoke, c->li_line)) { /* found reference to .subckt (i.e. component with refdes X) */ if (ciprefix(invoke, c->li_line)) { /* found reference to .subckt (i.e. component with refdes X) */
char *tofree, *tofree2, *t; char *tofree, *tofree2, *s, *t;
char *scname, *subname; char *scname, *subname;
gotone = TRUE; gotone = TRUE;
@ -607,7 +606,8 @@ doit(struct line *deck) {
if (modtranslate(lcc, scname)) /* this translates the model name in the .model line */ if (modtranslate(lcc, scname)) /* this translates the model name in the .model line */
devmodtranslate(lcc, scname); /* This translates the model name on all components in the deck */ devmodtranslate(lcc, scname); /* This translates the model name on all components in the deck */
s = sss->su_args; {
char *s = sss->su_args;
txfree(gettok(&t)); /* Throw out the subcircuit refdes */ txfree(gettok(&t)); /* Throw out the subcircuit refdes */
/* now invoke translate, which handles the remainder of the /* now invoke translate, which handles the remainder of the
@ -616,6 +616,7 @@ doit(struct line *deck) {
if (!translate(lcc, s, t, scname, subname)) if (!translate(lcc, s, t, scname, subname))
error = 1; error = 1;
tfree(subname); tfree(subname);
}
/* Now splice the decks together. */ /* Now splice the decks together. */
{ {