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

* src/circuit/inp2dot.c: Integrated patch from Manfred 

Metzger.  Circuit cards got parsed wrongly.
This commit is contained in:
arno 2000-06-01 11:08:12 +00:00
parent 1db20f4abf
commit b426eaf349
1 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/circuit/inp2dot.c
View File

@ -39,6 +39,7 @@ dot_nodeset(void *ckt, INPtables *tab, card *current, void *task, void *gnode)
LITERR("nodeset unknown to simulator. \n"); LITERR("nodeset unknown to simulator. \n");
return (0); return (0);
} }
INPgetTok(&line, &name, 1); /* [mme] skip .nodeset */
for (;;) { for (;;) {
int length; int length;
@ -101,6 +102,7 @@ dot_noise(void *ckt, INPtables *tab, card *current, void *task, void *gnode,
} }
IFC(newAnalysis, (ckt, which, "Noise Analysis", &foo, task)); IFC(newAnalysis, (ckt, which, "Noise Analysis", &foo, task));
INPgetTok(&line, &name, 1); INPgetTok(&line, &name, 1);
INPgetTok(&line, &name, 1); /* [mme] skip .noise */
/* Make sure the ".noise" command is followed by V(xxxx). If it /* Make sure the ".noise" command is followed by V(xxxx). If it
is, extract 'xxxx'. If not, report an error. */ is, extract 'xxxx'. If not, report an error. */
@ -228,6 +230,7 @@ dot_disto(void *ckt, INPtables *tab, card *current, void *task, void *gnode,
LITERR("Small signal distortion analysis unsupported.\n"); LITERR("Small signal distortion analysis unsupported.\n");
return (0); return (0);
} }
INPgetTok(&line, &steptype, 1); /* [mme] skip .disto */
IFC(newAnalysis, (ckt, which, "Distortion Analysis", &foo, task)); IFC(newAnalysis, (ckt, which, "Distortion Analysis", &foo, task));
INPgetTok(&line, &steptype, 1); /* get DEC, OCT, or LIN */ INPgetTok(&line, &steptype, 1); /* get DEC, OCT, or LIN */
ptemp.iValue = 1; ptemp.iValue = 1;
@ -273,7 +276,9 @@ dot_ic(void *ckt, INPtables *tab, card *current, void *task, void *gnode,
LITERR("ic unknown to simulator. \n"); LITERR("ic unknown to simulator. \n");
return (0); return (0);
} }
for (;;) { /* loop until we run out of data */ INPgetTok(&line, &node1, 1); /* [mme] skip .ic */
for (;;) {
/* loop until we run out of data */
int length; int length;
char *name; /* the resistor's name */ char *name; /* the resistor's name */
@ -324,6 +329,7 @@ dot_ac(void *ckt, INPtables *tab, card *current, void *task, void *gnode,
LITERR("AC small signal analysis unsupported.\n"); LITERR("AC small signal analysis unsupported.\n");
return (0); return (0);
} }
INPgetTok(&line, &steptype, 1); /* [mme] skip .ac */
IFC(newAnalysis, (ckt, which, "AC Analysis", &foo, task)) IFC(newAnalysis, (ckt, which, "AC Analysis", &foo, task))
INPgetTok(&line, &steptype, 1); /* get DEC, OCT, or LIN */ INPgetTok(&line, &steptype, 1); /* get DEC, OCT, or LIN */
ptemp.iValue = 1; ptemp.iValue = 1;
@ -363,6 +369,7 @@ dot_pz(void *ckt, INPtables *tab, card *current, void *task, void *gnode,
LITERR("Pole-zero analysis unsupported.\n"); LITERR("Pole-zero analysis unsupported.\n");
return (0); return (0);
} }
INPgetTok(&line, &steptype, 1); /* [mme] skip .pz */
IFC(newAnalysis, (ckt, which, "Pole-Zero Analysis", &foo, task)) IFC(newAnalysis, (ckt, which, "Pole-Zero Analysis", &foo, task))
parm = INPgetValue(ckt, &line, IF_NODE, tab); parm = INPgetValue(ckt, &line, IF_NODE, tab);
GCA(INPapName, (ckt, which, foo, "nodei", parm)) GCA(INPapName, (ckt, which, foo, "nodei", parm))
@ -411,6 +418,7 @@ dot_dc(void *ckt, INPtables *tab, card *current, void *task, void *gnode,
} }
IFC(newAnalysis, (ckt, which, "DC transfer characteristic", &foo, task)); IFC(newAnalysis, (ckt, which, "DC transfer characteristic", &foo, task));
INPgetTok(&line, &name, 1); INPgetTok(&line, &name, 1);
INPgetTok(&line, &name, 1); /* [mme] skip .dc */
INPinsert(&name, tab); INPinsert(&name, tab);
ptemp.uValue = name; ptemp.uValue = name;
GCA(INPapName, (ckt, which, foo, "name1", &ptemp)); GCA(INPapName, (ckt, which, foo, "name1", &ptemp));