Merge branch 'master' into work

netlist.

VERSION

@@ -1 +1 @@
-1.5.39
+1.5.42

base/netcmp.c

@@ -4622,13 +4622,20 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2)
 		     }
 		     if (ob2 == NULL) {
 			if (Debug == 0) {
-			   for (m = 0; m < 43; m++) *(ostr + m) = ' ';
-			   for (m = 44; m < 87; m++) *(ostr + m) = ' ';
-			   sprintf(ostr, "%s", obn->name);
-			   sprintf(ostr + 44, "(no matching pin)");
-			   for (m = 0; m < 88; m++)
+			   // If first cell has no pins but 2nd cell
+			   // does, then "no matching pin" entries will
+			   // be generated for all pins in the 2nd cell,
+			   // so don't print out the "no pins" entry.
+
+			   if (strcmp(obn->name, "(no pins)")) {
+			      for (m = 0; m < 43; m++) *(ostr + m) = ' ';
+			      for (m = 44; m < 87; m++) *(ostr + m) = ' ';
+			      sprintf(ostr, "%s", obn->name);
+			      sprintf(ostr + 44, "(no matching pin)");
+			      for (m = 0; m < 88; m++)
 				 if (*(ostr + m) == '\0') *(ostr + m) = ' ';
-			   Fprintf(stdout, ostr);
+			      Fprintf(stdout, ostr);
+			   }
 			}
 			else {
 		           Fprintf(stderr, "No matching pin in cell %s for "
@@ -4694,13 +4701,16 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2)
       if (ob2->model.port == -1) {
 
 	 if (Debug == 0) {
-	    for (m = 0; m < 43; m++) *(ostr + m) = ' ';
-	    for (m = 44; m < 87; m++) *(ostr + m) = ' ';
-	    sprintf(ostr, "(no matching pin)");
-	    sprintf(ostr + 44, "%s", ob2->name);
-	    for (m = 0; m < 88; m++)
-	       if (*(ostr + m) == '\0') *(ostr + m) = ' ';
-	    Fprintf(stdout, ostr);
+	    // See above for reverse case
+	    if (strcmp(ob2->name, "(no pins)")) {
+	       for (m = 0; m < 43; m++) *(ostr + m) = ' ';
+	       for (m = 44; m < 87; m++) *(ostr + m) = ' ';
+	       sprintf(ostr, "(no matching pin)");
+	       sprintf(ostr + 44, "%s", ob2->name);
+	       for (m = 0; m < 88; m++)
+		  if (*(ostr + m) == '\0') *(ostr + m) = ' ';
+	       Fprintf(stdout, ostr);
+	    }
 	 }
 	 else {
 	    Fprintf(stderr, "No netlist match for cell %s pin %s\n",

base/netgen.c

@@ -89,6 +89,8 @@ void PushTok(int toktype, void *tval, struct tokstack **top)
 	case TOK_STRING:
 	    newstack->data.string = strsave((char *)tval);
 	    break;
+	case TOK_SGL_QUOTE:
+	case TOK_DBL_QUOTE:
 	case TOK_FUNC_OPEN:
 	case TOK_FUNC_CLOSE:
 	case TOK_GROUP_OPEN:
@@ -365,6 +367,26 @@ int ReduceExpressions(struct objlist *instprop,
 			estr = tstr + 1;
 			break;
 
+		    case '\'':
+			*tstr = '\0';
+			result = TokGetValue(estr, parent, glob, &dval);
+			if (result == 1) PushTok(TOK_DOUBLE, &dval, &expstack);
+			else if (result == -1) PushTok(TOK_STRING, estr, &expstack);
+			PushTok(TOK_SGL_QUOTE, NULL, &expstack);
+			estr = tstr + 1;
+			numlast = 0;
+			break;
+
+		    case '"':
+			*tstr = '\0';
+			result = TokGetValue(estr, parent, glob, &dval);
+			if (result == 1) PushTok(TOK_DOUBLE, &dval, &expstack);
+			else if (result == -1) PushTok(TOK_STRING, estr, &expstack);
+			PushTok(TOK_DBL_QUOTE, NULL, &expstack);
+			estr = tstr + 1;
+			numlast = 0;
+			break;
+
 		    case '{':
 			*tstr = '\0';
 			result = TokGetValue(estr, parent, glob, &dval);
@@ -698,7 +720,7 @@ int ReduceExpressions(struct objlist *instprop,
 		}
 	    }
 
-	    // Reduce {value} and (value)
+	    // Reduce {value}, (value), and 'value'
 
 	    for (stackptr = expstack; stackptr != NULL; stackptr = stackptr->last) {
 		switch (stackptr->toktype) {
@@ -709,7 +731,11 @@ int ReduceExpressions(struct objlist *instprop,
 				(((nptr->toktype == TOK_FUNC_OPEN) &&
 					(lptr->toktype == TOK_FUNC_CLOSE)) ||
 				((nptr->toktype == TOK_GROUP_OPEN) &&
-					(lptr->toktype == TOK_GROUP_CLOSE)))) {
+					(lptr->toktype == TOK_GROUP_CLOSE)) ||
+				((nptr->toktype == TOK_DBL_QUOTE) &&
+					(lptr->toktype == TOK_DBL_QUOTE)) ||
+				((nptr->toktype == TOK_SGL_QUOTE) &&
+					(lptr->toktype == TOK_SGL_QUOTE)))) {
 
 			    modified = 1;
 			    stackptr->last = lptr->last;

base/objlist.h

@@ -50,6 +50,8 @@
 #define TOK_FUNC_IF     17
 #define TOK_FUNC_THEN   18
 #define TOK_FUNC_ELSE   19
+#define TOK_SGL_QUOTE	20
+#define TOK_DBL_QUOTE	21
 
 /* Part 1b: Stack structure used to hold expressions in tokenized form */
 

base/spice.c

@@ -284,6 +284,12 @@ void SpiceSubCell(struct nlist *tp, int IsSubCell)
 			  case TOK_FUNC_ELSE:
 			     FlushString(",");
 			     break;
+			  case TOK_SGL_QUOTE:
+			     FlushString("'");
+			     break;
+			  case TOK_DBL_QUOTE:
+			     FlushString("\"");
+			     break;
 		       }
 		       stackptr = stackptr->last;
 		    }
@@ -367,6 +373,53 @@ int renamepins(struct hashlist *p, int file)
    }
 }
 
+/* If any pins are marked unconnected, see if there are	*/
+/* other pins of the same name that have connections.	*/
+/* Also remove any unconnected globals (just for cleanup) */
+
+void CleanupSubcell() {
+   int maxnode = 0;
+   struct objlist *sobj, *nobj, *lobj, *pobj;
+
+   if (CurrentCell == NULL) return;
+
+   for (sobj = CurrentCell->cell; sobj; sobj = sobj->next)
+      if (sobj->node > maxnode)
+	 maxnode = sobj->node + 1;
+
+   lobj = NULL;
+   for (sobj = CurrentCell->cell; sobj != NULL;) {
+      nobj = sobj->next;
+      if (sobj->node < 0) {
+         if (IsGlobal(sobj)) {
+ 	    if (lobj != NULL)
+	       lobj->next = sobj->next;
+	    else
+	       CurrentCell->cell = sobj->next;
+	    FreeObjectAndHash(sobj, CurrentCell);
+	 }
+	 else if (IsPort(sobj) && sobj->model.port == PROXY)
+	    sobj->node = maxnode++;
+	 else if (IsPort(sobj)) {
+	    for (pobj = CurrentCell->cell; pobj && (pobj->type == PORT);
+			pobj = pobj->next) {
+	       if (pobj == sobj) continue;
+	       if (matchnocase(pobj->name, sobj->name) && pobj->node >= 0) {
+		  sobj->node = pobj->node;
+		  break;
+	       }
+	    }
+	    lobj = sobj;
+	 }
+	 else
+	    lobj = sobj;
+      }
+      else
+         lobj = sobj;
+      sobj = nobj;
+   }
+}
+
 /*------------------------------------------------------*/
 /* Structure for stacking nested subcircuit definitions */
 /*------------------------------------------------------*/
@@ -416,7 +469,7 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 {
   int cdnum = 1, rdnum = 1, ndev, multi;
   int warnings = 0, update = 0, hasports = 0;
-  char *eqptr, devtype;
+  char *eqptr, devtype, endsubcell;
   struct keyvalue *kvlist = NULL;
   char inst[256], model[256], instname[256];
   struct nlist *tp;
@@ -427,8 +480,9 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
   instname[255] = '\0';
   
   while (!EndParseFile()) {
+
     SkipTok(); /* get the next token */
-    if (EndParseFile()) break;
+    if ((EndParseFile()) && (nexttok == NULL)) break;
 
     if (nexttok[0] == '*') SkipNewLine();
 
@@ -560,48 +614,9 @@ skip_ends:
 	 }
       }
     }
-    else if (matchnocase(nexttok, ".ENDS")) {
-      /* If any pins are marked unconnected, see if there are	*/
-      /* other pins of the same name that have connections.	*/
-      /* Also remove any unconnected globals (just for cleanup) */
-
-      int maxnode = 0;
-      for (sobj = CurrentCell->cell; sobj; sobj = sobj->next)
-	 if (sobj->node > maxnode)
-	    maxnode = sobj->node + 1;
-
-      lobj = NULL;
-      for (sobj = CurrentCell->cell; sobj != NULL;) {
-	 nobj = sobj->next;
-	 if (sobj->node < 0) {
-	    if (IsGlobal(sobj)) {
-	       if (lobj != NULL)
-	          lobj->next = sobj->next;
-	       else
-	          CurrentCell->cell = sobj->next;
-	       FreeObjectAndHash(sobj, CurrentCell);
-	    }
-	    else if (IsPort(sobj) && sobj->model.port == PROXY)
-		sobj->node = maxnode++;
-	    else if (IsPort(sobj)) {
-		for (pobj = CurrentCell->cell; pobj && (pobj->type == PORT);
-			pobj = pobj->next) {
-		    if (pobj == sobj) continue;
-		    if (matchnocase(pobj->name, sobj->name) && pobj->node >= 0) {
-			sobj->node = pobj->node;
-			break;
-		    }
-		}
-		lobj = sobj;
-	    }
-	    else
-		lobj = sobj;
-	 }
-	 else
-	    lobj = sobj;
-	 sobj = nobj;
-      }
+    else if (endsubcell || matchnocase(nexttok, ".ENDS")) {
 
+      CleanupSubcell();
       EndCell();
 
       // This condition will be true if no nodes or components were
@@ -1764,6 +1779,17 @@ skip_ends:
 baddevice:
     Fprintf(stderr, "Badly formed line in input.\n");
   }
+
+  /* Watch for bad ending syntax */
+
+  if (*(CellStackPtr)) {
+     Printf("Error: Subcircuit without .ENDS encountered at EOF (ignoring).\n");
+     CleanupSubcell();
+     EndCell();
+     if (*CellStackPtr) PopStack(CellStackPtr);
+     if (*CellStackPtr) ReopenCellDef((*CellStackPtr)->cellname, filenum);
+  }
+
   if (update != 0) RecurseCellFileHashTable(renamepins, filenum);
 
   if (warnings)

install.log

@@ -4,32 +4,16 @@ make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
 for dir in lib doc tcltk netgen tcltk; do \
 	(cd $dir && make install-tcl); done
 make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/ntk2adl.sh
-cp ntk2adl.sh /usr/local/lib/netgen/ntk2adl.sh
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/spice
-cp spice /usr/local/lib/netgen/spice
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/spice.bot
-cp spice.bot /usr/local/lib/netgen/spice.bot
-../scripts/mkdirs /usr/local/lib/netgen
-rm -f /usr/local/lib/netgen/spice.top
-cp spice.top /usr/local/lib/netgen/spice.top
+make[2]: Nothing to be done for 'install-tcl'.
 make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
 make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
 ../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
 ../scripts/mkdirs /usr/local/lib/netgen/doc
-cp netgen.doc /usr/local/lib/netgen/doc/netgen.doc
 make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
 make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
 rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
 cp netgen.sh /usr/local/bin/netgen
 (cd /usr/local/bin; chmod 0755 netgen)
-rm -f /usr/local/lib/netgen/tcl/tkcon.tcl
-cp tkcon.tcl /usr/local/lib/netgen/tcl/tkcon.tcl
-rm -f /usr/local/lib/netgen/tcl/console.tcl
-cp console.tcl /usr/local/lib/netgen/tcl/console.tcl
 rm -f /usr/local/lib/netgen/tcl/netgen.tcl
 cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
 rm -f /usr/local/lib/netgen/tcl/netgenexec
@@ -47,3 +31,347 @@ rm -f /usr/local/lib/netgen/tcl/netgenexec
 cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
 make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
 make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgen.tcl
+cp netgen.tcl /usr/local/lib/netgen/tcl/netgen.tcl
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'
+make[1]: Entering directory '/home/tim/gitsrc/netgen-1.5'
+./scripts/mkdirs /usr/local/bin /usr/local/share/man \
+	/usr/local/lib/netgen/tcl
+for dir in lib doc tcltk netgen tcltk; do \
+	(cd $dir && make install-tcl); done
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Nothing to be done for 'install-tcl'.
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/lib'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/doc'
+../scripts/mkdirs /usr/local/share/man /usr/local/share/man/man1
+../scripts/mkdirs /usr/local/lib/netgen/doc
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/doc'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/netgen'
+rm -f /usr/local/lib/netgen/tcl/tclnetgen.so
+cp tclnetgen.so /usr/local/lib/netgen/tcl/tclnetgen.so
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/netgen'
+make[2]: Entering directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+rm -f /usr/local/bin/netgen.sh /usr/local/bin/netgen
+cp netgen.sh /usr/local/bin/netgen
+(cd /usr/local/bin; chmod 0755 netgen)
+rm -f /usr/local/lib/netgen/tcl/netgenexec
+cp netgenexec /usr/local/lib/netgen/tcl/netgenexec
+make[2]: Leaving directory '/home/tim/gitsrc/netgen-1.5/tcltk'
+make[1]: Leaving directory '/home/tim/gitsrc/netgen-1.5'

tcltk/tclnetgen.c

@@ -2322,9 +2322,10 @@ _netcmp_verify(ClientData clientData,
    }
 
    if (ElementClasses == NULL || NodeClasses == NULL) {
-      Fprintf(stderr, "Cell has no elements and/or nodes.\n");
-      Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
-      // return TCL_ERROR;
+      if (index == EQUIV_IDX || index == UNIQUE_IDX)
+	 Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
+      else
+	 Fprintf(stdout, "Cell has no elements and/or nodes.  Not checked.\n");
       return TCL_OK;
    }
    else {