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

inp2q.c, #14/23, rewrite, assign model a bit later when recognised

This commit is contained in:
rlar 2017-03-09 21:59:36 +01:00
parent ef37e92338
commit 0bf0021a63
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/spicelib/parser/inp2q.c
View File

@ -38,10 +38,10 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
char *line; /* the part of the current line left to parse */
char *name; /* the resistor's name */
#ifdef ADMS
char *nname[5];
char *nname[6];
CKTnode *node[5];
#else
char *nname[4];
char *nname[5];
CKTnode *node[4];
#endif
int error; /* error code temporary */
@ -70,27 +70,28 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
}
i = 3;
INPgetTok(&line, &model, 1);
INPgetTok(&line, &nname[i], 1);
thismodel = NULL;
/* See if 4th token after device specification is a model name */
if (INPlookMod(model)) {
if (INPlookMod(nname[i])) {
model = nname[i];
INPinsert(&model, tab);
current->error = INPgetMod(ckt, model, &thismodel, tab);
} else {
nname[i] = model;
INPtermInsert(ckt, &nname[i], tab, &node[i]);
i = 4;
INPgetTok(&line, &model, 1);
if (INPlookMod(model)) {
INPgetTok(&line, &nname[i], 1);
if (INPlookMod(nname[i])) {
model = nname[i];
INPinsert(&model, tab);
current->error = INPgetMod(ckt, model, &thismodel, tab);
#ifdef ADMS
} else {
nname[i] = model;
INPtermInsert(ckt, &nname[i], tab, &node[i]);
i = 5;
INPgetTok(&line, &model, 1);
INPgetTok(&line, &nname[i], 1);
model = nname[i];
INPinsert(&model, tab);
current->error = INPgetMod(ckt, model, &thismodel, tab);
#endif