Merge branch 'master' into netgen-1.5

The capitalized version of this got removed from the Tcl headers
as some point and is no longer valid.  Added an include of
"strings.h" to base/actel.c, which was missing it (uses
strcasecmp() in the code, and needs the function declaration).

VERSION

@@ -1 +1 @@
-1.5.301
+1.5.307

base/actel.c

@@ -22,6 +22,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #include <stdio.h>
 #include <stdarg.h>
+#include <strings.h>
 #include <ctype.h>
 #ifdef IBMPC
 #include <stdlib.h>  /* for strtol on PC */

base/flatten.c

@@ -1756,6 +1756,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    flattenInstancesOf(name1, file1, ecomp->cell1->name); 
 		    modified1++;
 		}
+		else if (ecomp->cell1 && (ecomp->num1 > 0)) {
+		    Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
+				" would make a better match but is prohibited.\n",
+				ecomp->cell1->name, name1, file1);
+		}
 		if (ecomp->cell2 && (ecomp->num2 > 0) &&
 				(!(ecomp->cell2->flags & CELL_PLACEHOLDER))) {
 		    Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
@@ -1764,6 +1769,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    flattenInstancesOf(name2, file2, ecomp->cell2->name); 
 		    modified2++;
 		}
+		else if (ecomp->cell2 && (ecomp->num2 > 0)) {
+		    Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
+				" would make a better match but is prohibited.\n",
+				ecomp->cell2->name, name2, file2);
+		}
 	    }
 
 	    /* Reset or apply the count adjustments */
@@ -1854,6 +1864,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    	flattenInstancesOf(name2, file2, ecomp->cell2->name); 
 		    	modified2++;
 		    }
+		    else if (ecomp->cell2) {
+			Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
+				" would make a better match but is prohibited.\n",
+				ecomp->cell2->name, name2, file2);
+		    }
 		}
 	    }
 
@@ -1920,6 +1935,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		    	flattenInstancesOf(name1, file1, ecomp->cell1->name); 
 		        modified1++;
 		    }
+		    else if (ecomp->cell1) {
+			Fprintf(stdout, "Flattening instances of %s in cell %s (%d)"
+				" would make a better match but is prohibited.\n",
+				ecomp->cell1->name, name1, file1);
+		    }
 		}
 	    }
 
@@ -2271,13 +2291,23 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 					ecompX0->cell1->file, &compdict);
 			    if (dstr) *dstr = '[';
 			    if ((ncomp == ecomp0X) && (ecomp0X->num2 <= ecompX0->num1)) {
-				Fprintf(stdout, "Flattening instances of %s in cell %s"
-					"(%d) makes a better match\n",
-					ecompX0->cell1->name, name1, file1);
-				flattenInstancesOf(name1, file1, ecompX0->cell1->name); 
-			        ecompX0->num1 = 0;
-			        ecomp0X->num1 += ecompX0->num1;
-				modified1++;
+				if (!(ecompX0->cell1->flags & CELL_PLACEHOLDER)) {
+				    Fprintf(stdout, "Flattening instances of %s in cell"
+						" %s (%d) makes a better match\n",
+						ecompX0->cell1->name, name1, file1);
+				    flattenInstancesOf(name1, file1,
+						ecompX0->cell1->name); 
+				    ecompX0->num1 = 0;
+				    ecomp0X->num1 += ecompX0->num1;
+				    modified1++;
+				}
+				else
+				{
+				    Fprintf(stdout, "Flattening instances of %s in "
+						"cell %s (%d) would make a better "
+						"match but is prohibited.\n",
+						ecompX0->cell1->name, name1, file1);
+				}
 				break;
 			    }
 			}
@@ -2297,13 +2327,22 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 					ecomp0X->cell2->file, &compdict);
 			    if (dstr) *dstr = '[';
 			    if ((ncomp == ecompX0) && (ecompX0->num1 <= ecomp0X->num2)) {
-				Fprintf(stdout, "Flattening instances of %s in cell %s"
-					" (%d) makes a better match\n",
-					ecomp0X->cell2->name, name2, file2);
-				flattenInstancesOf(name2, file2, ecomp0X->cell2->name); 
-			        ecomp0X->num2 = 0;
-			        ecompX0->num2 += ecomp0X->num2;
-				modified2++;
+				if (!(ecomp0X->cell2->flags & CELL_PLACEHOLDER)) {
+				    Fprintf(stdout, "Flattening instances of %s in cell"
+						" %s (%d) makes a better match\n",
+						ecomp0X->cell2->name, name2, file2);
+				    flattenInstancesOf(name2, file2,
+						ecomp0X->cell2->name); 
+				    ecomp0X->num2 = 0;
+				    ecompX0->num2 += ecomp0X->num2;
+				    modified2++;
+				}
+				else {
+				    Fprintf(stdout, "Flattening instances of %s in "
+						"cell %s (%d) would make a better "
+						"match but is prohibited.\n",
+						ecompX0->cell2->name, name2, file2);
+				}
 				break;
 			    }
 			}

base/netcmp.c

@@ -8009,21 +8009,21 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 		      */
 		     for (permute1 = tc1->permutes; permute1; permute1 = permute1->next) {
 			if ((*matchfunc)(ob1->name, permute1->pin1)) {
-			   ob1a = LookupObject(permute1->pin1, tc1);
+			   ob2a = LookupObject(permute1->pin2, tc2);
 			   break;
 			}
 			else if ((*matchfunc)(ob1->name, permute1->pin2)) {
-			   ob1a = LookupObject(permute1->pin2, tc1);
+			   ob2a = LookupObject(permute1->pin1, tc2);
 			   break;
 			}
 		     }
 		     for (permute2 = tc2->permutes; permute2; permute2 = permute2->next) {
 			if ((*matchfunc)(ob2->name, permute2->pin1)) {
-			   ob2a = LookupObject(permute2->pin1, tc2);
+			   ob1a = LookupObject(permute2->pin2, tc1);
 			   break;
 			}
 			else if ((*matchfunc)(ob2->name, permute2->pin2)) {
-			   ob2a = LookupObject(permute2->pin2, tc2);
+			   ob1a = LookupObject(permute2->pin1, tc1);
 			   break;
 			}
 		     }
@@ -8196,6 +8196,14 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	 hasproxy1 = 1;
 
 	 HashPtrInstall(obn->name, obn, &(tc1->objdict));
+
+	 /* If this is a black-box circuit, then the pin has not been output */
+	 if (NodeClasses == NULL) {
+	    output_string_fill(ostr);
+	    output_string_left(ostr, "%s", "(no matching pin)");
+	    output_string_right(ostr, "%s", ob2->name);
+	    output_string_print(ostr);
+	 }
       }
    }
 
@@ -8266,6 +8274,14 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
 	 hasproxy2 = 1;
 
 	 HashPtrInstall(obn->name, obn, &(tc2->objdict));
+
+	 /* If this is a black-box circuit, then the pin has not been output */
+	 if (NodeClasses == NULL) {
+	    output_string_fill(ostr);
+	    output_string_left(ostr, "%s", ob1->name);
+	    output_string_right(ostr, "%s", "(no matching pin)");
+	    output_string_print(ostr);
+	 }
       }
 
       else if (ob1 != NULL && ob1->type == PORT && ob1->node < 0) {

base/netfile.c

@@ -302,7 +302,7 @@ int GetNextLineNoNewline(char *delimiter)
 {
     char *newbuf;
     int testc;
-    int nested = 0;
+    static int nested = 0;
     int llen;
 
     if (feof(infile)) return -1;

base/verilog.c

@@ -2614,13 +2614,15 @@ nextinst:
 	       if (scan == NULL) {
 		  char localnet[MAX_STR_LEN];
 
-		  /* Assume an implicit unconnected pin */
-		  sprintf(localnet, "_noconnect_%d_", localcount++);
-		  Node(localnet);
-		  join(localnet, obptr->name);
-		  Fprintf(stdout,
+		  /* Assume an implicit unconnected pin, unless there are no pins */
+		  if (strcmp(obpinname, "(no pins)")) {
+		     sprintf(localnet, "_noconnect_%d_", localcount++);
+		     Node(localnet);
+		     join(localnet, obptr->name);
+		     Fprintf(stdout,
 			 "Note:  Implicit pin %s in instance %s of %s in cell %s\n",
 			 obpinname, locinst, modulename, CurrentCell->name);
+		  }
 	       }
 	       else if (GetBus(scan->net, &wb) == 0) {
 		   char *bptr2;

tcltk/netgen.tcl.in

@@ -477,6 +477,18 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out} args} {
       set cell2 [lindex $clist2 $cidx]
    }
 
+   # The "noflat" list is non-file-specific, so run on each file.
+   foreach cell $noflat {
+      set cidx [lsearch -regexp $clist1 ^$cell$]
+      if {$cidx >= 0} {
+          netgen::flatten prohibit "$fnum1 $cell"
+      }
+      set cidx [lsearch -regexp $clist2 ^$cell$]
+      if {$cidx >= 0} {
+          netgen::flatten prohibit "$fnum2 $cell"
+      }
+   }
+
    netgen::compare assign "$fnum1 $cell1" "$fnum2 $cell2"
 
    if {$setupfile == ""} {

tcltk/tclnetgen.c

@@ -47,10 +47,6 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 /* Tcl 8.4 compatibility */
 /*-----------------------*/
 
-#ifndef CONST84
-#define CONST84
-#endif
-
 Tcl_Interp *netgeninterp;
 Tcl_Interp *consoleinterp;
 int ColumnBase = 0;
@@ -60,47 +56,47 @@ extern int PropertyErrorDetected;
 
 /* Function prototypes for all Tcl command callbacks */
 
-int _netgen_readnet(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_readlib(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_canonical(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_writenet(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_flatten(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_nodes(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_elements(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_debug(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_protochip(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_instances(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_contents(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_describe(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_cells(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_ports(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_model(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_leaves(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_quit(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_reinit(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netgen_log(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_readnet(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_readlib(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_canonical(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_writenet(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_flatten(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_nodes(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_elements(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_debug(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_protochip(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_instances(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_contents(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_describe(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_cells(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_ports(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_model(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_leaves(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_quit(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_reinit(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netgen_log(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
 #ifdef HAVE_MALLINFO
-int _netgen_printmem(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
+int _netgen_printmem(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
 #endif
-int _netgen_help(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-int _netcmp_matching(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-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[]);
-int _netcmp_equate(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
-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[]);
+int _netgen_help(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+int _netcmp_matching(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+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[]);
+int _netcmp_equate(ClientData, Tcl_Interp *, int, Tcl_Obj *const objv[]);
+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[]);
 
 typedef struct _Cmd {
    char 	*name;
@@ -399,7 +395,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 	    Tcl_ResetResult(interp);
 
 	    /* Is 1st argument a special keyword? */
-	    if (Tcl_GetIndexFromObj(interp, tobj, (CONST84 char **)suboptions,
+	    if (Tcl_GetIndexFromObj(interp, tobj, (const char **)suboptions,
 			"special", 0, &index) == TCL_OK) {
 		switch (index) {
 		    case CIRCUIT1_IDX:
@@ -455,7 +451,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 
 		    /* Check if 2nd item is a reserved keyword */
 		    if (Tcl_GetIndexFromObj(interp, fobj,
-				(CONST84 char **)suboptions,
+				(const char **)suboptions,
 				"special", 0, &index) == TCL_OK) {
 			switch (index) {
 			    case CIRCUIT1_IDX:
@@ -580,7 +576,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
     } else {
 	/* Only one name given;  check if it matches subOption */
 
-	if (Tcl_GetIndexFromObj(interp, objv, (CONST84 char **)suboptions,
+	if (Tcl_GetIndexFromObj(interp, objv, (const char **)suboptions,
 			"special", 0, &index) == TCL_OK) {
 
 	    switch (index) {
@@ -665,7 +661,7 @@ CommonParseCell(Tcl_Interp *interp, Tcl_Obj *objv,
 
 int
 _netgen_canonical(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int result;
     struct nlist *np;
@@ -704,7 +700,7 @@ _netgen_canonical(ClientData clientData,
 
 int
 _netgen_readnet(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *formats[] = {
       "automatic", "ext", "extflat", "sim", "prm", "ntk", "spice",
@@ -741,7 +737,7 @@ _netgen_readnet(ClientData clientData,
       return TCL_ERROR;
    }
    else if (objc > 1) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)formats,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)formats,
 		"format", 0, &index) != TCL_OK) {
 	 if (objc == 3)
 
@@ -850,7 +846,7 @@ _netgen_readnet(ClientData clientData,
 
 int
 _netgen_readlib(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *formats[] = {
       "actel", "spice", "xilinx", NULL
@@ -883,7 +879,7 @@ _netgen_readlib(ClientData clientData,
       Tcl_WrongNumArgs(interp, 1, objv, "format [file]");
       return TCL_ERROR;
    }
-   if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)formats,
+   if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)formats,
 	"format", 0, &index) != TCL_OK) {
       return TCL_ERROR;
    }
@@ -930,7 +926,7 @@ _netgen_readlib(ClientData clientData,
 
 int
 _netgen_writenet(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *formats[] = {
       "ext", "sim", "ntk", "actel",
@@ -949,7 +945,7 @@ _netgen_writenet(ClientData clientData,
       Tcl_WrongNumArgs(interp, 1, objv, "format file");
       return TCL_ERROR;
    }
-   if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)formats,
+   if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)formats,
 		"format", 0, &index) != TCL_OK) {
       return TCL_ERROR;
    }
@@ -1017,11 +1013,11 @@ _netgen_writenet(ClientData clientData,
 
 int
 _netgen_flatten(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *repstr, *file;
    int result, llen, filenum;
-   struct nlist *tp, *tp2;
+   struct nlist *tp, *tp2, *tptop;
 
    if ((objc < 2) || (objc > 4)) {
       Tcl_WrongNumArgs(interp, 1, objv, "?class? valid_cellname");
@@ -1035,7 +1031,7 @@ _netgen_flatten(ClientData clientData,
    if (objc >= 3) {
       char *argv = Tcl_GetString(objv[1]);
       if (!strcmp(argv, "class")) {
-	 tp = GetTopCell(filenum);
+	 tptop = GetTopCell(filenum);
 
 	 if (objc == 4) {
 	    int numflat;
@@ -1046,7 +1042,7 @@ _netgen_flatten(ClientData clientData,
 	    }
 	    else {
 	        Printf("Flattening instances of %s in cell %s within file %s\n",
-			repstr, tp2->name, tp->name);
+			repstr, tp2->name, tptop->name);
 		numflat = flattenInstancesOf(tp2->name, filenum, repstr);
 		if (numflat == 0) {
 		   Tcl_SetResult(interp, "No instances found to flatten.", NULL);
@@ -1055,15 +1051,19 @@ _netgen_flatten(ClientData clientData,
 	    }
 	 }
 	 else {
-	    Printf("Flattening instances of %s in file %s\n", repstr, tp->name);
+	    Printf("Flattening instances of %s in file %s\n", repstr, tptop->name);
             FlattenInstancesOf(repstr, filenum);
 	 }
       }
       else if (!strcmp(argv, "prohibit") || !strcmp(argv, "deny")) {
-	 tp = GetTopCell(filenum);
-	 Printf("Will not flatten instances of %s in file %s\n", repstr, tp->name);
-	 /* Mark cell as placeholder so it will not be flattened */
-	 tp->flags |= CELL_PLACEHOLDER;
+	 tptop = GetTopCell(filenum);
+	 if (tp == NULL)
+	    Printf("Error:  Cell %s does not exist.\n", repstr);
+	 else {
+	    Printf("Will not flatten instances of %s in file %s\n", repstr, tptop->name);
+	    /* Mark cell as placeholder so it will not be flattened */
+	    tp->flags |= CELL_PLACEHOLDER;
+	 }
       }
       else {
 	 Tcl_WrongNumArgs(interp, 1, objv, "class valid_cellname");
@@ -1087,7 +1087,7 @@ _netgen_flatten(ClientData clientData,
 
 int
 _netgen_nodes(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *estr = NULL, *istr = NULL, *cstr, *fstr;
    char *optstart;
@@ -1205,7 +1205,7 @@ _netgen_nodes(ClientData clientData,
 
 int
 _netgen_elements(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *nstr = NULL, *cstr;
    struct objlist * (*ListSave)();
@@ -1300,7 +1300,7 @@ _netgen_elements(ClientData clientData,
 
 int
 _netgen_debug(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *yesno[] = {
       "on", "off", NULL
@@ -1314,7 +1314,7 @@ _netgen_debug(ClientData clientData,
    if (objc == 1)
       index = YES_IDX;
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)yesno,
 		"option", 0, &index) != TCL_OK) {
          index = CMD_IDX;
       }
@@ -1349,7 +1349,7 @@ _netgen_debug(ClientData clientData,
 
 int
 _netgen_protochip(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -1369,7 +1369,7 @@ _netgen_protochip(ClientData clientData,
 
 int
 _netgen_instances(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *repstr;
    int result;
@@ -1399,7 +1399,7 @@ _netgen_instances(ClientData clientData,
 
 int
 _netgen_contents(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *repstr;
    int result;
@@ -1428,7 +1428,7 @@ _netgen_contents(ClientData clientData,
 
 int
 _netgen_describe(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *repstr;
    int file = -1;
@@ -1458,7 +1458,7 @@ _netgen_describe(ClientData clientData,
 
 int
 _netgen_cells(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *repstr, *filename = NULL;
    char *optstart;
@@ -1545,7 +1545,7 @@ _netgen_cells(ClientData clientData,
 
 int
 _netgen_model(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    struct nlist *tp, *tp2;
    char *model, *retclass;
@@ -1597,7 +1597,7 @@ _netgen_model(ClientData clientData,
    if (objc == 3) {
       nports = NumberOfPorts(tp->name, fnum);
 
-      if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)modelclasses,
+      if (Tcl_GetIndexFromObj(interp, objv[2], (const char **)modelclasses,
 		"class", 0, &index) != TCL_OK) {
 	 return TCL_ERROR;
       }
@@ -1767,7 +1767,7 @@ wrongNumPorts:
 
 int
 _netgen_ports(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *repstr;
    int result;
@@ -1797,7 +1797,7 @@ _netgen_ports(ClientData clientData,
 
 int
 _netgen_leaves(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *repstr;
    int result;
@@ -1833,7 +1833,7 @@ _netgen_leaves(ClientData clientData,
 
 int
 _netgen_quit(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -1861,7 +1861,7 @@ _netgen_quit(ClientData clientData,
 
 int
 _netgen_reinit(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -1881,7 +1881,7 @@ _netgen_reinit(ClientData clientData,
 
 int
 _netgen_log(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *yesno[] = {
       "start", "end", "reset", "suspend", "resume", "file", "echo", "put", NULL
@@ -1898,7 +1898,7 @@ _netgen_log(ClientData clientData,
       index = (LoggingFile) ? RESUME_IDX : START_IDX;
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)yesno,
 		"option", 0, &index) != TCL_OK) {
 	 return TCL_ERROR;
       }
@@ -2025,7 +2025,7 @@ _netgen_log(ClientData clientData,
 
 int
 _netgen_printmem(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -2047,7 +2047,7 @@ _netgen_printmem(ClientData clientData,
 
 int
 _netcmp_format(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int col1_width = 41, col2_width = 41;
 
@@ -2108,7 +2108,7 @@ _netcmp_format(ClientData clientData,
 
 int
 _netcmp_compare(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *name1, *name2, *file1, *file2, *optstart;
    int fnum1, fnum2, dolist = 0;
@@ -2285,7 +2285,7 @@ _netcmp_compare(ClientData clientData,
 
 int
 _netcmp_iterate(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -2309,7 +2309,7 @@ _netcmp_iterate(ClientData clientData,
 
 int
 _netcmp_summary(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *options[] = {
       "nodes", "elements", NULL
@@ -2324,7 +2324,7 @@ _netcmp_summary(ClientData clientData,
       return TCL_ERROR;
    }
    if (objc == 2) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2350,7 +2350,7 @@ _netcmp_summary(ClientData clientData,
 
 int
 _netcmp_print(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *options[] = {
       "nodes", "elements", "queue", NULL
@@ -2388,16 +2388,16 @@ _netcmp_print(ClientData clientData,
       return TCL_ERROR;
    }
    if (objc >= 2) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
 		"option", 0, &index) != TCL_OK) {
 	 if ((objc == 2) && (Tcl_GetIndexFromObj(interp, objv[1],
-		(CONST84 char **)classes, "class", 0, &class) != TCL_OK)) {
+		(const char **)classes, "class", 0, &class) != TCL_OK)) {
             return TCL_ERROR;
 	 }
       }
    }
    if (objc == 3 && index != QUEUE_IDX) {
-      if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)classes,
+      if (Tcl_GetIndexFromObj(interp, objv[2], (const char **)classes,
 		"class", 0, &class) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2441,7 +2441,7 @@ _netcmp_print(ClientData clientData,
 
 int
 _netcmp_run(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *options[] = {
       "converge", "resolve", NULL
@@ -2468,7 +2468,7 @@ _netcmp_run(ClientData clientData,
    if (objc == 1)
       index = RESOLVE_IDX;
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2585,7 +2585,7 @@ _netcmp_run(ClientData clientData,
 
 int
 _netcmp_verify(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *options[] = {
       "nodes", "elements", "properties", "only", "all", "equivalent", "unique", NULL
@@ -2617,7 +2617,7 @@ _netcmp_verify(ClientData clientData,
       return TCL_ERROR;
    }
    if (objc == 2) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -2774,7 +2774,7 @@ _netcmp_verify(ClientData clientData,
 
 int
 _netcmp_automorphs(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -2795,7 +2795,7 @@ _netcmp_automorphs(ClientData clientData,
 
 int
 _netcmp_convert(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     char *cellname;
     int filenum = -1;
@@ -2825,7 +2825,7 @@ _netcmp_convert(ClientData clientData,
 
 int
 _netcmp_global(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *filename, *cellname, *pattern;
    int numchanged = 0, p, fnum, llen, result;
@@ -2862,7 +2862,7 @@ _netcmp_global(ClientData clientData,
 
 int
 _netcmp_ignore(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *options[] = {
       "class", "shorted", NULL
@@ -2876,7 +2876,7 @@ _netcmp_ignore(ClientData clientData,
    char *name = NULL, *name2 = NULL;
 
    if (objc >= 3) {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
 		"option", 0, &index) == TCL_OK) {
 	 objc--;
 	 objv++;
@@ -2910,7 +2910,7 @@ _netcmp_ignore(ClientData clientData,
 
 int
 _netcmp_equate(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *options[] = {
       "nodes", "elements", "classes", "pins", NULL
@@ -2955,7 +2955,7 @@ _netcmp_equate(ClientData clientData,
       return TCL_ERROR;
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -3424,7 +3424,7 @@ _netcmp_equate(ClientData clientData,
 
 int
 _netcmp_property(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
     int fnum, i, llen;
     struct nlist *tp;
@@ -3506,7 +3506,7 @@ _netcmp_property(ClientData clientData,
 
     /* Don't need to check return value */
     index = -1;
-    Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)topoptions,
+    Tcl_GetIndexFromObj(interp, objv[1], (const char **)topoptions,
 		"option", 0, &index);
 
     /* Check for special command "property default" */
@@ -3604,7 +3604,7 @@ _netcmp_property(ClientData clientData,
 	}
 	else if (objc == 3) {
 	    if (Tcl_GetIndexFromObj(interp, objv[2],
-			(CONST84 char **)topo,
+			(const char **)topo,
 			"topology", 0, &idx2) == TCL_OK) {
 		if (idx2 == 0)
 		    ExactTopology = TRUE;
@@ -3663,7 +3663,7 @@ _netcmp_property(ClientData clientData,
 	Tcl_SetObjResult(interp, tobj1);
     }
     else {
-	if (Tcl_GetIndexFromObj(interp, objv[2], (CONST84 char **)options,
+	if (Tcl_GetIndexFromObj(interp, objv[2], (const char **)options,
 		"option", 0, &index) != TCL_OK) {
 	    index = ADD_IDX;
 	    argstart = 2;
@@ -3696,7 +3696,7 @@ _netcmp_property(ClientData clientData,
 		    // Each value must be a list of two, or a yes/no answer.
 
 		    if (Tcl_GetIndexFromObj(interp, objv[i],
-				(CONST84 char **)yesno,
+				(const char **)yesno,
 				"combine", 0, &idx2) == TCL_OK) {
 			if (idx2 <= 4) {	/* true, enable, etc. */
 			    if (index == SERIAL_IDX || index == SERIES_IDX)
@@ -3728,7 +3728,7 @@ _netcmp_property(ClientData clientData,
 			if (result != TCL_OK) return result;
 
 			result = Tcl_GetIndexFromObj(interp, tobj2,
-				(CONST84 char **)combineoptions,
+				(const char **)combineoptions,
 				"combine_type", 0, &idx2);
 			if (result != TCL_OK) return result;
 
@@ -3813,7 +3813,7 @@ _netcmp_property(ClientData clientData,
 			    /* {key, type} or {key, tolerance} duplet */
 
 			    if (Tcl_GetIndexFromObj(interp, tobj2,
-					(CONST84 char **)suboptions,
+					(const char **)suboptions,
 					"type", 0, &idx2) != TCL_OK) {
 				Tcl_ResetResult(interp);
 				if (Tcl_GetDoubleFromObj(interp, tobj2, &dval)
@@ -3857,7 +3857,7 @@ _netcmp_property(ClientData clientData,
 			    /* {key, type, tolerance} triplet */
 
 			    if (Tcl_GetIndexFromObj(interp, tobj2,
-					(CONST84 char **)suboptions,
+					(const char **)suboptions,
 					"type", 0, &idx2) != TCL_OK)
 				return TCL_ERROR;
 
@@ -4000,7 +4000,7 @@ _netcmp_property(ClientData clientData,
 			if (result != TCL_OK) return result;
 
 			result = Tcl_GetIndexFromObj(interp, tobj2,
-				(CONST84 char **)mergeoptions,
+				(const char **)mergeoptions,
 				"merge_type", 0, &idx2);
 			if (result != TCL_OK) return result;
 
@@ -4052,7 +4052,7 @@ _netcmp_property(ClientData clientData,
 		    return TCL_ERROR;
 		}
 		result = Tcl_GetIndexFromObj(interp, objv[3],
-			(CONST84 char **)deriveoptions,
+			(const char **)deriveoptions,
 			"area|perimeter", 0, &idx2);
 		if (result != TCL_OK) return result;
 		switch (idx2) {
@@ -4084,7 +4084,7 @@ _netcmp_property(ClientData clientData,
 
 int
 _netcmp_permute(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *model, *pin1, *pin2;
    char *permuteclass[] = {
@@ -4105,7 +4105,7 @@ _netcmp_permute(ClientData clientData,
       index = DEFLT_IDX;
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)permuteclass,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)permuteclass,
 		"permute class", 0, &index) != TCL_OK) {
 	    if (objc != 4) {
 		Tcl_WrongNumArgs(interp, 1, objv, "?valid_cellname pin1 pin2?");
@@ -4225,7 +4225,7 @@ _netcmp_permute(ClientData clientData,
 
 int
 _netcmp_symmetry(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    Printf("Symmetry breaking method has been deprecated.\n");
    return TCL_OK;
@@ -4241,7 +4241,7 @@ _netcmp_symmetry(ClientData clientData,
 
 int
 _netcmp_exhaustive(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *yesno[] = {
       "on", "off", NULL
@@ -4254,7 +4254,7 @@ _netcmp_exhaustive(ClientData clientData,
    if (objc == 1)
       index = -1;
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)yesno,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)yesno,
 		"option", 0, &index) != TCL_OK)
          return TCL_ERROR;
    }
@@ -4283,7 +4283,7 @@ _netcmp_exhaustive(ClientData clientData,
 
 int
 _netcmp_restart(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    if (objc != 1) {
       Tcl_WrongNumArgs(interp, 1, objv, "(no arguments)");
@@ -4303,7 +4303,7 @@ _netcmp_restart(ClientData clientData,
 
 int
 _netgen_help(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    int n;
 
@@ -4334,7 +4334,7 @@ _netgen_help(ClientData clientData,
 
 int
 _netcmp_matching(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    char *options[] = {
       "nodes", "elements", NULL
@@ -4356,7 +4356,7 @@ _netcmp_matching(ClientData clientData,
       name = Tcl_GetString(objv[1]);
    }
    else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)options,
+      if (Tcl_GetIndexFromObj(interp, objv[1], (const char **)options,
 		"option", 0, &index) != TCL_OK) {
          return TCL_ERROR;
       }
@@ -4522,7 +4522,7 @@ char *Tcl_Strdup(const char *s)
 /*------------------------------------------------------*/
 
 int _tkcon_interrupt(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
+    Tcl_Interp *interp, int objc, Tcl_Obj *const objv[])
 {
    InterruptPending = 1;
    return TCL_OK;
@@ -4570,7 +4570,8 @@ int Tclnetgen_Init(Tcl_Interp *interp)
    }
    for (n = 0; netcmp_cmds[n].name != NULL; n++) {
       sprintf(keyword, "netgen::%s", netcmp_cmds[n].name);
-      Tcl_CreateObjCommand(interp, keyword, netcmp_cmds[n].handler,
+      Tcl_CreateObjCommand(interp, keyword,
+		(Tcl_ObjCmdProc *)netcmp_cmds[n].handler,
 		(ClientData)NULL, (Tcl_CmdDeleteProc *)NULL);
    }