Merge branch 'master' into netgen-1.5

Makefile

@@ -9,7 +9,7 @@ MODULES = base
 MAKEFLAGS =
 INSTALL_CAD_DIRS = lib doc
 
--include defs.mak
+include defs.mak
 
 all:	$(ALL_TARGET)
 
@@ -51,8 +51,8 @@ depend:
 install: $(INSTALL_TARGET)
 
 install-netgen:
-	@echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
-	@echo --- installing run-time files to $(DESTDIR)${INSTALL_LIBDIR}
+	@echo --- installing executable to $(DESTDIR)${BINDIR}
+	@echo --- installing run-time files to $(DESTDIR)${LIBDIR}
 	@${MAKE} install-real >> install.log
 
 install-real: install-dirs
@@ -60,15 +60,15 @@ install-real: install-dirs
 		(cd $$dir && ${MAKE} install); done
 
 install-tcl-dirs:
-	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR} \
-		$(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_PYDIR}
+	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${BINDIR} \
+		$(DESTDIR)${TCLDIR} $(DESTDIR)${PYDIR}
 
 install-dirs:
-	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${INSTALL_BINDIR}
+	${NETGENDIR}/scripts/mkdirs $(DESTDIR)${BINDIR}
 
 install-tcl: install-dirs
-	@echo --- installing executable to $(DESTDIR)${INSTALL_BINDIR}
-	@echo --- installing run-time files to $(DESTDIR)${INSTALL_LIBDIR}
+	@echo --- installing executable to $(DESTDIR)${BINDIR}
+	@echo --- installing run-time files to $(DESTDIR)${LIBDIR}
 	@${MAKE} install-tcl-real 2>&1 >> install.log
 
 install-tcl-real: install-tcl-dirs

VERSION

@@ -1 +1 @@
-1.5.158
+1.5.127

base/flatten.c

@@ -259,7 +259,7 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
   struct  nlist *ChildCell;
   struct objlist *tmp, *ob2, *ob3;
   int	notdone, rnodenum;
-  char	tmpstr[1024];
+  char	tmpstr[200];
   int	nextnode, oldmax, numflat = 0;
 #if !OLDPREFIX
   int     prefixlength;
@@ -1166,7 +1166,7 @@ struct nlist *cleanuppins(struct hashlist *p, void *clientdata)
           while (ob && obt && (ob->type > FIRSTPIN || ob == firstpin) &&
 			ob->model.class != NULL) {
 	     nob = ob->next;
-	     if ((obt->type == PORT) && (obt->node == -2)) {
+	     if ((obt->type == PORT) && (obt->node == -1)) {
 
 	        /* Remove this pin */
 
@@ -1238,7 +1238,7 @@ int CleanupPins(char *name, int filenum)
 
    for (ob = ThisCell->cell; ob != NULL; ob = ob->next) {
       if (ob->type != PORT) break;
-      if (ob->node == -2) {
+      if (ob->node == -1) {
 	 needscleanup = 1;
 	 break;
       }
@@ -1265,7 +1265,7 @@ int CleanupPins(char *name, int filenum)
       }
       else if (ob->type != PORT) break;
       nob = ob->next;
-      if (ob->node == -2) {
+      if (ob->node == -1) {
 	 if (lob == NULL) {
 	    ThisCell->cell = ob->next;
 	 }
@@ -1539,7 +1539,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 	/* (it without regard to cell1) improves the matching.	*/
 
 	else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell2 != NULL) &&
-			(ecomp->num2 != 0) && (ecomp->cell2->class == CLASS_SUBCKT)) {
+			(ecomp->cell2->class == CLASS_SUBCKT)) {
 	    ecomp->add2 = -ecomp->num2;
 	    match = 1;
 	    for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
@@ -1597,7 +1597,7 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 	/* (it without regard to cell1) improves the matching.	*/
 
 	else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell1 != NULL) &&
-			(ecomp->num1 != 0) && (ecomp->cell1->class == CLASS_SUBCKT)) {
+			(ecomp->cell1->class == CLASS_SUBCKT)) {
 	    ecomp->add1 = -ecomp->num1;
 	    match = 1;
 	    for (ob2 = ecomp->cell1->cell; ob2; ob2 = ob2->next) {

base/netcmp.h

@@ -7,10 +7,6 @@ extern struct nlist *Circuit1;
 extern struct nlist *Circuit2;
 
 extern int ExhaustiveSubdivision;
-extern int FastSymmetryBreaking;
-
-extern int left_col_end;
-extern int right_col_end;
 
 #ifdef TCL_NETGEN
 #include <tcl.h>

base/netfile.c

@@ -47,18 +47,6 @@ static FILE *outfile;
 static int Graph = 0;
 int File;
 
-/*------------------------------------------------------*/
-/* Structure for stacking nested `if[n]def in verilog	*/
-/*------------------------------------------------------*/
-
-struct ifstack {
-    int invert;
-    struct property *kl;
-    struct ifstack *next;
-};
-
-struct ifstack *condstack = NULL;
-
 extern char *SetExtension(char *buffer, char *path, char *extension)
 /* add 'extension' to 'path' (overwriting previous extension, if any),
    write it into buffer (if buffer is null, malloc a buffer).
@@ -203,14 +191,11 @@ struct filestack {
 
 static struct filestack *OpenFiles = NULL;
 
-struct hashdict *definitions = (struct hashdict *)NULL;
-
 #define WHITESPACE_DELIMITER " \t\n\r"
 
 /*----------------------------------------------------------------------*/
 /* TrimQuoted() ---							*/
 /* Remove spaces from inside single- or double-quoted strings.		*/
-/* Ignore verilog constant bits (e.g., "1'b0") when parsing.		*/
 /*----------------------------------------------------------------------*/
 
 void TrimQuoted(char *line)
@@ -226,13 +211,6 @@ void TrimQuoted(char *line)
     {
 	changed = FALSE;
 	qstart = strchr(lptr, '\'');
-	if (qstart && (qstart > lptr)) {
-	    if (isdigit(*(qstart - 1))) {
-		lptr = qstart + 1;
-		changed = TRUE;
-		continue;
-	    }
-	}
 	if (qstart)
 	{
 	    qend = strchr(qstart + 1, '\'');
@@ -273,6 +251,7 @@ void TrimQuoted(char *line)
 	    }
 	}
     }
+
 }
 
 /*----------------------------------------------------------------------*/
@@ -286,216 +265,39 @@ void TrimQuoted(char *line)
 
 int GetNextLineNoNewline(char *delimiter)
 {
-    char *newbuf;
-    int testc;
-    int nested = 0;
-    int llen;
+  char *newbuf;
+  int testc;
 
-    if (feof(infile)) return -1;
+  if (feof(infile)) return -1;
 
-    while (1) {	    /* May loop indefinitely in an `if[n]def conditional */
+  // This is more reliable than feof() ...
+  testc = getc(infile);
+  if (testc == -1) return -1;
+  ungetc(testc, infile); 
 
-	// This is more reliable than feof() ...
-	testc = getc(infile);
-	if (testc == -1) return -1;
-	ungetc(testc, infile); 
+  if (linesize == 0) {
+	/* Allocate memory for line */
+	linesize = 500;
+	line = (char *)MALLOC(linesize);
+	linetok = (char *)MALLOC(linesize);
+  }
+  fgets(line, linesize, infile);
+  while (strlen(line) == linesize - 1) {
+       newbuf = (char *)MALLOC(linesize + 500);
+       strcpy(newbuf, line);
+       FREE(line);
+       line = newbuf;
+       fgets(line + linesize - 1, 501, infile);
+       linesize += 500;
+       FREE(linetok);
+       linetok = (char *)MALLOC(linesize);
+  }
+  linenum++;
+  strcpy(linetok, line);
+  TrimQuoted(linetok);
 
-	if (linesize == 0) {
-	    /* Allocate memory for line */
-	    linesize = 2000;
-	    line = (char *)MALLOC(linesize + 1);
-	    linetok = (char *)MALLOC(linesize + 1);
-	}
-	fgets(line, linesize, infile);
-	/* Immediately resolve backslash-EOL */
-	llen = strlen(line);
-	while ((llen > 1) && (llen < linesize - 1) && *(line + llen - 2) == '\\') {
-	    *(line + llen - 2) = '\n';
-	    fgets(line + llen - 1, linesize - llen + 1, infile);
-	    llen = strlen(line);
-	}
-	while (llen == linesize - 1) {
-	    newbuf = (char *)MALLOC(linesize + 501);
-	    strcpy(newbuf, line);
-	    FREE(line);
-	    line = newbuf;
-	    fgets(line + linesize - 1, 501, infile);
-	    llen = strlen(line);
-	    while ((llen > 1) && (llen < linesize - 1) && *(line + llen - 2) == '\\') {
-		*(line + llen - 2) = '\n';
-		fgets(line + llen - 1, linesize - llen + 1, infile);
-		llen = strlen(line);
-	    }
-	    linesize += 500;
-	    FREE(linetok);
-	    linetok = (char *)MALLOC(linesize + 1);
-	}
-
-	/* Check for substitutions (verilog only).  Make sure linetok is    */
-	/* large enough to hold the entire line after substitutions.	    */
-
-	if (definitions != NULL) {
-	    char *s, *w, e;
-	    struct property *kl;
-	    int len, dlen, vlen, addin = 0;
-	    unsigned char found = FALSE;
-
-	    for (s = line; *s != '\0'; s++) {
-		if (*s == '`') {
-		    w = s + 1;
-		    while (isalnum(*w) || (*w == '_') || (*w == '$')) w++;
-		    e = *w;
-		    *w = '\0';
-		    kl = (struct property *)HashLookup(s + 1, definitions);
-		    if (kl != NULL) {
-			dlen = strlen(s);
-			if (kl->type == PROP_STRING) {
-			    vlen = strlen(kl->pdefault.string);
-			}
-			else vlen = 12;  /* Leave room for numeric conversion */
-			addin += vlen - dlen + 1;
-			found = TRUE;
-		    }
-		    *w = e;
-		}
-	    }
-	    if (found) {
-		len = strlen(line);
-		if (len + addin > linesize) {
-		    while (len + addin > linesize) linesize += 500;
-		    FREE(linetok);
-		    linetok = (char *)MALLOC(linesize);
-		}
-	    }
-	}
-
-	/* Make definition substitutions (verilog only) */
-
-	if (definitions != NULL) {
-	    char *s, *t, *w, e;
-	    struct property *kl;
-
-	    t = linetok;
-	    for (s = line; *s != '\0'; s++) {
-		if (*s == '`') {
-		    w = s + 1;
-		    while (isalnum(*w) || (*w == '_') || (*w == '$')) w++;
-		    e = *w;
-		    *w = '\0';
-		    kl = (struct property *)HashLookup(s + 1, definitions);
-		    if (kl != NULL) {
-			if (kl->type == PROP_STRING)
-			    strcpy(t, kl->pdefault.string);
-			else if (kl->type == PROP_INTEGER)
-			    sprintf(t, "%d", kl->pdefault.ival);
-			else if (kl->type == PROP_DOUBLE)
-			    sprintf(t, "%g", kl->pdefault.dval);
-			t += strlen(t);
-			s = w - 1;
-		    }
-		    else *t++ = *s;
-		    *w = e;
-		}
-		else *t++ = *s;
-	    }
-	    *t = '\0';
-	}
-	else
-	    strcpy(linetok, line);
-
-	TrimQuoted(linetok);
-	linenum++;
-
-	nexttok = strdtok(linetok, WHITESPACE_DELIMITER, delimiter);
-	if (nexttok == NULL) return 0;
-
-	/* Handle `ifdef, `ifndef, `elsif, `else, and `endif (verilog	*/
-	/* only, where indicated by a non-NULL "definitions")		*/
-
-	if (definitions == NULL) return 0;
-
-	/* If currently skipping through a section, handle conditionals differently */
-
-	if (condstack) {
-	    if (((condstack->invert == 0) && (condstack->kl == NULL))
-			|| ((condstack->invert == 1) && (condstack->kl != NULL))) {
-		if (match(nexttok, "`ifdef") || match(nexttok, "`ifndef")) {
-		    nested++;
-		    continue;
-		}
-		else if (nested > 0) {
-		    if (match(nexttok, "`endif")) nested--;
-		    continue;
-		}
-		else if (nexttok[0] != '`') continue; 
-	    }
-	}
-
-	/* Handle conditionals (that is not being skipped over) */
-
-	if (match(nexttok, "`endif")) {
-	    if (condstack == NULL) {
-		fprintf(stderr, "Error:  `endif without corresponding `if[n]def\n");
-	    }
-	    else {
-		struct ifstack *iftop = condstack;
-		condstack = condstack->next;
-		FREE(iftop);   
-	    }
-	}
-
-	/* Note that `if[n]def may be nested. */
-    
-	else if (match(nexttok, "`ifdef") || match(nexttok, "`ifndef") ||
-		    match(nexttok, "`elsif") || match(nexttok, "`else")) {
-
-	    /* Every `ifdef or `ifndef increases condstack by 1 */
-	    if (nexttok[1] == 'i') {
-		struct ifstack *newif = (struct ifstack *)MALLOC(sizeof(struct ifstack));
-		newif->next = condstack;
-		condstack = newif;
-	    }
-	    if (condstack == NULL) {
-		fprintf(stderr, "Error:  %s without `if[n]def\n", nexttok);
-		break;
-	    }
-	    else {
-		if (match(nexttok, "`else")) {
-		    /* Invert the sense of the if[n]def scope */
-		    condstack->invert = (condstack->invert == 1) ? 0 : 1;
-		}
-		else if (match(nexttok, "`elsif")) {
-		    nexttok = strdtok(NULL, WHITESPACE_DELIMITER, delimiter);
-		    if (nexttok == NULL) {
-			fprintf(stderr, "Error:  `elsif with no conditional.\n");
-			return 0;
-		    }
-		    /* Keep the same scope but redefine the parameter */
-		    condstack->invert = 0;
-		    condstack->kl = (struct property *)HashLookup(nexttok, definitions);
-		}
-		else {
-		    condstack->invert = (nexttok[3] == 'n') ? 1 : 0;
-		    nexttok = strdtok(NULL, WHITESPACE_DELIMITER, delimiter);
-		    if (nexttok == NULL) {
-			fprintf(stderr, "Error:  %s with no conditional.\n", nexttok);
-			return 0;
-		    }
-		    condstack->kl = (struct property *)HashLookup(nexttok, definitions);
-		}
-	    }
-	}
-	else if (condstack) {
-	    if (((condstack->invert == 0) && (condstack->kl == NULL))
-			|| ((condstack->invert == 1) && (condstack->kl != NULL)))
-		continue;
-	    else
-		break;
-	}
-	else
-	    break;
-    }
-    return 0;
+  nexttok = strdtok(linetok, WHITESPACE_DELIMITER, delimiter);
+  return 0;
 }
 
 /*----------------------------------------------------------------------*/
@@ -510,24 +312,6 @@ void GetNextLine(char *delimiter)
     } while (nexttok == NULL);
 }
 
-/*----------------------------------------------------------------------*/
-/* Return a pointer to the line at the position of nexttok		*/
-/* This is used only when returning the entire line, untokenized, and	*/
-/* is only called by the verilog read routine when reading the value of	*/
-/* a `define statement.							*/
-/*----------------------------------------------------------------------*/
-
-char *GetLineAtTok()
-{
-    char *lpos;
-
-    if (nexttok == NULL) return NULL;
-    if (line == NULL) return NULL;
-
-    lpos = strstr(line, nexttok);
-    return lpos;
-}
-
 /*----------------------------------------------------------------------*/
 /* if nexttok is already NULL, force scanner to read new line		*/
 /*----------------------------------------------------------------------*/
@@ -694,20 +478,9 @@ char *strdtok(char *pstring, char *delim1, char *delim2)
     /* space character becomes part of the verilog name.  The remainder of the  */
     /* name is parsed according to the rules of "delim2".                       */
 
-    /* Special verilog rule exception:  To handle the problems caused by	*/
-    /* translating verilog backslash-escaped names into other netlist formats	*/
-    /* like SPICE where the convention is strictly prohibited, I have used the	*/
-    /* convention in qflow scripts to replace the trailing space with another	*/
-    /* backslash, so the name is effectively delimited by a pair of back-	*/
-    /* slashes.  Therefore check for a space or another backslash, whichever	*/
-    /* comes first.  That will satisfy both methods.  Technically this routine	*/
-    /* should know whether it is parsing SPICE or verilog and handle the syntax	*/
-    /* accordingly (needs to be done).						*/
-
     if (*s == '\\') {
-        s++;
         while (*s != '\0') {
-	    if ((*s == ' ') || (*s == '\\')) {
+	    if (*s == ' ') {
 		s++;
 		break;
 	    }
@@ -798,7 +571,7 @@ int OpenParseFile(char *name, int fnum)
   FILE *locfile;
   struct filestack *newfile;
 
-  locfile = fopen(name, "r");
+  locfile = fopen(name,"r");
   linenum = 0;
   /* reset the token scanner */
   nexttok = NULL;  
@@ -883,12 +656,7 @@ char *ReadNetlist(char *fname, int *fnum)
       {SPICE_EXTENSION, ReadSpice},
       {SPICE_EXT2, ReadSpice},
       {SPICE_EXT3, ReadSpice},
-      {SPICE_EXT4, ReadSpice},
-      {SPICE_EXT5, ReadSpice},
-      {SPICE_EXT6, ReadSpice},
-      {SPICE_EXT7, ReadSpice},
       {VERILOG_EXTENSION, ReadVerilog},
-      {SYS_VERILOG_EXTENSION, ReadVerilog},
       {NETGEN_EXTENSION, ReadNetgenFile},
       {NULL, NULL}
     };

base/netfile.h

@@ -9,16 +9,11 @@
 #define SIM_EXTENSION ".sim"
 #define SPICE_EXTENSION ".spice"
 #define SPICE_EXT2 ".spc"
-#define SPICE_EXT3 ".sp"
-#define SPICE_EXT4 ".spi"
-#define SPICE_EXT5 ".fspc"
-#define SPICE_EXT6 ".cir"
-#define SPICE_EXT7 ".ckt"
+#define SPICE_EXT3 ".fspc"
 #define NETGEN_EXTENSION ".ntg"
 #define CCODE_EXTENSION ".c.code"
 #define ESACAP_EXTENSION ".esa"
 #define VERILOG_EXTENSION ".v"
-#define SYS_VERILOG_EXTENSION ".sv"
 
 #define LINELENGTH 80
 
@@ -29,17 +24,14 @@ extern void FlushString (char *format, ...);
 extern char *SetExtension(char *buffer, char *path, char *extension);
 
 extern int File;
-extern struct hashdict *definitions;
 
 /* input routines */
 
 extern char *nexttok;
 #define SKIPTO(a) do {SkipTok(NULL);} while (!match(nexttok,a))
 extern char *strdtok(char *pstring, char *delim1, char *delim2);
-extern char *GetLineAtTok();
 extern void SkipTok(char *delimiter);
 extern void SkipTokNoNewline(char *delimiter);
-extern void SkipTokComments(char *delimiter);
 extern void SkipNewLine(char *delimiter);
 extern void SpiceTokNoNewline(void);	/* handles SPICE "+" continuation line */
 extern void SpiceSkipNewLine(void);	/* handles SPICE "+" continuation line */

base/objlist.c

@@ -289,7 +289,7 @@ static struct hashdict cell_dict;
 void InitCellHashTable(void)
 {
     hashfunc = hash;
-    matchfunc = NULL;
+    matchfunc = match;
     matchintfunc = matchfile;
     InitializeHashTable(&cell_dict, CELLHASHSIZE);
 }
@@ -1112,17 +1112,13 @@ void FreeObjectAndHash(struct objlist *ob, struct nlist *ptr)
 
 /***************  GENERAL UTILITIES ****************************/
 
-int NumberOfPorts(char *cellname, int file)
+int NumberOfPorts(char *cellname)
 {
   struct nlist *tp;
   struct objlist *ob;
   int ports;
 
-  if (file == -1)
-    tp = LookupCell(cellname);
-  else
-    tp = LookupCellFile(cellname, file);
-
+  tp = LookupCell(cellname);
   if (tp == NULL) return(0);
   ports = 0;
   for (ob = tp->cell; ob != NULL; ob = ob->next)

base/objlist.h

@@ -242,7 +242,7 @@ extern void FreeObjectAndHash(struct objlist *ob, struct nlist *ptr);
 extern void FreePorts(char *cellname);
 extern struct IgnoreList *ClassIgnore;
 
-extern int NumberOfPorts(char *cellname, int file);
+extern int NumberOfPorts(char *cellname);
 extern struct objlist *InstanceNumber(struct nlist *tp, int inst);
 
 extern struct objlist *List(char *list_template);

base/place.c

@@ -929,7 +929,7 @@ void ToggleDebug(void)
 void DescribeCell(char *name, int detail)
 {
   Printf("Cell: %s contains %d instances, %d nodes and %d ports\n", name, 
-	 NumberOfInstances(name),  RenumberNodes(name), NumberOfPorts(name, -1));
+	 NumberOfInstances(name),  RenumberNodes(name), NumberOfPorts(name));
   PrintEmbeddingTree(stdout,name,detail);
 }
 

base/query.c

@@ -801,16 +801,9 @@ void DescribeInstance(char *name, int file)
   {
     if (ob->node > nodemax) nodemax = ob->node;
     else if ((ob->node == -1) && (ob->model.port != PROXY)) {
-
-      /* All black-box modules and placeholders by definition have all	*/
-      /* disconnected pins, so don't report those.			*/
-
-      if (!(tp->flags & CELL_PLACEHOLDER) && (tp->class != CLASS_MODULE))
-      {
-	if (disconnectednodes == 0) Fprintf(stderr, "\n");
-        disconnectednodes++;
-        Fprintf(stderr, "Cell %s disconnected node: %s\n", tp->name, ob->name);
-      }
+      if (disconnectednodes == 0) Fprintf(stderr, "\n");
+      disconnectednodes++;
+      Fprintf(stderr, "Cell %s disconnected node: %s\n", tp->name, ob->name);
     }
   }
   instlist = (unsigned char *) CALLOC((nodemax + 1), sizeof(unsigned char));
@@ -907,7 +900,7 @@ void PrintLeavesInCell(char *cellname, int filenum)
   np->dumped = 1;
 
   if (np->class != CLASS_SUBCKT) {
-    Printf("%s; %d ports; Primitive.\n", cellname, NumberOfPorts(cellname, filenum));
+    Printf("%s; %d ports; Primitive.\n", cellname, NumberOfPorts(cellname));
     return;
   }
 
@@ -920,7 +913,7 @@ void PrintLeavesInCell(char *cellname, int filenum)
       am_a_leaf = 0;
     }
 
-  if (am_a_leaf) Printf("%s; %d ports\n", cellname, NumberOfPorts(cellname, filenum));
+  if (am_a_leaf) Printf("%s; %d ports\n", cellname, NumberOfPorts(cellname));
   return;
 }
 
@@ -1070,7 +1063,7 @@ void Query(void)
       ActelLib();
       break;
     case 'S':
-      promptstring("Read SPICE (.spice) file? ", repstr);
+      promptstring("Read SPICE (.ckt) file? ", repstr);
       ReadSpice(repstr, &filenum);
       break;
     case 'V':

base/spice.c

@@ -1883,36 +1883,20 @@ char *ReadSpiceTop(char *fname, int *fnum, int blackbox)
   CurrentCell = NULL;
 
   if ((filenum = OpenParseFile(fname, *fnum)) < 0) {
+    char name[100];
 
-    if (strrchr(fname, '.') == NULL) {
-      char name[1024];
-      SetExtension(name, fname, SPICE_EXTENSION);
-      if ((filenum = OpenParseFile(name, *fnum)) < 0) {
-        Fprintf(stderr, "Error in SPICE file read: No file %s\n", name);
-        *fnum = filenum;
-        return NULL;
-      }
-    }    
-    else {
-      Fprintf(stderr, "Error in SPICE file read: No file %s\n", fname);
+    SetExtension(name, fname, SPICE_EXTENSION);
+    if ((filenum = OpenParseFile(name, *fnum)) < 0) {
+      Fprintf(stderr,"Error in SPICE file read: No file %s\n",name);
       *fnum = filenum;
       return NULL;
-    }
+    }    
   }
 
-  /* Make sure all SPICE file reading is case insensitive   */
-  /* BUT if a verilog file was read before it, then it will */
-  /* be forced to be case sensitive, caveat end-user.	    */
-
-  if (matchfunc == match) {
-      Printf("Warning:  A case-sensitive file has been read and so the "
-                "SPICE netlist must be treated case-sensitive to match.\n");
-  }
-  else {
-      matchfunc = matchnocase;
-      matchintfunc = matchfilenocase;
-      hashfunc = hashnocase;
-  }
+  /* Make sure all SPICE file reading is case insensitive */
+  matchfunc = matchnocase;
+  matchintfunc = matchfilenocase;
+  hashfunc = hashnocase;
 
   InitializeHashTable(&spiceparams, OBJHASHSIZE);
 
@@ -1996,18 +1980,14 @@ void IncludeSpice(char *fname, int parent, struct cellstack **CellStackPtr,
 	/* helps, if the file didn't have an extension.  But	*/
 	/* really, we're getting desperate at this point.	*/
 
-	if (strrchr(fname, '.') == NULL) {
+	if (strchr(fname, '.') == NULL) {
            SetExtension(name, fname, SPICE_EXTENSION);
            filenum = OpenParseFile(name, parent);
-	   if (filenum < 0) {
-             Fprintf(stderr, "Error in SPICE file include: No file %s\n", name);
-             return;
-	   }
-        }    
-        else {
-          Fprintf(stderr, "Error in SPICE file include: No file %s\n", fname);
-          return;
 	}
+        if (filenum < 0) {
+           Fprintf(stderr,"Error in SPICE file include: No file %s\n",name);
+           return;
+        }    
      }
   }
   ReadSpiceFile(fname, parent, CellStackPtr, blackbox);

configure

@@ -4,6 +4,4 @@
 # all of its config scripts in a different directory than the configure
 # script itself.
 
-export CFLAGS="$CFLAGS -g"
-cd scripts
-exec ./configure "$@"
+( CFLAGS="-g" ; export CFLAGS ; cd scripts ; ./configure "$@" )

doc/Makefile

@@ -2,11 +2,11 @@ NETGENDIR = ..
 
 include ${NETGENDIR}/defs.mak
 
-MANDIRS = $(DESTDIR)${INSTALL_MANDIR} $(DESTDIR)${INSTALL_MANDIR}/man1
-DOCDIRS = $(DESTDIR)${INSTALL_DOCDIR}
+MANDIRS = $(DESTDIR)${MANDIR} $(DESTDIR)${MANDIR}/man1
+DOCDIRS = $(DESTDIR)${DOCDIR}
 
 MANFILES = 
-DOCFILES = $(DESTDIR)${INSTALL_DOCDIR}/netgen.doc
+DOCFILES = $(DESTDIR)${DOCDIR}/netgen.doc
 
 install-tcl: ${DOCDIRS} ${DOCFILES}
 
@@ -23,8 +23,8 @@ make-doc-dirs:
 	${SCRIPTS}/mkdirs ${DOCDIRS}
 
 # This file does not actually exist. . .
-$(DESTDIR)${INSTALL_MANDIR}/man1/netgen.1: netgen.1 ${MANDIRS}
-	${CP} netgen.1 $(DESTDIR)${INSTALL_MANDIR}/man1/netgen.1
+$(DESTDIR)${MANDIR}/man1/netgen.1: netgen.1 ${MANDIRS}
+	${CP} netgen.1 $(DESTDIR)${MANDIR}/man1/netgen.1
 
-$(DESTDIR)${INSTALL_DOCDIR}/netgen.doc: netgen.doc ${DOCDIRS}
-	${CP} netgen.doc $(DESTDIR)${INSTALL_DOCDIR}/netgen.doc
+$(DESTDIR)${DOCDIR}/netgen.doc: netgen.doc ${DOCDIRS}
+	${CP} netgen.doc $(DESTDIR)${DOCDIR}/netgen.doc

lib/Makefile

@@ -4,14 +4,14 @@ include ${NETGENDIR}/defs.mak
 
 LIB_FILES = ntk2adl.sh spice spice.bot spice.top
 
-LIB_INST_FILES= $(LIB_FILES:%=$(DESTDIR)${INSTALL_LIBDIR}/netgen/%)
-BIN_INST_FILES= $(BIN_FILES:%=$(DESTDIR)${INSTALL_BINDIR}/%)
+LIB_INST_FILES= $(LIB_FILES:%=$(DESTDIR)${LIBDIR}/netgen/%)
+BIN_INST_FILES= $(BIN_FILES:%=$(DESTDIR)${BINDIR}/%)
 
 install-tcl: ${LIB_INST_FILES}
 
 install: ${LIB_INST_FILES}
 
-$(DESTDIR)${INSTALL_LIBDIR}/netgen/%: %
-	../scripts/mkdirs $(DESTDIR)${INSTALL_LIBDIR}/netgen
-	${RM} $(DESTDIR)${INSTALL_LIBDIR}/netgen/$*
-	${CP} $* $(DESTDIR)${INSTALL_LIBDIR}/netgen/$*
+$(DESTDIR)${LIBDIR}/netgen/%: %
+	../scripts/mkdirs $(DESTDIR)${LIBDIR}/netgen
+	${RM} $(DESTDIR)${LIBDIR}/netgen/$*
+	${CP} $* $(DESTDIR)${LIBDIR}/netgen/$*

netgen/Makefile

@@ -25,23 +25,23 @@ tclnetgen${SHDLIB_EXT}: ${EXTRA_LIBS}
 		${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} \
 		-lc ${LIBS} ${LIB_SPECS} ${LDFLAGS}
 
-$(DESTDIR)${INSTALL_BINDIR}/netgen:
+$(DESTDIR)${BINDIR}/netgen:
 	${RM} $@
 	${CP} netgen $@
 
-$(DESTDIR)${INSTALL_BINDIR}/ntk2adl:
+$(DESTDIR)${BINDIR}/ntk2adl:
 	${RM} $@
 	${CP} ntk2adl $@
 
-$(DESTDIR)${INSTALL_BINDIR}/ntk2xnf:
+$(DESTDIR)${BINDIR}/ntk2xnf:
 	${RM} $@
 	${CP} ntk2xnf $@
 
-$(DESTDIR)${INSTALL_BINDIR}/netcomp:
+$(DESTDIR)${BINDIR}/netcomp:
 	${RM} $@
 	${CP} netcomp $@
 
-$(DESTDIR)${INSTALL_BINDIR}/inetcomp:
+$(DESTDIR)${BINDIR}/inetcomp:
 	${RM} $@
 	${CP} inetcomp $@
 
@@ -61,14 +61,14 @@ ntk2xnf: ntk2xnf.c
 	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} ntk2xnf.c -o $@ ${EXTRA_LIBS} \
 		${LIBS} ${LDFLAGS}
 
-install: $(DESTDIR)${INSTALL_BINDIR}/netgen $(DESTDIR)${INSTALL_BINDIR}/netcomp \
-		$(DESTDIR)${INSTALL_BINDIR}/inetcomp $(DESTDIR)${INSTALL_BINDIR}/ntk2adl \
-		$(DESTDIR)${INSTALL_BINDIR}/ntk2xnf
+install: $(DESTDIR)${BINDIR}/netgen $(DESTDIR)${BINDIR}/netcomp \
+		$(DESTDIR)${BINDIR}/inetcomp $(DESTDIR)${BINDIR}/ntk2adl \
+		$(DESTDIR)${BINDIR}/ntk2xnf
 
-install-tcl: $(DESTDIR)${INSTALL_TCLDIR} $(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}
+install-tcl: $(DESTDIR)${TCLDIR} $(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}
 
-$(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}: tclnetgen${SHDLIB_EXT}
-	${RM} $(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}
-	${CP} tclnetgen${SHDLIB_EXT} $(DESTDIR)${INSTALL_TCLDIR}/tclnetgen${SHDLIB_EXT}
+$(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}: tclnetgen${SHDLIB_EXT}
+	${RM} $(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}
+	${CP} tclnetgen${SHDLIB_EXT} $(DESTDIR)${TCLDIR}/tclnetgen${SHDLIB_EXT}
 
 include ${NETGENDIR}/rules.mak

python/Makefile

@@ -4,7 +4,7 @@ SRCS =
 SCRIPTS = consoletext.py helpwindow.py lvs_manager.py treeviewsplit.py
 SCRIPTS += tksimpledialog.py tooltip.py lvs_help.txt
 
-SCRIPTINSTALL = $(DESTDIR)${INSTALL_PYDIR}
+SCRIPTINSTALL = $(DESTDIR)${PYDIR}
 
 include ${NETGENDIR}/defs.mak
 
@@ -12,11 +12,11 @@ main: lvs_manager.py
 
 tcl-main: lvs_manager.py
 
-$(DESTDIR)${INSTALL_PYDIR}/consoletext.py:
+$(DESTDIR)${PYDIR}/consoletext.py:
 	${RM} $@
 	${CP} consoletext.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/helpwindow.py:
+$(DESTDIR)${PYDIR}/helpwindow.py:
 	${RM} $@
 	${CP} helpwindow.py $@
 
@@ -24,31 +24,31 @@ lvs_manager.py: lvs_manager.py.in
 	sed -e '/SUBST_SCRIPT_DIR/s#SUBST_SCRIPT_DIR#$(SCRIPTINSTALL)#' \
 		lvs_manager.py.in > lvs_manager.py
 
-$(DESTDIR)${INSTALL_PYDIR}/lvs_manager.py: lvs_manager.py
+$(DESTDIR)${PYDIR}/lvs_manager.py: lvs_manager.py
 	${RM} $@
 	${CP} lvs_manager.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/treeviewsplit.py: treeviewsplit.py
+$(DESTDIR)${PYDIR}/treeviewsplit.py: treeviewsplit.py
 	${RM} $@
 	${CP} treeviewsplit.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/tksimpledialog.py: tksimpledialog.py
+$(DESTDIR)${PYDIR}/tksimpledialog.py: tksimpledialog.py
 	${RM} $@
 	${CP} tksimpledialog.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/tooltip.py: tooltip.py
+$(DESTDIR)${PYDIR}/tooltip.py: tooltip.py
 	${RM} $@
 	${CP} tooltip.py $@
 
-$(DESTDIR)${INSTALL_PYDIR}/lvs_help.txt: lvs_help.txt
+$(DESTDIR)${PYDIR}/lvs_help.txt: lvs_help.txt
 	${RM} $@
 	${CP} lvs_help.txt $@
 
 install: install-tcl
 
-install-tcl: $(DESTDIR)${INSTALL_PYDIR} $(DESTDIR)${INSTALL_PYDIR}/consoletext.py \
-	$(DESTDIR)${INSTALL_PYDIR}/helpwindow.py $(DESTDIR)${INSTALL_PYDIR}/lvs_manager.py \
-	$(DESTDIR)${INSTALL_PYDIR}/treeviewsplit.py $(DESTDIR)${INSTALL_PYDIR}/tksimpledialog.py \
-	$(DESTDIR)${INSTALL_PYDIR}/tooltip.py $(DESTDIR)${INSTALL_PYDIR}/lvs_help.txt
+install-tcl: $(DESTDIR)${PYDIR} $(DESTDIR)${PYDIR}/consoletext.py \
+	$(DESTDIR)${PYDIR}/helpwindow.py $(DESTDIR)${PYDIR}/lvs_manager.py \
+	$(DESTDIR)${PYDIR}/treeviewsplit.py $(DESTDIR)${PYDIR}/tksimpledialog.py \
+	$(DESTDIR)${PYDIR}/tooltip.py $(DESTDIR)${PYDIR}/lvs_help.txt
 
 include ${NETGENDIR}/rules.mak

scripts/configure

@@ -633,7 +633,6 @@ gr_srcs
 gr_libs
 gr_dflags
 gr_cflags
-DIST_DIR
 cadinstall
 programs
 unused
@@ -735,7 +734,6 @@ ac_subst_files=''
 ac_user_opts='
 enable_option_checking
 with_gnu_ld
-with_distdir
 with_interpreter
 with_tcl
 with_tk
@@ -1374,7 +1372,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
-  --with-distdir=DIR       install into location DIR for distribution
   --with-interpreter=arg	enable interpreter
   --with-tcl=DIR          Find tclConfig.sh in DIR
   --with-tk=DIR           Find tkConfig.sh in DIR
@@ -4801,24 +4798,6 @@ usingTcl=1
 usingX11=
 
 
-# For distributed installs, where the run-time files are installed in a
-# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
-# the prefix is replaced by the destination directory, rather than appended
-# to it.
-DIST_DIR="\${exec_prefix}"
-
-# Check whether --with-distdir was given.
-if test "${with_distdir+set}" = set; then :
-  withval=$with_distdir;
-  if test "$withval" = "no" -o "$withval" = "NO" ; then
-     DIST_DIR="\${exec_prefix}"
-  else
-     DIST_DIR=${withval}
-  fi
-
-fi
-
-
 
 # Check whether --with-interpreter was given.
 if test "${with_interpreter+set}" = set; then :
@@ -6608,7 +6587,6 @@ fi
 
 
 
-
 
 
 ac_config_files="$ac_config_files defs.mak"

scripts/configure.in

@@ -249,20 +249,6 @@ usingX11=
 
 dnl Compile-time options below. . .
 
-# For distributed installs, where the run-time files are installed in a
-# place that is a temporary staging area, like DESTDIR, but unlike DESTDIR,
-# the prefix is replaced by the destination directory, rather than appended
-# to it.
-DIST_DIR="\${exec_prefix}"
-AC_ARG_WITH(distdir,
-[  --with-distdir=DIR       install into location DIR for distribution], [
-  if test "$withval" = "no" -o "$withval" = "NO" ; then
-     DIST_DIR="\${exec_prefix}"
-  else
-     DIST_DIR=${withval}
-  fi
-], )
-
 AC_ARG_WITH(interpreter,
 [  --with-interpreter=[arg]	enable interpreter], [
   if test "$withval" = "no" -o "$withval" = "NO"; then
@@ -1286,7 +1272,6 @@ AC_SUBST(modules)
 AC_SUBST(unused)
 AC_SUBST(programs)
 AC_SUBST(cadinstall)
-AC_SUBST(DIST_DIR)
 
 AC_SUBST(gr_cflags)
 AC_SUBST(gr_dflags)

scripts/defs.mak.in

@@ -35,13 +35,6 @@ DOCDIR                 = ${libdir}/netgen/doc
 TCLDIR                 = ${libdir}/netgen/tcl
 PYDIR		       = ${libdir}/netgen/python
 
-INSTALL_BINDIR                 = @DIST_DIR@/bin
-INSTALL_MANDIR                 = @DIST_DIR@/share/man
-INSTALL_LIBDIR                 = @DIST_DIR@/lib
-INSTALL_DOCDIR                 = ${INSTALL_LIBDIR}/netgen/doc
-INSTALL_TCLDIR                 = ${INSTALL_LIBDIR}/netgen/tcl
-INSTALL_PYDIR		       = ${INSTALL_LIBDIR}/netgen/python
-
 MAIN_EXTRA_LIBS        = @extra_libs@
 LD_EXTRA_LIBS          = @ld_extra_libs@
 LD_SHARED              = @ld_extra_objs@

tcltk/Makefile

@@ -12,20 +12,20 @@ CLEANS += netgen.sh netgen.tcl netgenexec${EXEEXT}
 CFLAGS += -I${NETGENDIR}/base
 
 TCL_FILES = \
-	$(DESTDIR)${INSTALL_TCLDIR}/tkcon.tcl \
-	$(DESTDIR)${INSTALL_TCLDIR}/console.tcl \
-	$(DESTDIR)${INSTALL_TCLDIR}/netgen.tcl
+	$(DESTDIR)${TCLDIR}/tkcon.tcl \
+	$(DESTDIR)${TCLDIR}/console.tcl \
+	$(DESTDIR)${TCLDIR}/netgen.tcl
 
 tcl-main: netgenexec${EXEEXT} netgen.tcl netgen.sh
 
-install-tcl: netgenexec${EXEEXT} $(DESTDIR)${INSTALL_BINDIR}/netgen.sh ${TCL_FILES}
-	${RM} $(DESTDIR)${INSTALL_TCLDIR}/netgenexec${EXEEXT}
-	${CP} netgenexec${EXEEXT} $(DESTDIR)${INSTALL_TCLDIR}/netgenexec${EXEEXT}
+install-tcl: netgenexec${EXEEXT} $(DESTDIR)${BINDIR}/netgen.sh ${TCL_FILES}
+	${RM} $(DESTDIR)${TCLDIR}/netgenexec${EXEEXT}
+	${CP} netgenexec${EXEEXT} $(DESTDIR)${TCLDIR}/netgenexec${EXEEXT}
 
 netgenexec${EXEEXT}: netgenexec.c
 	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} netgenexec.c \
 		-o netgenexec${EXEEXT} \
-		${LIB_SPECS_NOSTUB} ${LDFLAGS} ${LIBS} ${GR_LIBS}
+		${LDFLAGS} ${LIBS} ${LIB_SPECS_NOSTUB}
 
 netgen.tcl: netgen.tcl.in
 	sed -e 's%TCL_DIR%${TCLDIR}%g' \
@@ -39,13 +39,13 @@ netgen.sh: netgen.sh.in
 	    -e 's%WISH_EXE%${WISH_EXE}%g' \
 	    netgen.sh.in > netgen.sh
 
-$(DESTDIR)${INSTALL_TCLDIR}/%: %
-	${RM} $(DESTDIR)${INSTALL_TCLDIR}/$*
-	${CP} $* $(DESTDIR)${INSTALL_TCLDIR}/$*
+$(DESTDIR)${TCLDIR}/%: %
+	${RM} $(DESTDIR)${TCLDIR}/$*
+	${CP} $* $(DESTDIR)${TCLDIR}/$*
 
-$(DESTDIR)${INSTALL_BINDIR}/netgen.sh: netgen.sh
-	${RM} $(DESTDIR)${INSTALL_BINDIR}/netgen.sh $(DESTDIR)${INSTALL_BINDIR}/netgen
-	${CP} netgen.sh $(DESTDIR)${INSTALL_BINDIR}/netgen
-	(cd $(DESTDIR)${INSTALL_BINDIR}; chmod 0755 netgen)
+$(DESTDIR)${BINDIR}/netgen.sh: netgen.sh
+	${RM} $(DESTDIR)${BINDIR}/netgen.sh $(DESTDIR)${BINDIR}/netgen
+	${CP} netgen.sh $(DESTDIR)${BINDIR}/netgen
+	(cd $(DESTDIR)${BINDIR}; chmod 0755 netgen)
 
 include ${NETGENDIR}/rules.mak

tcltk/netgen.sh

@@ -1,60 +0,0 @@
-#!/bin/bash
-#
-# For installation, put this file (netgen.sh) in a standard executable path.
-# Put startup script "netgen.tcl" and shared library "tclnetgen.so"
-# in ${CAD_ROOT}/netgen/tcl/, with a symbolic link from file
-# ".wishrc" to "netgen.tcl".
-#
-# This script starts irsim under the Tcl interpreter,
-# reading commands from a special .wishrc script which
-# launches irsim and retains the Tcl interactive interpreter.
-
-# Parse for the argument "-c[onsole]".  If it exists, run netgen
-# with the TkCon console.  Strip this argument from the argument list.
-
-TKCON=true
-BATCH=
-GUI=
-NETGEN_WISH=/usr/bin/wish
-export NETGEN_WISH
-
-# Hacks for Cygwin
-if [ ${TERM:=""} = "cygwin" ]; then
-   export PATH="$PATH:/usr/lib"
-   export DISPLAY=${DISPLAY:=":0"}
-fi
-
-# Preserve quotes in arguments (thanks, Stackoverflow!)
-arglist=''
-for i in "$@" ; do
-   case $i in
-      -noc*) TKCON=;;
-      -bat*) BATCH=true; TKCON=;;
-      -gui) GUI=true; TKCON=;;
-      *) arglist="$arglist${arglist:+ }\"${i//\"/\\\"}\"";;
-   esac
-done 
-
-if [ $TKCON ]; then
-
-   exec /usr/local/lib/netgen/tcl/tkcon.tcl \
-	-eval "source /usr/local/lib/netgen/tcl/console.tcl" \
-	-slave "package require Tk; set argc $#; set argv [list $arglist]; \
-	source /usr/local/lib/netgen/tcl/netgen.tcl"
-
-# Run the Python LVS manager GUI
-
-elif [ $GUI ]; then
-    exec /usr/local/lib/netgen/python/lvs_manager.py $@
-
-#
-# Run the stand-in for wish (netgenexec), which acts exactly like "wish"
-# except that it replaces ~/.wishrc with netgen.tcl.  This executable is
-# *only* needed when running without the console; the console itself is
-# capable of sourcing the startup script.
-#
-
-else
-   exec /usr/local/lib/netgen/tcl/netgenexec -- "$@"
-
-fi

tcltk/netgen.tcl

@@ -1,753 +0,0 @@
-# Wishrc startup for ToolScript (netgen)
-#
-# For installation:  Put this file and also tclnetgen.so into
-# directory ${CAD_ROOT}/netgen/tcl/, and set the "load" line below
-# to point to the location of tclnetgen.so.  Also see comments
-# in shell script "netgen.sh".
-#
-
-# Check namespaces for existence of other applications
-set UsingMagic 0
-set UsingXCircuit 0
-set UsingIRSIM 0
-set batchmode 0
-set nlist [namespace children]
-foreach i $nlist {
-   switch $i {
-      ::magic { set UsingMagic 1 }
-      ::xcircuit { set UsingXCircuit 1 }
-      ::irsim { set UsingIRSIM 1 }
-   }
-}
-
-# -lazy option not needed if stubs libraries are handled correctly
-# load -lazy /usr/local/lib/netgen/tcl/tclnetgen.so
-
-load /usr/local/lib/netgen/tcl/tclnetgen.so
-
-#----------------------------------------------------------------
-# Convert LVS list result into a JSON file 
-#----------------------------------------------------------------
-
-proc netgen::convert_to_json {filename lvs_final} {
-   set pidx [string last . $filename]
-   set jsonname [string replace $filename $pidx end ".json"]
-   if {![catch {open $jsonname w} fjson]} {
-      puts $fjson "\["
-      # Outer list is of each cell compared
-      set clen [llength $lvs_final]
-      set cidx 0
-      foreach circuit $lvs_final {
-         incr cidx
-         puts $fjson "  \{"
-         set nkeys [llength $circuit]
-         set kidx 0
-	 foreach {key value} $circuit {
-            incr kidx 2
-	    switch $key {
-	       name {
-	          puts $fjson "   \"${key}\": \["
-		  set cktval [lindex $value 0]
-		  puts $fjson "      \"${cktval}\","
-		  set cktval [lindex $value 1]
-		  puts $fjson "      \"${cktval}\""
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       pins {
-	          puts $fjson "   \"${key}\": \["
-	          puts $fjson "      \["
-		  set cktval [lindex $value 0]
-		  foreach pin [lrange $cktval 0 end-1] {
-		     puts $fjson "        \"$pin\","
-		  }
-		  set pin [lindex $cktval end]
-		  puts $fjson "        \"$pin\""
-	          puts $fjson "      \], \["
-		  set cktval [lindex $value 1]
-		  foreach pin [lrange $cktval 0 end-1] {
-		     puts $fjson "        \"$pin\","
-		  }
-		  set pin [lindex $cktval end]
-		  puts $fjson "        \"$pin\""
-	          puts $fjson "      \]"
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-               nets {
-	          puts $fjson "   \"${key}\": \["
-		  set cktval [lindex $value 0]
-		  puts $fjson "    $cktval,"
-		  set cktval [lindex $value 1]
-		  puts $fjson "    $cktval"
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-               }
-	       devices {
-	          puts $fjson "   \"${key}\": \["
-	          puts $fjson "       \["
-		  set cktval [lindex $value 0]
-		  foreach dev [lrange $cktval 0 end-1] {
-		     set devname [lindex $dev 0]
-		     set devnum  [lindex $dev 1]
-		     puts $fjson "         \[\"${devname}\", ${devnum}\],"
-		  }
-		  set dev [lindex $cktval end]
-		  set devname [lindex $dev 0]
-		  set devnum  [lindex $dev 1]
-		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
-	          puts $fjson "       \], \["
-		  set cktval [lindex $value 1]
-		  foreach dev [lrange $cktval 0 end-1] {
-		     set devname [lindex $dev 0]
-		     set devnum  [lindex $dev 1]
-		     puts $fjson "         \[\"${devname}\", ${devnum} \],"
-		  }
-		  set dev [lindex $cktval end]
-		  set devname [lindex $dev 0]
-		  set devnum  [lindex $dev 1]
-		  puts $fjson "         \[\"${devname}\", ${devnum} \]"
-	          puts $fjson "       \]"
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       goodnets -
-	       badnets {
-	          puts $fjson "   \"${key}\": \["
-		  set glen [llength $value]
-		  set gidx 0
-		  foreach group $value {
-		     incr gidx
-	             puts $fjson "      \["
-	             puts $fjson "        \["
-		     set cktval [lindex $group 0]
-		     set nlen [llength $cktval]
-		     set nidx 0
-		     foreach net $cktval {
-			incr nidx
-	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
-		        puts $fjson "            \"$netname\","
-		        puts $fjson "            \["
-			set netconn [lindex $net 1]
-			foreach fanout [lrange $netconn 0 end-1] {
-			   set devname [lindex $fanout 0]
-			   set pinname [lindex $fanout 1]
-			   set count [lindex $fanout 2]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
-			}
-			set fanout [lindex $netconn end]
-			set devname [lindex $fanout 0]
-			set pinname [lindex $fanout 1]
-			set count [lindex $fanout 2]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$nidx == $nlen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \], \["
-		     set cktval [lindex $group 1]
-		     set nlen [llength $cktval]
-		     set nidx 0
-		     foreach net $cktval {
-			incr nidx
-	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
-		        puts $fjson "            \"$netname\","
-		        puts $fjson "            \["
-			set netconn [lindex $net 1]
-			foreach fanout [lrange $netconn 0 end-1] {
-			   set devname [lindex $fanout 0]
-			   set pinname [lindex $fanout 1]
-			   set count [lindex $fanout 2]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$devname\", \"$pinname\", $count \],"
-			}
-			set fanout [lindex $netconn end]
-			set devname [lindex $fanout 0]
-			set pinname [lindex $fanout 1]
-			set count [lindex $fanout 2]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$devname\", \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$nidx == $nlen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \]"
-		     if {$gidx == $glen} {
-	                puts $fjson "      \]"
-		     } else {
-	                puts $fjson "      \],"
-		     }
-		  }
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       goodelements -
-	       badelements {
-	          puts $fjson "   \"${key}\": \["
-		  set glen [llength $value]
-		  set gidx 0
-		  foreach group $value {
-		     incr gidx
-	             puts $fjson "      \["
-	             puts $fjson "        \["
-		     set cktval [lindex $group 0]
-		     set ilen [llength $cktval]
-		     set iidx 0
-		     foreach inst $cktval {
-			incr iidx
-	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
-		        puts $fjson "            \"$instname\","
-		        puts $fjson "            \["
-			set instpins [lindex $inst 1]
-			foreach fanout [lrange $instpins 0 end-1] {
-			   set pinname [lindex $fanout 0]
-			   set count [lindex $fanout 1]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$pinname\", $count \],"
-			}
-			set fanout [lindex $instpins end]
-			set pinname [lindex $fanout 0]
-			set count [lindex $fanout 1]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$iidx == $ilen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \], \["
-		     set cktval [lindex $group 1]
-		     set ilen [llength $cktval]
-		     set iidx 0
-		     foreach inst $cktval {
-			incr iidx
-	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
-		        puts $fjson "            \"$instname\","
-		        puts $fjson "            \["
-			set instpins [lindex $inst 1]
-			foreach fanout [lrange $instpins 0 end-1] {
-			   set pinname [lindex $fanout 0]
-			   set count [lindex $fanout 1]
-			   if {$count == {}} {set count 0}
-		           puts $fjson "              \[ \"$pinname\", $count \],"
-			}
-			set fanout [lindex $instpins end]
-			set pinname [lindex $fanout 0]
-			set count [lindex $fanout 1]
-			if {$count == {}} {set count 0}
-		        puts $fjson "              \[ \"$pinname\", $count \]"
-		        puts $fjson "            \]"
-			if {$iidx == $ilen} {
-	                   puts $fjson "          \]"
-			} else {
-	                   puts $fjson "          \],"
-			}
-		     }
-	             puts $fjson "        \]"
-		     if {$gidx == $glen} {
-	                puts $fjson "      \]"
-		     } else {
-	                puts $fjson "      \],"
-		     }
-		  }
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	       properties {
-	          puts $fjson "   \"${key}\": \["
-		  set plen [llength $value]
-                  set pidx 0
-		  foreach instance $value {
-		     incr pidx
-	             puts $fjson "      \["
-		     set instnames [string map {"\\" "\\\\"} [lindex $instance 0]]
-		     set instname0 [string map {"\\" "\\\\"} [lindex $instnames 0]]
-	             puts $fjson "         \["
-		     puts $fjson "           \"${instname0}\","
-	             puts $fjson "           \["
-		     foreach property [lrange $instance 1 end-1] {
-		        set prop0 [lindex $property 0]
-			set propname [lindex $prop0 0]
-			set propval [lindex $prop0 1]
-		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
-		     }
-		     set property [lindex $instance end]
-		     set prop0 [lindex $property 0]
-		     set propname [lindex $prop0 0]
-		     set propval [lindex $prop0 1]
-		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
-	             puts $fjson "           \]"
-	             puts $fjson "         \],"
-		     set instname1 [string map {"\\" "\\\\"} [lindex $instnames 1]]
-	             puts $fjson "         \["
-		     puts $fjson "           \"${instname1}\","
-	             puts $fjson "           \["
-		     foreach property [lrange $instance 1 end-1] {
-		        set prop1 [lindex $property 1]
-			set propname [lindex $prop1 0]
-			set propval [lindex $prop1 1]
-		        puts $fjson "             \[\"${propname}\", \"${propval}\"\],"
-		     }
-		     set property [lindex $instance end]
-		     set prop1 [lindex $property 1]
-		     set propname [lindex $prop1 0]
-		     set propval [lindex $prop1 1]
-		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
-	             puts $fjson "           \]"
-	             puts $fjson "         \]"
-		     if {$pidx == $plen} {
-	                puts $fjson "      \]"
-		     } else {
-	                puts $fjson "      \],"
-		     }
-		  }
-		  if {$kidx == $nkeys} {
-		     puts $fjson "   \]"
-		  } else {
-		     puts $fjson "   \],"
-		  }
-	       }
-	    }
-	 }
-         if {$cidx == $clen} {
-            puts $fjson "  \}"
-	 } else {
-            puts $fjson "  \},"
-	 }
-      }
-      puts $fjson "\]"
-   }
-   close $fjson
-}
-
-#----------------------------------------------------------------
-# Define the "lvs" command as a way of calling the netgen options
-# for standard compare, essentially the same as the old "netcomp"
-# standalone program.
-#
-# Use the "canonical" command to parse the file and cell names,
-# although if the cells have not been read in yet, then the
-# original syntax of filename or {filename cellname} is required.
-#
-# "args" is passed to verify and may therefore contain only the
-# value "-list" or nothing.  If "-list", then output is returned
-# as a nested list.
-#----------------------------------------------------------------
-
-proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
-   set dolist 0
-   set dojson 0
-   foreach arg $args {
-      if {$arg == "-list"} {
-	 puts stdout "Generating list result"
-	 set dolist 1
-	 set lvs_final {}
-      } elseif {$arg == "-json"} {
-	 puts stdout "Generating JSON file result"
-	 set dolist 1
-	 set dojson 1
-	 set lvs_final {}
-      } elseif {$arg == "-blackbox"} {
-	 puts stdout "Treating empty subcircuits as black-box cells"
-	 netgen::model blackbox on
-      } elseif {$arg == "-full"} {
-	 puts stdout "Using full symmetry breaking method"
-	 netgen::symmetry full
-      }
-   }
-
-   # Allow name1 or name2 to be a list of {filename cellname},
-   # A single <filename>, or any valid_cellname form if the
-   # file has already been read.
-
-   if {[catch {set flist1 [canonical $name1]}]} {
-      if {[llength $name1] == 2} {
-         set file1 [lindex $name1 0]
-         set cell1 [lindex $name1 1]
-      } else {
-         set file1 $name1
-         set cell1 $name1
-      }
-      puts stdout "Reading netlist file $file1"
-      set fnum1 [netgen::readnet $file1]
-   } else {
-      set cell1 [lindex $flist1 0]
-      set fnum1 [lindex $flist1 1]
-      set flist1 [canonical $fnum1]
-      set file1 [lindex $flist1 0]
-   }
-
-   if {[catch {set flist2 [canonical $name2]}]} {
-      if {[llength $name2] == 2} {
-         set file2 [lindex $name2 0]
-         set cell2 [lindex $name2 1]
-      } else {
-         set file2 $name2
-         set cell2 $name2
-      }
-      puts stdout "Reading netlist file $file2"
-      set fnum2 [netgen::readnet $file2]
-   } else {
-      set cell2 [lindex $flist2 0]
-      set fnum2 [lindex $flist2 1]
-      set flist2 [canonical $fnum2]
-      set file2 [lindex $flist2 0]
-   }
-
-   if {$fnum1 == $fnum2} {
-      puts stderr "Both cells are in the same netlist:  Cannot compare!"
-      return
-   }
-
-   set clist1 [cells list $fnum1]
-   set cidx [lsearch -regexp $clist1 ^$cell1$]
-   if {$cidx < 0} {
-      puts stderr "Cannot find cell $cell1 in file $file1"
-      return
-   } else {
-      set cell1 [lindex $clist1 $cidx]
-   }
-   set clist2 [cells list $fnum2]
-   set cidx [lsearch -regexp $clist2 ^$cell2$]
-   if {$cidx < 0} {
-      puts stderr "Cannot find cell $cell2 in file $file2"
-      return
-   } else {
-      set cell2 [lindex $clist2 $cidx]
-   }
-
-   netgen::compare assign "$fnum1 $cell1" "$fnum2 $cell2"
-
-   if {[file exists $setupfile]} {
-      puts stdout "Reading setup file $setupfile"
-      # Instead of sourcing the setup file, run each line so we can
-      # catch individual errors and not let them halt the LVS process
-      set perrors 0
-      if {![catch {open $setupfile r} fsetup]} {
-	 set sline 0
-	 set command {}
-	 while {[gets $fsetup line] >= 0} {
-	    incr sline
-	    append command $line "\n"
-	    if {[info complete $command]} {
-	       if {[catch {uplevel 1 [list namespace eval netgen $command]} msg]} {
-		  set msg [string trimright $msg "\n"]
-		  puts stderr "Error $setupfile:$sline (ignoring), $msg"
-		  incr perrors
-	       }
-	       set command {}
-	    }
-	 }
-	 close $fsetup
-      } else {
-	 puts stdout "Error:  Cannot read the setup file $setupfile"
-      }
-	
-      if {$perrors > 0} {
-	 puts stdout "Warning:  There were errors reading the setup file"
-      }
-   } elseif {[string first nosetup $setupfile] < 0} {
-      netgen::permute default	;# transistors and resistors
-      netgen::property default
-   }
-
-   if {[string first nolog $logfile] < 0} {
-      puts stdout "Comparison output logged to file $logfile"
-      netgen::log file $logfile
-
-      netgen::log start
-      netgen::log echo off
-      set dolog true
-   } else {
-      set dolog false
-   }
-
-   if {$dolist == 1} {
-      set endval [netgen::compare -list hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
-   } else {
-      set endval [netgen::compare hierarchical "$fnum1 $cell1" "$fnum2 $cell2"]
-   }
-   if {$endval == {}} {
-      netgen::log put "No cells in queue!\n"
-      return
-   }
-   set properr {}
-   set pinsgood 0
-   while {$endval != {}} {
-      if {$dolist == 1} {
-         netgen::run -list converge
-      } else {
-         netgen::run converge
-      }
-      netgen::log echo on
-      if {[verify equivalent]} {
-	 # Resolve automorphisms by pin and property
-	 if {$dolist == 1} {
-            netgen::run -list resolve
-	 } else {
-            netgen::run resolve
-	 }
-	 set uresult [verify unique]
-         if {$uresult == 0} {
-	    netgen::log put "   Networks match locally but not globally.\n"
-	    netgen::log put "   Probably connections are swapped.\n"
-	    netgen::log put "   Check the end of logfile ${logfile} for implicated nodes.\n"
-	    if {$dolist == 1} {
-	       verify -list nodes
-	    } else {
-	       verify nodes
-	    }
-
-	    # Flatten the non-matching subcircuit (but not the top-level cells)
-            if {[netgen::print queue] != {}} {
-	       netgen::log put "  Flattening non-matched subcircuits $endval"
-	       netgen::flatten class "[lindex $endval 0] $fnum1"
-	       netgen::flatten class "[lindex $endval 1] $fnum2"
-	    }
-	 } else {
-	    # Match pins
-            netgen::log echo off
-	    if {$dolist == 1} {
-		set result [equate -list pins "$fnum1 [lindex $endval 0]" \
-				"$fnum2 [lindex $endval 1]"]
-	    } else {
-		set result [equate pins "$fnum1 [lindex $endval 0]" \
-				"$fnum2 [lindex $endval 1]"]
-	    }
-	    if {$result != 0} {
-		equate classes "$fnum1 [lindex $endval 0]" \
-			 "$fnum2 [lindex $endval 1]"
-	    }
-	    set pinsgood $result
-            netgen::log echo on
-	 }
-	 if {$uresult == 2} {lappend properr [lindex $endval 0]}
-      } else {
-	 # Flatten the non-matching subcircuit (but not the top-level cells)
-         if {[netgen::print queue] != {}} {
-	    netgen::log put "  Flattening non-matched subcircuits $endval"
-	    netgen::flatten class "[lindex $endval 0] $fnum1"
-	    netgen::flatten class "[lindex $endval 1] $fnum2"
-	 }
-      }
-      netgen::log echo off
-      if {$dolist == 1} {
-         catch {lappend lvs_final $lvs_out}
-         set lvs_out {}
-         set endval [netgen::compare -list hierarchical]
-      } else {
-         set endval [netgen::compare hierarchical]
-      }
-   }
-   netgen::log echo off
-   puts stdout "Result: " nonewline
-   netgen::log echo on
-   if {$pinsgood == 0} {
-      netgen::log put "The top level cell failed pin matching.\n"
-   } else {
-      verify only
-   }
-   if {$properr != {}} {
-      netgen::log put "The following cells had property errors: $properr\n"
-   }
-   if {$dolog} {
-      netgen::log end
-   }
-   puts stdout "LVS Done."
-   if {$dojson == 1} {
-      netgen::convert_to_json $logfile $lvs_final
-   } elseif {$dolist == 1} {
-      return $lvs_final
-   }
-}
-
-# It is important to make sure no netgen commands overlap with Tcl built-in
-# commands, because otherwise the namespace import will fail.
-
-proc pushnamespace { name } {
-
-   set y [namespace eval ${name} info commands ::${name}::*]
-   set z [info commands]
-
-   foreach v $y {
-      regsub -all {\*} $v {\\*} i
-      set x [namespace tail $i]
-      if {[lsearch $z $x] < 0} {
-         namespace import $i
-      } else {
-            puts "Warning: ${name} command '$x' use fully-qualified name '$v'"
-      }
-   }
-}
-
-proc popnamespace { name } {
-   set z [info commands]
-   set l [expr [string length ${name}] + 5]
-
-   while {[set v [lsearch $z ${name}_tcl_*]] >= 0} {
-      set y [lindex $z $v]
-      set w [string range $y $l end]
-      interp alias {} ::$w {}
-      rename ::$y ::$w
-      puts "Info: replacing ::$w with ::$y"
-   }
-   namespace forget ::${name}::*
-}
-
-set auto_noexec 1       ;# don't EVER call UNIX commands w/o "shell" in front
-
-#----------------------------------------------------------------------
-# Cross-Application section
-#----------------------------------------------------------------------
-
-# Setup IRSIM assuming that the Tcl version is installed.
-# We do not need to rename procedure irsim to NULL because it is
-# redefined in a script, which simply overwrites the original.
-
-proc irsim { args } {
-   global CAD_ROOT
-   set irsimscript [glob -nocomplain ${CAD_ROOT}/irsim/tcl/irsim.tcl]
-   if { ${irsimscript} == {} } {
-      puts stderr "\"irsim\" requires Tcl-based IRSIM version 9.6 or newer."
-      puts stderr "Could not find script \"irsim.tcl\".  If IRSIM is installed in a"
-      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
-      puts stderr "\"source <path>/irsim.tcl\" before doing \"irsim\"."
-   } else {
-      source $irsimscript
-      eval {irsim} $args
-   }
-}
-
-# Setup Xcircuit assuming that the Tcl version is installed.
-
-proc xcircuit { args } {
-   global CAD_ROOT
-   global argc
-   global argv
-   set xcircscript [glob -nocomplain ${CAD_ROOT}/xcircuit*/xcircuit.tcl]
-   if { ${xcircscript} == {} } {
-      puts stderr "\"xcircuit\" requires Tcl-based XCircuit version 3.1 or newer."
-      puts stderr "Could not find script \"xcircuit.tcl\".  If XCircuit is installed in a"
-      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
-      puts stderr "\"source <path>/xcircuit.tcl\"."
-   } else {
-      # if there are multiple installed versions, choose the highest version.
-      if {[llength $xcircscript] > 1} {
-        set xcircscript [lindex [lsort -decreasing -dictionary $xcircscript] 0]
-      }
-      set argv $args
-      set argc [llength $args]
-      uplevel #0 source $xcircscript
-   }
-}
-
-# Setup Magic assuming that the Tcl version is installed.
-
-proc magic { args } {
-   global CAD_ROOT
-   global argc
-   global argv
-   set magicscript [glob -nocomplain ${CAD_ROOT}/magic/tcl/magic.tcl]
-   if { ${magicscript} == {} } {
-      puts stderr "\"magic\" requires Tcl-based Magic version 7.2 or newer."
-      puts stderr "Could not find script \"magic.tcl\".  If Magic is installed in a"
-      puts stderr "place other than CAD_ROOT (=${CAD_ROOT}), use the command"
-      puts stderr "\"source <path>/magic.tcl\"."
-   } else {
-      set argv $args
-      set argc [llength $args]
-      uplevel #0 source $magicscript
-   }
-}
-
-#----------------------------------------------------------------------------
-# Have we called netgen from tkcon or a clone thereof?  If so, set NetgenConsole
-#----------------------------------------------------------------------------
-
-if {! $UsingMagic } {
-   if {[lsearch [interp aliases] tkcon] != -1} {
-      set NetgenConsole tkcon
-      wm withdraw .
-   }
-}
-
-pushnamespace netgen
-
-#----------------------------------------------------------------------------
-# For now, if we are standalone, pop down the default Tk window.
-# Sometime later we may wish to provide a standalone GUI frontend in Tk
-# to improve upon the original X11 "xnetgen" frontend.  If so, its
-# definitions would go below.
-
-if {! $UsingMagic } {
-   if {[lsearch [interp aliases] tkcon] != -1} {
-      if {[string range [wm title .] 0 3] == "wish"} {
-	 wm withdraw .
-      }
-   }
-}
-
-#----------------------------------------------------------------------------
-# No-console mode drops "--" in front of the argument list and "-noc"
-# is retained, so remove them.  Internally, the console will be determined
-# by checking for a slave interpreter, so there is no need for any
-# action here other than removing the argument.
-
-if {[lindex $argv 0] == "--"} {
-   incr argc -1
-   set argv [lrange $argv 1 end]
-}
-
-if {[string range [lindex $argv 0] 0 3] == "-noc"} {
-   incr argc -1
-   set argv [lrange $argv 1 end]
-}
-
-if {[string range [lindex $argv 0] 0 3] == "-bat"} {
-   incr argc -1
-   set argv [lrange $argv 1 end]
-   set batchmode 1
-}
-
-#----------------------------------------------------------------------------
-# Anything on the command line is assumed to be a netgen command to evaluate
-
-if {[catch {eval $argv}]} {
-   puts stdout "$errorInfo"
-}
-if {$batchmode == 1} {quit}
-
-#----------------------------------------------------------------------------
-# Netgen start function drops back to interpreter after initialization & setup

tcltk/netgen.tcl.in

@@ -138,7 +138,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach net $cktval {
 			incr nidx
 	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
+			set netname [string map {"\\" ""} [lindex $net 0]]
 		        puts $fjson "            \"$netname\","
 		        puts $fjson "            \["
 			set netconn [lindex $net 1]
@@ -169,7 +169,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach net $cktval {
 			incr nidx
 	                puts $fjson "          \["
-			set netname [string map {"\\" "\\\\"} [lindex $net 0]]
+			set netname [string map {"\\" ""} [lindex $net 0]]
 		        puts $fjson "            \"$netname\","
 		        puts $fjson "            \["
 			set netconn [lindex $net 1]
@@ -221,7 +221,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach inst $cktval {
 			incr iidx
 	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
+			set instname [lindex $inst 0]
 		        puts $fjson "            \"$instname\","
 		        puts $fjson "            \["
 			set instpins [lindex $inst 1]
@@ -250,7 +250,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     foreach inst $cktval {
 			incr iidx
 	                puts $fjson "          \["
-			set instname [string map {"\\" "\\\\"} [lindex $inst 0]]
+			set instname [lindex $inst 0]
 		        puts $fjson "            \"$instname\","
 		        puts $fjson "            \["
 			set instpins [lindex $inst 1]
@@ -292,8 +292,8 @@ proc netgen::convert_to_json {filename lvs_final} {
 		  foreach instance $value {
 		     incr pidx
 	             puts $fjson "      \["
-		     set instnames [string map {"\\" "\\\\"} [lindex $instance 0]]
-		     set instname0 [string map {"\\" "\\\\"} [lindex $instnames 0]]
+		     set instnames [lindex $instance 0]
+		     set instname0 [lindex $instnames 0]
 	             puts $fjson "         \["
 		     puts $fjson "           \"${instname0}\","
 	             puts $fjson "           \["
@@ -310,7 +310,7 @@ proc netgen::convert_to_json {filename lvs_final} {
 		     puts $fjson "             \[\"${propname}\", \"${propval}\"\]"
 	             puts $fjson "           \]"
 	             puts $fjson "         \],"
-		     set instname1 [string map {"\\" "\\\\"} [lindex $instnames 1]]
+		     set instname1 [lindex $instnames 1]
 	             puts $fjson "         \["
 		     puts $fjson "           \"${instname1}\","
 	             puts $fjson "           \["
@@ -382,9 +382,6 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
       } elseif {$arg == "-blackbox"} {
 	 puts stdout "Treating empty subcircuits as black-box cells"
 	 netgen::model blackbox on
-      } elseif {$arg == "-full"} {
-	 puts stdout "Using full symmetry breaking method"
-	 netgen::symmetry full
       }
    }
 
@@ -504,7 +501,6 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
       return
    }
    set properr {}
-   set pinsgood 0
    while {$endval != {}} {
       if {$dolist == 1} {
          netgen::run -list converge
@@ -550,7 +546,6 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
 		equate classes "$fnum1 [lindex $endval 0]" \
 			 "$fnum2 [lindex $endval 1]"
 	    }
-	    set pinsgood $result
             netgen::log echo on
 	 }
 	 if {$uresult == 2} {lappend properr [lindex $endval 0]}
@@ -574,11 +569,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
    netgen::log echo off
    puts stdout "Result: " nonewline
    netgen::log echo on
-   if {$pinsgood == 0} {
-      netgen::log put "The top level cell failed pin matching.\n"
-   } else {
-      verify only
-   }
+   verify only
    if {$properr != {}} {
       netgen::log put "The following cells had property errors: $properr\n"
    }

tcltk/tclnetgen.c

@@ -85,7 +85,6 @@ int _netcmp_compare(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_iterate(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_summary(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_print(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netcmp_format(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_run(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_verify(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_automorphs(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
@@ -94,7 +93,6 @@ int _netcmp_ignore(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_permute(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_property(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_exhaustive(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netcmp_symmetry(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_restart(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_global(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
 int _netcmp_convert(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
@@ -201,9 +199,6 @@ Command netcmp_cmds[] = {
 	{"print",		_netcmp_print,
 		"\n   "
 		"print netcomp internal data structure"},
-	{"format",		_netcmp_format,
-		"<col1_width> <col2_width>\n   "
-		"set width of formatted output"},
 	{"run",			_netcmp_run,
 		"[converge|resolve]\n   "
 		"converge: run netcomp to completion (convergence)\n   "
@@ -245,9 +240,6 @@ Command netcmp_cmds[] = {
 	{"exhaustive",		_netcmp_exhaustive,
 		"\n   "
 		"toggle exhaustive subdivision"},
-	{"symmetry",		_netcmp_symmetry,
-		"[fast|full]\n   "
-		"apply method for symmetry breaking"},
 	{"restart",		_netcmp_restart,
 		"\n   "
 		"start over (reset data structures)"},
@@ -1536,24 +1528,23 @@ int
 _netgen_model(ClientData clientData,
     Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
-   struct nlist *tp, *tp2;
+   struct nlist *tp;
    char *model, *retclass;
    unsigned char class;
    int fnum = -1;
-   int result, index, nports, nports2;
+   int result, index, nports;
 
    char *modelclasses[] = {
       "undefined", "nmos", "pmos", "pnp", "npn",
       "resistor", "capacitor", "diode",
       "inductor", "module", "blackbox", "xline",
-      "moscap", "mosfet", "bjt", "subcircuit", "copy",
-      NULL
+      "moscap", "mosfet", "bjt", "subcircuit", NULL
    };
    enum OptionIdx {
       UNDEF_IDX,  NMOS_IDX, PMOS_IDX, PNP_IDX, NPN_IDX,
       RES_IDX, CAP_IDX, DIODE_IDX, INDUCT_IDX,
       MODULE_IDX, BLACKBOX_IDX, XLINE_IDX, MOSCAP_IDX,
-      MOSFET_IDX, BJT_IDX, SUBCKT_IDX, COPY_IDX
+      MOSFET_IDX, BJT_IDX, SUBCKT_IDX
    };
 
    if (objc != 3 && objc != 2) {
@@ -1585,7 +1576,7 @@ _netgen_model(ClientData clientData,
 
    if (objc == 3) {
       model = Tcl_GetString(objv[2]);
-      nports = NumberOfPorts(model, fnum);
+      nports = NumberOfPorts(model);
 
       if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)modelclasses,
 		"class", 0, &index) != TCL_OK) {
@@ -1649,40 +1640,6 @@ _netgen_model(ClientData clientData,
 	    break;
 	 case SUBCKT_IDX:
 	    class = CLASS_SUBCKT;
-	    break;
-	 case COPY_IDX:
-	    /* "copy" is not a class, but indicates that the cell,  */
-	    /* if undefined or a module, should have its class	    */
-	    /* taken from the other circuit, if that circuit has a  */
-	    /* cell of the same name.				    */
-	    if (Circuit1 == NULL || Circuit2 == NULL) {
-		Tcl_SetResult(interp, "Circuits have not been queued for comparison.",
-			NULL);
-		return TCL_ERROR;
-	    }
-	    if (tp == Circuit1) {
-		tp2 = LookupCellFile(tp->name, Circuit2->file);
-		nports2 = NumberOfPorts(tp2->name, Circuit2->file);
-	    }
-	    else if (tp == Circuit2) {
-		tp2 = LookupCellFile(tp->name, Circuit1->file);
-		nports2 = NumberOfPorts(tp2->name, Circuit1->file);
-	    }
-	    else {
-		Tcl_SetResult(interp, "The referenced netlist is not being compared.",
-			NULL);
-		return TCL_ERROR;
-	    }
-	    /* Should a non-matching number of ports be considered a fatal error? */
-	    // if (nports2 != nports) {
-	    //	Tcl_SetResult(interp, "The number of ports for this cell does not "
-	    //		"match between netlists.", NULL);
-	    //	return TCL_ERROR;
-	    // }
-
-	    class = tp2->class;
-	    /* To do (maybe): Rename tp ports to match tp2? */
-
 	    break;
       }
       tp->class = class;
@@ -2014,61 +1971,6 @@ _netgen_printmem(ClientData clientData,
 }
 #endif
 
-/*------------------------------------------------------*/
-/* Function name: _netcmp_format			*/
-/* Syntax:						*/
-/*    netgen::format [col1_width [col2_width]]		*/
-/* Formerly: (none)					*/
-/* Results:						*/
-/* Side Effects:					*/
-/*------------------------------------------------------*/
-
-int
-_netcmp_format(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
-    int col1_width = 41, col2_width = 41;
-
-    if (objc > 1) {
-	if (Tcl_GetIntFromObj(interp, objv[1], &col1_width) != TCL_OK)
-	    return TCL_ERROR;
-	if (objc > 2) {
-	    if (Tcl_GetIntFromObj(interp, objv[2], &col2_width) != TCL_OK)
-		return TCL_ERROR;
-	} else {
-	    /* If only one argument is given, then apply it to both columns */
-	    col2_width = col1_width;
-	}
-
-	if (col1_width <= 0 || col2_width <= 0) {
-	    Tcl_SetResult(interp, "Column width cannot be zero or less\n", NULL);
-	}
-
-	// Default values for left and right columns are 43 and 87
-	left_col_end = col1_width + 2;
-	right_col_end = left_col_end + col2_width + 3;
-    }
-    else if (objc == 1) {
-	Tcl_Obj *lobj, *tobj;
-
-	col1_width = left_col_end - 2;
-	col2_width = right_col_end - col1_width - 5;
-
-	lobj = Tcl_NewListObj(0, NULL);
-
-	tobj = Tcl_NewIntObj(col1_width);
-        Tcl_ListObjAppendElement(interp, lobj, Tcl_NewIntObj(col1_width));
-        Tcl_ListObjAppendElement(interp, lobj, Tcl_NewIntObj(col2_width));
-
-	Tcl_SetObjResult(interp, lobj);
-	return TCL_OK;
-    }
-    else {
-	Tcl_WrongNumArgs(interp, 1, objv, "[col1_width [col2_width]]");
-	return TCL_ERROR;
-    }
-}
-
 /*------------------------------------------------------*/
 /* The following code breaks up the NETCOMP() command	*/
 /* from netcmp.c into individual functions w/arguments	*/
@@ -2998,34 +2900,15 @@ _netcmp_equate(ClientData clientData,
 
       case PINS_IDX:
 	 if ((ElementClasses == NULL) && (auto_blackbox == FALSE)) {
-	    if (CurrentCell == NULL) {
+	    if (CurrentCell == NULL)
 		Fprintf(stderr, "Equate elements:  no current cell.\n");
-		Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
-		return TCL_OK;
-	    }
-	    else if ((tp1->flags & CELL_PLACEHOLDER) ||
-			(tp2->flags & CELL_PLACEHOLDER)) {
-		if (tp1->flags & CELL_PLACEHOLDER) {
-		    Fprintf(stdout, "Warning: Equate pins:  cell %s "
-			"has no definition, treated as a black box.\n", name1);
-		}
-		if (tp2->flags & CELL_PLACEHOLDER) {
-		    Fprintf(stdout, "Warning: Equate pins:  cell %s "
-			"has no definition, treated as a black box.\n", name2);
-		}
-		// If a cell in either circuit is marked as a black box, then
-		// the cells in both circuits should be marked as a black box.
-		tp1->flags |= CELL_PLACEHOLDER;
-		tp2->flags |= CELL_PLACEHOLDER;
-	    }
-	    else {
-		Fprintf(stdout, "Equate pins:  cell %s and/or %s "
-			"has no elements.\n", name1, name2);
-		/* This is not necessarily an error, so go ahead and match pins. */
-	    }
+	    Fprintf(stderr, "Equate pins:  cell %s and/or %s has no elements.\n",
+			name1, name2);
+	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
+	    return TCL_OK;
 	 }
-	 if (ElementClasses == NULL) {
-	    /* This may have been called outside of a netlist compare,	*/
+	 else if (ElementClasses == NULL) {
+	    /* This has been called outside of a netlist compare,	*/
 	    /* probably to force name matching of pins on black-box	*/
 	    /* devices.  But MatchPins only works if tp1 == Circuit1	*/
 	    /* and tp2 == Circuit2, so preserve these values and 	*/
@@ -3976,48 +3859,6 @@ _netcmp_permute(ClientData clientData,
    return TCL_OK;
 }
 
-/*------------------------------------------------------*/
-/* Function name: _netcmp_symmetry			*/
-/* Syntax: netgen::symmetry [fast|full]			*/
-/* Formerly: x						*/
-/* Results:						*/
-/* Side Effects:					*/
-/*------------------------------------------------------*/
-
-int
-_netcmp_symmetry(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
-   char *fastfull[] = {
-      "fast", "full", NULL
-   };
-   enum OptionIdx {
-      FAST_IDX, FULL_IDX
-   };
-   int result, index;
-
-   if (objc == 1)
-      index = -1;
-   else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)fastfull,
-		"option", 0, &index) != TCL_OK)
-         return TCL_ERROR;
-   }
-
-   switch(index) {
-      case FAST_IDX:
-	 FastSymmetryBreaking = TRUE;
-	 break;
-      case FULL_IDX:
-	 FastSymmetryBreaking = FALSE;
-	 break;
-   }
-   Printf("Symmetry breaking method: %s.\n", 
-	     FastSymmetryBreaking ? "FAST" : "FULL");
-
-   return TCL_OK;
-}
-
 /*------------------------------------------------------*/
 /* Function name: _netcmp_exhaustive			*/
 /* Syntax: netgen::exhaustive [on|off]			*/
@@ -4039,7 +3880,7 @@ _netcmp_exhaustive(ClientData clientData,
    int result, index;
 
    if (objc == 1)
-      index = -1;
+      index = YES_IDX;
    else {
       if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
 		"option", 0, &index) != TCL_OK)