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

inp2m.c, #13/15b, rewrite, move common code to the end

This commit is contained in:
rlar 2017-03-05 16:54:03 +01:00
parent 3d6a2e2422
commit 8fa3afa4ae
1 changed files with 7 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
src/spicelib/parser/inp2m.c
View File

@ -158,54 +158,25 @@ INP2M(CKTcircuit *ckt, INPtables *tab, card *current)
INPgetModBin(ckt, nname[nodeflag], &thismodel, tab, line);
if (thismodel) {
/* nodeflag == 7 */
if (!valid_numnodes(nodeflag, thismodel, current))
return;
for (i = 4; i < nodeflag; i++)
INPtermInsert(ckt, &nname[i], tab, &node[i]);
model = nname[nodeflag];
}
else {
nodeflag = 4; /* now reset to a 4 node device */
line = save; /* reset the posn to what it sould be */
/* nodeflag == 4 */
if (!valid_numnodes(nodeflag, thismodel, current))
return;
for (i = 4; i < nodeflag; i++)
INPtermInsert(ckt, &nname[i], tab, &node[i]);
model = nname[nodeflag];
}
} else {
/* nodeflag == 6 */
if (!valid_numnodes(nodeflag, thismodel, current))
return;
for (i = 4; i < nodeflag; i++)
INPtermInsert(ckt, &nname[i], tab, &node[i]);
model = nname[nodeflag];
}
} else {
/* nodeflag == 5 */
if (!valid_numnodes(nodeflag, thismodel, current))
return;
for (i = 4; i < nodeflag; i++)
INPtermInsert(ckt, &nname[i], tab, &node[i]);
model = nname[nodeflag];
}
} else {
/* nodeflag == 4 */
if (!valid_numnodes(nodeflag, thismodel, current))
return;
for (i = 4; i < nodeflag; i++)
INPtermInsert(ckt, &nname[i], tab, &node[i]);
model = nname[nodeflag];
}
if (!valid_numnodes(nodeflag, thismodel, current))
return;
for (i = 4; i < nodeflag; i++)
INPtermInsert(ckt, &nname[i], tab, &node[i]);
model = nname[nodeflag];
INPinsert(&model, tab);
#ifdef TRACE