From a2f5c5e234338c9d23955c05e4f72008639767a2 Mon Sep 17 00:00:00 2001
From: stefanjones <stefanjones>
Date: Mon, 3 May 2004 16:15:39 +0000
Subject: [PATCH] * src/spicelib/parser/inp2dot.c: 	Fix .noise statements
 by reverting Brorson's INPgetNetTok lines

---
 ChangeLog                     |  5 +++++
 src/spicelib/parser/inp2dot.c | 12 ++++++------
 2 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index db6530458..106a36946 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-05-03 Stefan Jones <stefan.jones@multigig.com>
+
+	* src/spicelib/parser/inp2dot.c:
+	Fix .noise statements by reverting Brorson's INPgetNetTok lines
+
 2003-12-24 Stefan Jones <stefan.jones@multigig.com>
 
 	* configure.in:
diff --git a/src/spicelib/parser/inp2dot.c b/src/spicelib/parser/inp2dot.c
index 1868dccf4..dee7b7fd2 100644
--- a/src/spicelib/parser/inp2dot.c
+++ b/src/spicelib/parser/inp2dot.c
@@ -57,13 +57,13 @@ dot_noise(char *line, void *ckt, INPtables *tab, card *current,
 	length = strlen(name);
 	if (((*name == 'V') || (*name == 'v')) && (length == 1)) {
 
-	    INPgetNetTok(&line, &nname1, 0);
+	    INPgetTok(&line, &nname1, 0);
 	    INPtermInsert(ckt, &nname1, tab, &node1);
 	    ptemp.nValue = (IFnode) node1;
 	    GCA(INPapName, (ckt, which, foo, "output", &ptemp))
 
 		if (*line != ')') {
-		    INPgetNetTok(&line, &nname2, 1);
+		    INPgetTok(&line, &nname2, 1);
 		    INPtermInsert(ckt, &nname2, tab, &node2);
 		    ptemp.nValue = (IFnode) node2;
 		} else {
@@ -352,12 +352,12 @@ dot_tf(char *line, void *ckt, INPtables *tab, card *current,
 	if (*line != '(' ) {
 	    /* error, bad input format */
 	}
-	INPgetNetTok(&line, &nname1, 0);
+	INPgetTok(&line, &nname1, 0);
 	INPtermInsert(ckt, &nname1, tab, &node1);
 	ptemp.nValue = (IFnode) node1;
 	GCA(INPapName, (ckt, which, foo, "outpos", &ptemp));
 	if (*line != ')') {
-	    INPgetNetTok(&line, &nname2, 1);
+	    INPgetTok(&line, &nname2, 1);
 	    INPtermInsert(ckt, &nname2, tab, &node2);
 	    ptemp.nValue = (IFnode) node2;
 	    GCA(INPapName, (ckt, which, foo, "outneg", &ptemp));
@@ -487,13 +487,13 @@ dot_sens(char *line, void *ckt, INPtables *tab, card *current,
 	    LITERR("Syntax error: '(' expected after 'v'\n");
 	    return 0;
 	}
-	INPgetNetTok(&line, &nname1, 0);
+	INPgetTok(&line, &nname1, 0);
 	INPtermInsert(ckt, &nname1, tab, &node1);
 	ptemp.nValue = (IFnode) node1;
 	GCA(INPapName, (ckt, which, foo, "outpos", &ptemp))
 
 	    if (*line != ')') {
-		INPgetNetTok(&line, &nname2, 1);
+		INPgetTok(&line, &nname2, 1);
 		INPtermInsert(ckt, &nname2, tab, &node2);
 		ptemp.nValue = (IFnode) node2;
 		GCA(INPapName, (ckt, which, foo, "outneg", &ptemp));