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, #16/23, emit a message and give up, if we couldn't find the modelname token 

Thats a functional change of ngspice.

So far we did cook up a "default" model when we didn't find a model token.
But this was buggy anyway, because in such cases we silently dropped
  a token from beeing processed by PARSECALL()
Now, we emit a message, and skip this line alltogether.
This commit is contained in:
rlar 2017-03-11 18:21:33 +01:00
parent 83fb9353ef
commit 03d3e2ea12
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -69,6 +69,8 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
INPtermInsert(ckt, &nname[i], tab, &node[i]); INPtermInsert(ckt, &nname[i], tab, &node[i]);
} }
model = NULL;
i = 3; i = 3;
INPgetTok(&line, &nname[i], 1); INPgetTok(&line, &nname[i], 1);
@ -91,13 +93,20 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, card * current, CKTnode *gnode)
INPtermInsert(ckt, &nname[i], tab, &node[i]); INPtermInsert(ckt, &nname[i], tab, &node[i]);
i = 5; i = 5;
INPgetTok(&line, &nname[i], 1); INPgetTok(&line, &nname[i], 1);
model = nname[i]; if (INPlookMod(nname[i])) {
INPinsert(&model, tab); model = nname[i];
current->error = INPgetMod(ckt, model, &thismodel, tab); INPinsert(&model, tab);
current->error = INPgetMod(ckt, model, &thismodel, tab);
}
#endif #endif
} }
} }
if (!model) {
LITERR ("could not find a valid modelname");
return;
}
if (i == 3) { if (i == 3) {
/* 3-terminal device - substrate to ground */ /* 3-terminal device - substrate to ground */
node[3] = gnode; node[3] = gnode;