Browse Source

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

for current and voltage sources.
Maybe exrtended to all devices.
pre-master-46
Holger Vogt 8 years ago
parent
commit
ff00ec3aed
  1. 2
      src/spicelib/parser/inp2b.c
  2. 2
      src/spicelib/parser/inp2e.c
  3. 2
      src/spicelib/parser/inp2f.c
  4. 2
      src/spicelib/parser/inp2g.c
  5. 2
      src/spicelib/parser/inp2h.c
  6. 2
      src/spicelib/parser/inp2i.c
  7. 2
      src/spicelib/parser/inp2v.c

2
src/spicelib/parser/inp2b.c

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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

@ -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);

Loading…
Cancel
Save