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

mop up, in the shadow of the last commits

This commit is contained in:
rlar 2011-05-01 20:11:21 +00:00
parent 6feac56f73
commit 2ac219221c
2 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2011-05-01 Robert Larice
* src/spicelib/parser/inpdomod.c :
mop up, in the shadow of the last commits
2011-05-01 Robert Larice
* src/spicelib/parser/inpdomod.c :
rename variable typename --> type_name

18
src/spicelib/parser/inpdomod.c
View File

@ -43,7 +43,7 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
INPgetTok(&line, &type_name, 1); /* get model type */
/* ----- Check if model is a BJT --------- */
if ((strcmp(type_name, "npn") == 0) || (strcmp(type_name, "pnp") == 0)) {
if (strcmp(type_name, "npn") == 0 || strcmp(type_name, "pnp") == 0) {
err = INPfindLev(line,&lev);
switch(lev) {
case 0:
@ -106,8 +106,8 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
} /* else if (strcmp(typename, "d") == 0) { */
/* -------- Check if model is a jfet --------- */
else if ((strcmp(type_name, "njf") == 0)
|| (strcmp(type_name, "pjf") == 0)) {
else if (strcmp(type_name, "njf") == 0 ||
strcmp(type_name, "pjf") == 0) {
err = INPfindLev(line, &lev);
switch (lev) {
case 0:
@ -137,10 +137,10 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
} /* end else if ((strcmp(typename, "njf") == 0) */
/* -------- Check if model is a MES or an HFET --------- */
else if ((strcmp(type_name, "nmf") == 0)
|| (strcmp(type_name, "pmf") == 0)
|| (strcmp(type_name, "nhfet") == 0)
|| (strcmp(type_name, "phfet") == 0)) {
else if (strcmp(type_name, "nmf") == 0 ||
strcmp(type_name, "pmf") == 0 ||
strcmp(type_name, "nhfet") == 0 ||
strcmp(type_name, "phfet") == 0) {
err = INPfindLev( line, &lev );
switch ( lev )
{
@ -608,8 +608,8 @@ char *INPdomodel(CKTcircuit *ckt, card * image, INPtables * tab)
/* type poly added by SDB . . . */
#ifdef XSPICE
/* -------- Check if model is a poly (specific to xspice) --------- */
else if ( (strcmp(type_name, "poly") == 0) ||
(strcmp(type_name, "POLY") == 0) ) {
else if ( strcmp(type_name, "poly") == 0 ||
strcmp(type_name, "POLY") == 0 ) {
type = INPtypelook("POLY");
if (type < 0) {
err =