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

allow '+' or '-' characters in device name 

for current and voltage sources.
Maybe exrtended to all devices.
This commit is contained in:
Holger Vogt 2018-01-27 10:31:35 +01:00
parent 314ece2526
commit ff00ec3aed
7 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/spicelib/parser/inp2b.c
View File

@ -42,7 +42,7 @@ void INP2B(CKTcircuit *ckt, INPtables * tab, struct card *current)
ckt->CKTvarHertz = 1; ckt->CKTvarHertz = 1;
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetNetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
INPgetNetTok(&line, &nname1, 1); INPgetNetTok(&line, &nname1, 1);

2
src/spicelib/parser/inp2e.c
View File

@ -40,7 +40,7 @@ void INP2E(CKTcircuit *ckt, INPtables * tab, struct card *current)
return; return;
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetNetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
INPgetNetTok(&line, &nname1, 1); INPgetNetTok(&line, &nname1, 1);
INPtermInsert(ckt, &nname1, tab, &node1); INPtermInsert(ckt, &nname1, tab, &node1);

2
src/spicelib/parser/inp2f.c
View File

@ -37,7 +37,7 @@ void INP2F(CKTcircuit *ckt, INPtables * tab, struct card *current)
return; return;
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetNetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
INPgetNetTok(&line, &nname1, 1); INPgetNetTok(&line, &nname1, 1);
INPtermInsert(ckt, &nname1, tab, &node1); INPtermInsert(ckt, &nname1, tab, &node1);

2
src/spicelib/parser/inp2g.c
View File

@ -40,7 +40,7 @@ void INP2G(CKTcircuit *ckt, INPtables * tab, struct card *current)
return; return;
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetNetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
INPgetNetTok(&line, &nname1, 1); INPgetNetTok(&line, &nname1, 1);
INPtermInsert(ckt, &nname1, tab, &node1); INPtermInsert(ckt, &nname1, tab, &node1);

2
src/spicelib/parser/inp2h.c
View File

@ -37,7 +37,7 @@ void INP2H(CKTcircuit *ckt, INPtables * tab, struct card *current)
return; return;
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetNetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
INPgetNetTok(&line, &nname1, 1); INPgetNetTok(&line, &nname1, 1);
INPtermInsert(ckt, &nname1, tab, &node1); INPtermInsert(ckt, &nname1, tab, &node1);

2
src/spicelib/parser/inp2i.c
View File

@ -38,7 +38,7 @@ void INP2I(CKTcircuit *ckt, INPtables * tab, struct card *current)
} }
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetNetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
INPgetNetTok(&line, &nname1, 1); INPgetNetTok(&line, &nname1, 1);
INPtermInsert(ckt, &nname1, tab, &node1); INPtermInsert(ckt, &nname1, tab, &node1);

2
src/spicelib/parser/inp2v.c
View File

@ -38,7 +38,7 @@ void INP2V(CKTcircuit *ckt, INPtables * tab, struct card *current)
} }
} }
line = current->line; line = current->line;
INPgetTok(&line, &name, 1); INPgetNetTok(&line, &name, 1);
INPinsert(&name, tab); INPinsert(&name, tab);
INPgetNetTok(&line, &nname1, 1); INPgetNetTok(&line, &nname1, 1);
INPtermInsert(ckt, &nname1, tab, &node1); INPtermInsert(ckt, &nname1, tab, &node1);