From e18b848f7d9c88ff69d2208c4ef0ad845a8de295 Mon Sep 17 00:00:00 2001
From: Holger Vogt <holger.vogt@uni-due.de>
Date: Sat, 4 Aug 2018 00:06:51 +0200
Subject: [PATCH] Allow '-' and '+' being part of the instance name. Has
 already been available for B, E, F, G, and H sources

---
 src/spicelib/parser/inp2c.c | 2 +-
 src/spicelib/parser/inp2d.c | 2 +-
 src/spicelib/parser/inp2j.c | 2 +-
 src/spicelib/parser/inp2k.c | 2 +-
 src/spicelib/parser/inp2l.c | 2 +-
 src/spicelib/parser/inp2m.c | 2 +-
 src/spicelib/parser/inp2o.c | 2 +-
 src/spicelib/parser/inp2p.c | 2 +-
 src/spicelib/parser/inp2q.c | 2 +-
 src/spicelib/parser/inp2r.c | 2 +-
 src/spicelib/parser/inp2s.c | 2 +-
 src/spicelib/parser/inp2t.c | 2 +-
 src/spicelib/parser/inp2u.c | 2 +-
 src/spicelib/parser/inp2w.c | 2 +-
 src/spicelib/parser/inp2y.c | 2 +-
 src/spicelib/parser/inp2z.c | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/spicelib/parser/inp2c.c b/src/spicelib/parser/inp2c.c
index d8d265d3a..15eef67e4 100644
--- a/src/spicelib/parser/inp2c.c
+++ b/src/spicelib/parser/inp2c.c
@@ -48,7 +48,7 @@ void INP2C(CKTcircuit *ckt, INPtables * tab, struct card *current)
         }
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2d.c b/src/spicelib/parser/inp2d.c
index 3fa510c0b..706e9d439 100644
--- a/src/spicelib/parser/inp2d.c
+++ b/src/spicelib/parser/inp2d.c
@@ -41,7 +41,7 @@ void INP2D(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2j.c b/src/spicelib/parser/inp2j.c
index b0c174506..344322639 100644
--- a/src/spicelib/parser/inp2j.c
+++ b/src/spicelib/parser/inp2j.c
@@ -36,7 +36,7 @@ void INP2J(CKTcircuit *ckt, INPtables * tab, struct card *current)
     IFuid uid;			/* uid of default model */
 
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2k.c b/src/spicelib/parser/inp2k.c
index 058833943..1e7a912ec 100644
--- a/src/spicelib/parser/inp2k.c
+++ b/src/spicelib/parser/inp2k.c
@@ -33,7 +33,7 @@ void INP2K(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	LITERR("Device type mutual not supported by this binary\n");
 	return;
     }
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     if (!tab->defKmod) {
 	/* create deafult K model */
diff --git a/src/spicelib/parser/inp2l.c b/src/spicelib/parser/inp2l.c
index 0921c1908..3af47c8ff 100644
--- a/src/spicelib/parser/inp2l.c
+++ b/src/spicelib/parser/inp2l.c
@@ -48,7 +48,7 @@ void INP2L(CKTcircuit *ckt, INPtables * tab, struct card *current)
         }
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2m.c b/src/spicelib/parser/inp2m.c
index 392b05662..b66f3668e 100644
--- a/src/spicelib/parser/inp2m.c
+++ b/src/spicelib/parser/inp2m.c
@@ -64,7 +64,7 @@ INP2M(CKTcircuit *ckt, INPtables *tab, struct card *current)
 
     line = current->line;
 
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
 
     for (i = 0; ; i++) {
diff --git a/src/spicelib/parser/inp2o.c b/src/spicelib/parser/inp2o.c
index 984ec7986..30ee464c2 100644
--- a/src/spicelib/parser/inp2o.c
+++ b/src/spicelib/parser/inp2o.c
@@ -44,7 +44,7 @@ void INP2O(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2p.c b/src/spicelib/parser/inp2p.c
index 8a1ccf0c3..6c4827c53 100644
--- a/src/spicelib/parser/inp2p.c
+++ b/src/spicelib/parser/inp2p.c
@@ -47,7 +47,7 @@ int num, i;
         return;
     }
     line = current->line;
-    INPgetTok(&line,&name,1);
+    INPgetNetTok(&line,&name,1);
     INPinsert(&name,tab);
     /* num = (int) INPevaluate(&line,&error1,1); */
     num = 0;
diff --git a/src/spicelib/parser/inp2q.c b/src/spicelib/parser/inp2q.c
index a98871c41..d163db183 100644
--- a/src/spicelib/parser/inp2q.c
+++ b/src/spicelib/parser/inp2q.c
@@ -60,7 +60,7 @@ void INP2Q(CKTcircuit *ckt, INPtables * tab, struct card *current, CKTnode *gnod
 
     line = current->line;
 
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
 
     for (i = 0; ; i++) {
diff --git a/src/spicelib/parser/inp2r.c b/src/spicelib/parser/inp2r.c
index 734dea4f2..c4972f3fa 100644
--- a/src/spicelib/parser/inp2r.c
+++ b/src/spicelib/parser/inp2r.c
@@ -57,7 +57,7 @@ void INP2R(CKTcircuit *ckt, INPtables * tab, struct card *current)
         }
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);			/* Rname */
+    INPgetNetTok(&line, &name, 1);			/* Rname */
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);		/* <node> */
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2s.c b/src/spicelib/parser/inp2s.c
index 1ced47178..cd1676511 100644
--- a/src/spicelib/parser/inp2s.c
+++ b/src/spicelib/parser/inp2s.c
@@ -44,7 +44,7 @@ void INP2S(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2t.c b/src/spicelib/parser/inp2t.c
index da04f21e2..3e4d1f1bf 100644
--- a/src/spicelib/parser/inp2t.c
+++ b/src/spicelib/parser/inp2t.c
@@ -41,7 +41,7 @@ void INP2T(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2u.c b/src/spicelib/parser/inp2u.c
index 34a907bc7..81783972b 100644
--- a/src/spicelib/parser/inp2u.c
+++ b/src/spicelib/parser/inp2u.c
@@ -40,7 +40,7 @@ void INP2U(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2w.c b/src/spicelib/parser/inp2w.c
index 937ed454f..f640bbca1 100644
--- a/src/spicelib/parser/inp2w.c
+++ b/src/spicelib/parser/inp2w.c
@@ -42,7 +42,7 @@ void INP2W(CKTcircuit *ckt, INPtables * tab, struct card *current)
 	return;
     }
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);
diff --git a/src/spicelib/parser/inp2y.c b/src/spicelib/parser/inp2y.c
index f31abed7d..567333dcb 100644
--- a/src/spicelib/parser/inp2y.c
+++ b/src/spicelib/parser/inp2y.c
@@ -58,7 +58,7 @@ int lenvalgiven = 0;
         return;
     }
     line = current->line;
-    INPgetTok(&line,&name,1);
+    INPgetNetTok(&line,&name,1);
     INPinsert(&name,tab);
     INPgetNetTok(&line,&nname1,1);
     INPtermInsert(ckt,&nname1,tab,&node1);
diff --git a/src/spicelib/parser/inp2z.c b/src/spicelib/parser/inp2z.c
index 99ad7df9d..67c3fc8b4 100644
--- a/src/spicelib/parser/inp2z.c
+++ b/src/spicelib/parser/inp2z.c
@@ -44,7 +44,7 @@ void INP2Z(CKTcircuit *ckt, INPtables * tab, struct card *current)
 
    
     line = current->line;
-    INPgetTok(&line, &name, 1);
+    INPgetNetTok(&line, &name, 1);
     INPinsert(&name, tab);
     INPgetNetTok(&line, &nname1, 1);
     INPtermInsert(ckt, &nname1, tab, &node1);