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

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

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

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

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 */

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

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++) {

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

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;

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++) {

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

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

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

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

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

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

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