Merge branch 'master' into work

avoid the problem where non-critical properties cause devices not
to match, resulting in apparent mismatches of matched devices.
The current behavior now prints a statement about each device.
However, the result is still somewhat ambiguous.

.gitignore

@@ -3,6 +3,8 @@
 .inca.db.*
 inca.*.pak
 *.swp
+*.log
+*.so
 *~
 */av_extracted*/
 .nfs*

VERSION

@@ -1 +1 @@
-1.5.47
+1.5.65

base/actel.c

@@ -39,7 +39,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 	
 #define ACTELHASHSIZE 99
 static long actelhashbase = 0xA00;
-static struct hashlist *actelnametab[ACTELHASHSIZE];
+static struct hashdict actelnamedict;
 static FILE *actelfile;
 
 char *ActelName(char *Name);
@@ -53,16 +53,16 @@ void PrintActelNames(char *filename)
 {
   if (filename == NULL) actelfile = stdout;
   else actelfile = fopen(filename,"w");
-  RecurseHashTable(actelnametab, ACTELHASHSIZE, PrintActelName);
+  RecurseHashTable(&actelnamedict, PrintActelName);
   if (actelfile != stdout) fclose(actelfile);
 }
 
 long ActelNameHash(char *name)
-/* hashes name into nametab if necessary, then returns address of entry */
+/* hashes name into namedict if necessary, then returns address of entry */
 {
   struct hashlist *p;
 
-  p = HashInstall(name, actelnametab, ACTELHASHSIZE);
+  p = HashInstall(name, &actelnamedict);
   if (p == NULL) return(0);
   if (p->ptr != NULL) return ((long)(p->ptr));
   actelhashbase++;
@@ -403,7 +403,7 @@ void Actel(char *name, char *filename)
     return;
   }
   ClearDumpedList();
-  InitializeHashTable(actelnametab, ACTELHASHSIZE);
+  InitializeHashTable(&actelnamedict, ACTELHASHSIZE);
   if (LookupCell(name) != NULL) 
     actelCell(name);
   CloseFile(FileName);

base/anneal.c

@@ -20,7 +20,6 @@ int MaxCPUTime = 100;  /* max number of seconds to burn */
 #define MAX_CHANGES_PER_ITER 2
 
 #if 0
-/* INLINE */
 float RandomUniform(void)
 {
   /* DANGER! DANGER! Non-portable code below!! */

base/bottomup.c

@@ -36,7 +36,6 @@ int CountFanoutOK;
 int CountSwallowedElements;
 
 
-INLINE 
 int Independent(int E1, int E2)
 /* return 1 if E1 and E2 share no leaves in common */
 {
@@ -47,7 +46,6 @@ int Independent(int E1, int E2)
   return(1);
 }
 
-INLINE
 int FanoutOK(int E1, int E2)
 {
   int approxfanout;
@@ -67,7 +65,6 @@ int FanoutOK(int E1, int E2)
 }
 
 
-INLINE
 int Swallowed(int Parent, int Child)
 /* returns 1 if Child's fanout is contained in Parent's */
 {
@@ -107,7 +104,6 @@ int SmallEnough(int E1, int E2)
 }
 #endif
 
-INLINE 
 int SuccessfulEmbedding(int E)
 /* returns 1 if element E is a successful embedding */
 {

base/config.h

@@ -117,15 +117,6 @@
 #define memzero(ptr, len) memset(ptr, 0, len)
 #endif
 
-
-#ifndef INLINE
-#ifdef __GNUC__
-#define INLINE inline
-#else
-#define INLINE
-#endif /* __GNUC__ */
-#endif
-
 #ifdef HAVE_SYSV_STRING
 #undef NEED_STRING
 #endif

base/embed.c

@@ -348,7 +348,6 @@ void PRINTPACKED(unsigned long *mstar)
 #ifdef IBMPC
 static unsigned int lochash(unsigned long *mstar)
 #else
-INLINE 
 static unsigned long lochash(unsigned long *mstar)
 #endif
 {
@@ -432,7 +431,6 @@ static struct ex_entry *hashinstall(unsigned long *mstar)
   return(ex_tab[hashval] = np);
 }
 
-/* INLINE */
 int Exists(int E1, int E2)
 {
   int i;
@@ -470,7 +468,6 @@ int InitializeExistTest(void)
   return(1);
 }
 
-/* INLINE */
 void AddToExistSet(int E1, int E2) 
 {
   int i;

base/ext.c

@@ -544,10 +544,10 @@ void simCell(char *name, int filenum)
 	    if (ob2 && ob2->type == PROPERTY) {
 	       struct property *kl;
 	       struct valuelist *vl;
-	       kl = (struct property *)HashLookup("length", tp2->proptab, OBJHASHSIZE);
+	       kl = (struct property *)HashLookup("length", &(tp2->propdict));
 	       vl = (struct valuelist *)ob2->instance.name;
 	       l = 1.0e6 * vl[kl->idx].value.dval;	/* m -> um */
-	       kl = (struct property *)HashLookup("width", tp2->proptab, OBJHASHSIZE);
+	       kl = (struct property *)HashLookup("width", &(tp2->propdict));
 	       w = 1.0e6 * vl[kl->idx].value.dval;	/* m -> um */
 	    }
 	    FlushString(" %g %g\n", l, w);   
@@ -579,7 +579,7 @@ void simCell(char *name, int filenum)
 	    if (ob2 && ob2->type == PROPERTY) {
 	       struct property *kl;
 	       struct valuelist *vl;
-	       kl = (struct property *)HashLookup("value", tp2->proptab, OBJHASHSIZE);
+	       kl = (struct property *)HashLookup("value", &(tp2->propdict));
 	       vl = (struct valuelist *)ob2->instance.name;
 	       if (tp2->class == CLASS_CAP)
 	          v = 1.0e15 * vl[kl->idx].value.dval;	/* F -> fF */

base/flatten.c

@@ -24,6 +24,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include "config.h"
 
 #include <stdio.h>
+#include <math.h>
 
 #ifdef IBMPC
 #include <alloc.h>
@@ -39,6 +40,8 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include "print.h"
 #include "netcmp.h"
 
+extern struct hashdict spiceparams;
+
 #define OLDPREFIX 1
 
 void flattenCell(char *name, int file)
@@ -95,7 +98,7 @@ void flattenCell(char *name, int file)
       if (ChildCell->dumped == 0) flattenCell(ParentParams->model.class,
 			ChildCell->file);
 
-      ChildObjList = CopyObjList(ChildCell->cell);
+      ChildObjList = CopyObjList(ChildCell->cell, 1);
 
       /* update node numbers in child to unique numbers */
       oldmax = 0;
@@ -177,7 +180,7 @@ void flattenCell(char *name, int file)
 		 }
 	      }
 	   }
-	   HashPtrInstall(tmp->name, tmp, ThisCell->objtab, OBJHASHSIZE);
+	   HashPtrInstall(tmp->name, tmp, &(ThisCell->objdict));
 	   continue;
 	}
 
@@ -198,9 +201,9 @@ void flattenCell(char *name, int file)
 #endif
 	FreeString(tmp->instance.name);
 	tmp->instance.name = strsave(tmpstr);
-	HashPtrInstall(tmp->name, tmp, ThisCell->objtab, OBJHASHSIZE);
+	HashPtrInstall(tmp->name, tmp, &(ThisCell->objdict));
 	if (tmp->type == FIRSTPIN) 
-	  HashPtrInstall(tmp->instance.name, tmp, ThisCell->insttab, OBJHASHSIZE);
+	  HashPtrInstall(tmp->instance.name, tmp, &(ThisCell->instdict));
       }
 
       /* splice instance out of parent */
@@ -249,6 +252,7 @@ void flattenCell(char *name, int file)
 int flattenInstancesOf(char *name, int fnum, char *instance)
 {
   struct objlist *ParentParams;
+  struct objlist *ParentProps;
   struct objlist *NextObj;
   struct objlist *ChildObjList;
   struct nlist *ThisCell;
@@ -308,12 +312,20 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
       if (ChildCell->class != CLASS_SUBCKT) continue;
       if (ChildCell == ThisCell) continue;	// Avoid infinite loop
 
+      /* Does the parent cell have properties?  If so, save a pointer to them */
+      for (ParentProps = ParentParams->next; ParentProps &&
+		ParentProps->type != FIRSTPIN;
+		ParentProps = ParentProps->next) {
+	 if (ParentProps->type == PROPERTY) break;
+      }
+      if (ParentProps && (ParentProps->type != PROPERTY)) ParentProps = NULL;
+
       /* not primitive, so need to flatten this instance */
       notdone = 1;
       /* if this is a new instance, flatten it */
       /* if (ChildCell->dumped == 0) flattenCell(ParentParams->model.class, file); */
 
-      ChildObjList = CopyObjList(ChildCell->cell);
+      ChildObjList = CopyObjList(ChildCell->cell, 1);
       numflat++;
 
       /* update node numbers in child to unique numbers */
@@ -381,7 +393,8 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
 	  /* delete all ports at beginning of list */
 	  if (Debug) Printf("deleting leading port from child\n");
 	  tmp = ChildObjList->next;
-	  FreeObjectAndHash(ChildObjList, ChildCell);
+	  // FreeObjectAndHash(ChildObjList, ChildCell);
+	  FreeObject(ChildObjList);
 	  ChildObjList = tmp;
         }
         tmp = ChildObjList;
@@ -389,7 +402,8 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
 	  if (IsPort(tmp->next)) {
 	    ob2 = (tmp->next)->next;
 	    if (Debug) Printf("deleting a port from child\n");
-	    FreeObjectAndHash(tmp->next, ChildCell);
+	    // FreeObjectAndHash(tmp->next, ChildCell);
+	    FreeObject(tmp->next);
 	    tmp->next = ob2;
 	  } 
 	  else tmp = tmp->next;
@@ -404,7 +418,9 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
       prefixlength = strlen(tmpstr);
 #endif
       for (tmp = ChildObjList; tmp != NULL; tmp = tmp->next) {
-	if (tmp->type == PROPERTY) continue;
+	if (tmp->type == PROPERTY)
+	    continue;
+
 	else if (IsGlobal(tmp)) {
 	   /* Keep the name but search for node of same name in parent	*/
 	   /* and replace the node number, if found.			*/
@@ -427,7 +443,7 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
 	   }
 	   // Don't hash this if the parent had a port of this name
 	   if (!ob2 || ob2->type != PORT)
-	      HashPtrInstall(tmp->name, tmp, ThisCell->objtab, OBJHASHSIZE);
+	      HashPtrInstall(tmp->name, tmp, &(ThisCell->objdict));
 	   continue;
 	}
 
@@ -448,9 +464,25 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
 #endif
 	FreeString(tmp->instance.name);
 	tmp->instance.name = strsave(tmpstr);
-	HashPtrInstall(tmp->name, tmp, ThisCell->objtab, OBJHASHSIZE);
+	HashPtrInstall(tmp->name, tmp, &(ThisCell->objdict));
 	if (tmp->type == FIRSTPIN) 
-	  HashPtrInstall(tmp->instance.name, tmp, ThisCell->insttab, OBJHASHSIZE);
+	  HashPtrInstall(tmp->instance.name, tmp, &(ThisCell->instdict));
+      }
+
+      /* Do property inheritance */
+
+      if (ParentProps) {
+         for (ob2 = ChildObjList; ob2 != NULL; ob2=ob2->next) {
+
+	    /* If the parent cell has properties to declare, then	*/
+	    /* pass them on to children.  Use globals only if the	*/
+	    /* spiceparams dictionary is active (during file reading	*/
+	    /* only).							*/
+
+	    if (ob2->type == PROPERTY)
+		ReduceExpressions(ob2, ParentProps, ChildCell,
+			(spiceparams.hashtab == NULL) ? 0 : 1);
+         }
       }
 
       /* splice instance out of parent */
@@ -466,10 +498,11 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
 	   for (ob2->next = ChildObjList; ob2->next != NULL; ob2 = ob2->next) ;
       }
       /* now, ob2 is last element in child list, so skip and reclaim parent */
+
       tmp = ParentParams;
       do {
 	tmp = tmp->next;
-      } while ((tmp != NULL) && (tmp->type > FIRSTPIN));
+      } while ((tmp != NULL) && ((tmp->type > FIRSTPIN) || (tmp->type == PROPERTY)));
       if (ob2) ob2->next = tmp;
       while (ParentParams != tmp) {
 	ob2 = ParentParams->next;
@@ -487,8 +520,8 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
 
 void Flatten(char *name, int file)
 {
-	ClearDumpedList(); /* keep track of flattened cells */
-	flattenCell(name, file);
+    ClearDumpedList(); /* keep track of flattened cells */
+    flattenCell(name, file);
 }
 
 
@@ -499,9 +532,22 @@ int flattenoneentry(struct hashlist *p, int file)
    struct nlist *ptr;
 
    ptr = (struct nlist *)(p->ptr);
-   if (file == ptr->file)
+   if (file == ptr->file) {
       if (!(*matchfunc)(ptr->name, model_to_flatten) && (ptr->class == CLASS_SUBCKT))
 	 flattenInstancesOf(ptr->name, file, model_to_flatten);
+      else if (ptr->flags & CELL_DUPLICATE) {
+	 char *bptr = strstr(ptr->name, "[[");
+	 if (bptr != NULL) {
+	    *bptr = '\0';
+            if (!(*matchfunc)(ptr->name, model_to_flatten)
+			&& (ptr->class == CLASS_SUBCKT)) {
+	       *bptr = '[';
+	       flattenInstancesOf(ptr->name, file, model_to_flatten);
+	    }
+	    *bptr = '[';
+	 }
+      }
+   }
    return(1);
 }
 
@@ -652,7 +698,7 @@ void convertGlobalsOf(char *name, int fnum, char *instance)
 	 newnode->instance.name = NULL;
 	 newnode->model.class = NULL;
 	 newpin->node = maxnode;
-	 HashPtrInstall(newnode->name, newnode, ThisCell->objtab, OBJHASHSIZE);
+	 HashPtrInstall(newnode->name, newnode, &(ThisCell->objdict));
       }
 
       // Remove any references to the net as a GLOBAL type in the instance
@@ -675,7 +721,7 @@ void convertGlobalsOf(char *name, int fnum, char *instance)
       // Now there should be only one object of this name in the instance,
       // which is the pin, and we will set the hash table to point to it.
 
-      HashPtrInstall(newpin->name, newpin, ThisCell->objtab, OBJHASHSIZE);
+      HashPtrInstall(newpin->name, newpin, &(ThisCell->objdict));
 
    }
    CacheNodeNames(ThisCell);
@@ -788,7 +834,7 @@ void ConvertGlobals(char *name, int filenum)
 			strsave(ObjList->instance.name) : NULL;
 	 NewObj->name = (ObjList->name) ? strsave(ObjList->name) : NULL;
 
-	 HashPtrInstall(NewObj->name, NewObj, ThisCell->objtab, OBJHASHSIZE);
+	 HashPtrInstall(NewObj->name, NewObj, &(ThisCell->objdict));
 
 	 /* Find all parent cells of this cell.  Find the global node	*/
 	 /* if it exists or create it if it doesn't.  Add the node to	*/
@@ -907,15 +953,15 @@ struct nlist *uniquepins(struct hashlist *p, void *clientdata)
 	       modified = 1;
 
 	       // Check if the node we're about to remove is in the
-	       // objtab hash table;  if so, replace it with the one
+	       // objdict hash table;  if so, replace it with the one
 	       // that we are going to keep.
 
 	       if (LookupObject(ob->name, ptr) == ob) {
-		  HashPtrInstall(ob->name, saveob, ptr->objtab, OBJHASHSIZE);
+		  HashPtrInstall(ob->name, saveob, &(ptr->objdict));
 	       }
 	    }
 	    tob = tob->next;
-	    if (tob->type != PORT && tob->type != UNKNOWN) break;
+	    if (tob == NULL || (tob->type != PORT && tob->type != UNKNOWN)) break;
 	 }
 
 	 /* 2nd pass---remove the pins */
@@ -941,12 +987,12 @@ struct nlist *uniquepins(struct hashlist *p, void *clientdata)
 	       ob = ob->next;
 	    }
 	    tob = tob->next;
-	    if (tob->type != PORT && tob->type != UNKNOWN) break;
+	    if (tob == NULL || (tob->type != PORT && tob->type != UNKNOWN)) break;
 	 }
 
 	 // Renumber the pins in order.  Since when removing duplicates, the
 	 // first entry is always kept, the first pin is never changed, so
- 	 // the insttab record is never corrupted.
+ 	 // the instdict record is never corrupted.
 
 	 i = FIRSTPIN;
 	 firstpin->type = i++;
@@ -1041,8 +1087,7 @@ int UniquePins(char *name, int filenum)
 	     // The hash table is pointing at the cell we are
 	     // about to delete.  Hash the one we're keeping instead.
 
-	     HashPtrInstall(ob->name, firstport[ob->node],
-			ThisCell->objtab, OBJHASHSIZE);
+	     HashPtrInstall(ob->name, firstport[ob->node], &(ThisCell->objdict));
 	 }
 
 	 if (lob == NULL) {
@@ -1079,7 +1124,7 @@ int UniquePins(char *name, int filenum)
 /* Callback function for CleanupPins			*/
 /* Note that if the first pin of the instance is a	*/
 /* disconnected node, then removing it invalidates the	*/
-/* insttab hash.					*/
+/* instdict hash.					*/
 /*------------------------------------------------------*/
 
 struct nlist *cleanuppins(struct hashlist *p, void *clientdata)
@@ -1129,9 +1174,9 @@ struct nlist *cleanuppins(struct hashlist *p, void *clientdata)
 		}
 
 	        // Check if the node we're about to remove is in the
-	        // objtab hash table
+	        // objdict hash table
 	        if (LookupObject(ob->name, ptr) == ob) {
-		   HashDelete(ob->name, ptr->objtab, OBJHASHSIZE);
+		   HashDelete(ob->name, &(ptr->objdict));
 	        }
 
 		FREE(ob->name);
@@ -1147,10 +1192,9 @@ struct nlist *cleanuppins(struct hashlist *p, void *clientdata)
 	     obt = obt->next;
 	  }
 
-	  /* Rehash the insttab, in case the first pin got removed */
+	  /* Rehash the instdict, in case the first pin got removed */
 	  if (firstpin && (firstpin->type == FIRSTPIN))
-	     HashPtrInstall(firstpin->instance.name, firstpin, ptr->insttab,
-			OBJHASHSIZE);
+	     HashPtrInstall(firstpin->instance.name, firstpin, &(ptr->instdict));
       }
    }
    return NULL;		/* Keep the search going */
@@ -1204,7 +1248,11 @@ int CleanupPins(char *name, int filenum)
 
    lob = NULL;
    for (ob = ThisCell->cell; ob != NULL; ) {
-      if (ob->type == UNKNOWN) continue;
+      if (ob->type == UNKNOWN) {
+	 lob = ob;
+         ob = ob->next;
+	 continue;
+      }
       else if (ob->type != PORT) break;
       nob = ob->next;
       if (ob->node == -1) {
@@ -1216,9 +1264,9 @@ int CleanupPins(char *name, int filenum)
 	 }
 
 	 // Check if the node we're about to remove is in the
-	 // objtab hash table
+	 // objdict hash table
 	 if (LookupObject(ob->name, ThisCell) == ob) {
-	     HashDelete(ob->name, ThisCell->objtab, OBJHASHSIZE);
+	     HashDelete(ob->name, &(ThisCell->objdict));
 	 }
 
 	 FREE(ob->name);
@@ -1243,48 +1291,71 @@ typedef struct ecompare {
     char refcount;
 } ECompare;
 
+typedef struct ecomplist *ECompListPtr;
+
+typedef struct ecomplist {
+    ECompare *ecomp;
+    ECompListPtr next;
+} ECompList;
+
 /*------------------------------------------------------*/
-/* Survey the contents of a cell and 
+/* Survey the contents of a cell and sort into a hash	*/
 /*------------------------------------------------------*/
 
 void
-SurveyCell(struct nlist *tc, struct hashlist **comptab, int file1, int file2, int which)
+SurveyCell(struct nlist *tc, struct hashdict *compdict, int file1, int file2, int which)
 {
     struct objlist *ob;
     struct nlist *tsub, *teq;
     ECompare *ecomp, *qcomp, *ncomp;
+    int file = (which == 0) ? file1 : file2;
+    int ofile = (which == 0) ? file2 : file1;
+    char *dstr;
 
     for (ob = tc->cell; ob; ob = ob->next) {
 	if (ob->type == FIRSTPIN) {
-	    tsub = LookupCellFile(ob->model.class, (which == 0) ? file1 : file2);
-	    ecomp = (ECompare *)HashLookup(ob->model.class, comptab, OBJHASHSIZE);
+	    tsub = LookupCellFile(ob->model.class, file);
+	    if (tsub->flags & CELL_DUPLICATE) {
+	       // Always register a duplicate under the original name
+	       dstr = strstr(ob->model.class, "[[");
+	       if (dstr) *dstr = '\0';
+	    }
+	    else dstr = NULL;
+
+	    teq = LookupClassEquivalent(ob->model.class, file, ofile);
+	    ecomp = (ECompare *)HashInt2Lookup(ob->model.class, file, compdict);
+
 	    if (ecomp == NULL) {
 		ncomp = (ECompare *)MALLOC(sizeof(ECompare));
 		if (which == 0) {
 		   ncomp->num1 = 1;
 		   ncomp->num2 = 0;
 		   ncomp->cell1 = tsub;
-		   teq = LookupClassEquivalent(ob->model.class, file1, file2);
 		   ncomp->cell2 = teq;
 		}
 		else {
 		   ncomp->num1 = 0;
 		   ncomp->num2 = 1;
 		   ncomp->cell2 = tsub;
-		   teq = LookupClassEquivalent(ob->model.class, file2, file1);
 		   ncomp->cell1 = teq;
 		}
 		ncomp->add1 = 0;
 		ncomp->add2 = 0;
 		ncomp->refcount = (char)1;
 
-		HashPtrInstall(ob->model.class, ncomp, comptab, OBJHASHSIZE);
+		HashInt2PtrInstall(ob->model.class, file, ncomp, compdict);
 		if (teq != NULL) {
-		    qcomp = (ECompare *)HashLookup(teq->name, comptab, OBJHASHSIZE);
+		    char *bstr = NULL;
+		    if (teq->flags & CELL_DUPLICATE) {
+			bstr = strstr(teq->name, "[[");
+			if (bstr) *bstr = '\0';
+		    }
+		    qcomp = (ECompare *)HashInt2Lookup(teq->name, ofile, compdict);
 		    if (qcomp == NULL) {
-			HashPtrInstall(teq->name, ncomp, comptab, OBJHASHSIZE);
+			HashInt2PtrInstall(teq->name, ofile, ncomp, compdict);
 			ncomp->refcount++;
 		    }
+		    if (bstr) *bstr = '[';
 		}
 	    }
 	    else {
@@ -1293,6 +1364,7 @@ SurveyCell(struct nlist *tc, struct hashlist **comptab, int file1, int file2, in
 		else
 		   ecomp->num2++;
 	    }
+	    if (dstr) *dstr = '[';
 	}
     }
 }
@@ -1309,7 +1381,7 @@ SurveyCell(struct nlist *tc, struct hashlist **comptab, int file1, int file2, in
 /*							*/
 /* If there is a mismatch between instances of low-	*/
 /* level devices, determine if the mismatches can be	*/
-/* resolved by parallel/serial combining, accoring to	*/
+/* resolved by parallel/serial combining, according to	*/
 /* combination rules.					*/
 /* 							*/
 /* Return the number of modifications made.		*/
@@ -1318,10 +1390,11 @@ SurveyCell(struct nlist *tc, struct hashlist **comptab, int file1, int file2, in
 int
 PrematchLists(char *name1, int file1, char *name2, int file2)
 {
-    struct nlist *tc1, *tc2, *teq, *tsub1, *tsub2;
+    struct nlist *tc1, *tc2, *tsub1, *tsub2;
     struct objlist *ob1, *ob2, *lob;
-    struct hashlist **comptab;
+    struct hashdict compdict;
     ECompare *ecomp, *ncomp;
+    ECompList *list0X, *listX0;
     int match, modified = 0;
 
     if (file1 == -1)
@@ -1336,31 +1409,37 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 
     if (tc1 == NULL || tc2 == NULL) return;
 
-    comptab = (struct hashlist **)CALLOC(OBJHASHSIZE,
-		sizeof(struct hashlist *));
+    InitializeHashTable(&compdict, OBJHASHSIZE);
 
     // Gather information about instances of cell "name1"
-    SurveyCell(tc1, comptab, file1, file2, 0);
+    SurveyCell(tc1, &compdict, file1, file2, 0);
 
     // Gather information about instances of cell "name2"
-    SurveyCell(tc2, comptab, file1, file2, 1);
+    SurveyCell(tc2, &compdict, file1, file2, 1);
 
     // Find all instances of one cell that have fewer in
     // the compared circuit.  Check whether subcircuits
     // in the hierarchy of each instance contain devices
-    // or subcircuits that more in the compared circuit.
+    // or subcircuits that have more in the compared circuit.
 
-    ecomp = (ECompare *)HashFirst(comptab, OBJHASHSIZE);
+    listX0 = list0X = NULL;
+    ecomp = (ECompare *)HashFirst(&compdict);
     while (ecomp != NULL) {
+
+	/* Case 1:  Both cell1 and cell2 classes are subcircuits, */
+	/* and flattening both of them improves the matching.	  */
+
 	if ((ecomp->num1 != ecomp->num2) && (ecomp->cell2 != NULL) &&
-			(ecomp->cell2->class == CLASS_SUBCKT)) {
+			(ecomp->cell1 != NULL) &&
+			(ecomp->cell2->class == CLASS_SUBCKT) &&
+			(ecomp->cell1->class == CLASS_SUBCKT)) {
 	    ecomp->add2 = -ecomp->num2;
 	    ecomp->add1 = -ecomp->num1;
 	    match = 1;
 	    for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
 		if (ob2->type == FIRSTPIN) {
-	   	    ncomp = (ECompare *)HashLookup(ob2->model.class,
-				comptab, OBJHASHSIZE);
+	   	    ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
+				ecomp->cell2->file, &compdict);
 		    if (ncomp != NULL) {
 			if ((ncomp->num1 > ncomp->num2) &&
 				((ncomp->add2 + ecomp->num2) >=
@@ -1386,16 +1465,27 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		}
 	    }
 	    if (match) {
-		flattenInstancesOf(name2, file2, ecomp->cell2->name); 
-		flattenInstancesOf(name1, file1, ecomp->cell1->name); 
+		if (ecomp->cell1) {
+		    Fprintf(stdout, "Flattening instances of %s in cell %s"
+				" makes a better match\n", ecomp->cell1->name,
+				name1);
+		    flattenInstancesOf(name1, file1, ecomp->cell1->name); 
+		}
+		if (ecomp->cell2) {
+		    Fprintf(stdout, "Flattening instances of %s in cell %s"
+				" makes a better match\n", ecomp->cell2->name,
+				name2);
+		    flattenInstancesOf(name2, file2, ecomp->cell2->name); 
+		}
 		modified++;
 	    }
 
 	    /* Reset or apply the count adjustments */
+	    if (ecomp->cell2)
 	    for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
 		if (ob2->type == FIRSTPIN) {
-		    ncomp = (ECompare *)HashLookup(ob2->model.class,
-					comptab, OBJHASHSIZE);
+		    ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
+					ecomp->cell2->file, &compdict);
 		    if (ncomp != NULL) {
 			if (match) {
 			    ncomp->num1 += ncomp->add1;
@@ -1412,14 +1502,151 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 	    }
 	    ecomp->add1 = 0;
 	    ecomp->add2 = 0;
+
+	    /* If the pair was unresolved, and the number of	*/
+	    /* instances is either N:0 or 0:M, add to a list so	*/
+	    /* they can be cross-checked at the end.		*/
+
+	    if ((ecomp->num1 != 0) && (ecomp->num2 == 0)) {
+		ECompList *newcomplist;
+
+		newcomplist = (ECompList *)MALLOC(sizeof(ECompList));
+		newcomplist->ecomp = ecomp;
+		newcomplist->next = listX0;
+		listX0 = newcomplist;
+	    }
+	    else if ((ecomp->num1 == 0) && (ecomp->num2 != 0)) {
+		ECompList *newcomplist;
+
+		newcomplist = (ECompList *)MALLOC(sizeof(ECompList));
+		newcomplist->ecomp = ecomp;
+		newcomplist->next = list0X;
+		list0X = newcomplist;
+	    }
 	}
-	ecomp = (ECompare *)HashNext(comptab, OBJHASHSIZE);
-    } 
+
+	/* Case 2:  Cell2 class is a subcircuit, and flattening	*/
+	/* (it without regard to cell1) improves the matching.	*/
+
+	else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell2 != NULL) &&
+			(ecomp->cell2->class == CLASS_SUBCKT)) {
+	    ecomp->add2 = -ecomp->num2;
+	    match = 1;
+	    for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
+		if (ob2->type == FIRSTPIN) {
+	   	    ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
+				ecomp->cell2->file, &compdict);
+		    if (ncomp != NULL) {
+			if ((ncomp->num1 > ncomp->num2) &&
+				((ncomp->add2 + ecomp->num2) <=
+				ncomp->num1)) {
+			    ncomp->add2 += ecomp->num2;
+			}
+			else {
+			   match = 0;
+			   break;
+			}
+		    }
+		    else {
+		       match = 0;
+		       break;
+		    }
+		}
+	    }
+	    if (match) {
+		if (ecomp->cell2) {
+		    Fprintf(stdout, "Flattening instances of %s in cell %s"
+				" makes a better match\n", ecomp->cell2->name,
+				name2);
+		    flattenInstancesOf(name2, file2, ecomp->cell2->name); 
+		}
+		modified++;
+	    }
+
+	    /* Reset or apply the count adjustments */
+	    if (ecomp->cell2)
+	    for (ob2 = ecomp->cell2->cell; ob2; ob2 = ob2->next) {
+		if (ob2->type == FIRSTPIN) {
+		    ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
+					ecomp->cell2->file, &compdict);
+		    if (ncomp != NULL) {
+			if (match) {
+			    ncomp->num2 += ncomp->add2;
+			}
+			ncomp->add2 = 0;
+		    }
+		}
+	    }
+	    if (match) {
+		ecomp->num2 = 0;
+	    }
+	    ecomp->add2 = 0;
+	}
+	
+	/* Case 3:  Cell1 class is a subcircuit, and flattening	*/
+	/* (it without regard to cell1) improves the matching.	*/
+
+	else if ((ecomp->num1 != ecomp->num2) && (ecomp->cell1 != NULL) &&
+			(ecomp->cell1->class == CLASS_SUBCKT)) {
+	    ecomp->add1 = -ecomp->num1;
+	    match = 1;
+	    for (ob2 = ecomp->cell1->cell; ob2; ob2 = ob2->next) {
+		if (ob2->type == FIRSTPIN) {
+	   	    ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
+				ecomp->cell1->file, &compdict);
+		    if (ncomp != NULL) {
+			if ((ncomp->num2 > ncomp->num1) &&
+				((ncomp->add1 + ecomp->num1) <=
+				ncomp->num2)) {
+			    ncomp->add1 += ecomp->num1;
+			}
+			else {
+			   match = 0;
+			   break;
+			}
+		    }
+		    else {
+		       match = 0;
+		       break;
+		    }
+		}
+	    }
+	    if (match) {
+		if (ecomp->cell1) {
+		    Fprintf(stdout, "Flattening instances of %s in cell %s"
+				" makes a better match\n", ecomp->cell1->name,
+				name1);
+		    flattenInstancesOf(name1, file1, ecomp->cell1->name); 
+		}
+		modified++;
+	    }
+
+	    /* Reset or apply the count adjustments */
+	    if (ecomp->cell1)
+	    for (ob2 = ecomp->cell1->cell; ob2; ob2 = ob2->next) {
+		if (ob2->type == FIRSTPIN) {
+		    ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
+					ecomp->cell1->file, &compdict);
+		    if (ncomp != NULL) {
+			if (match) {
+			    ncomp->num1 += ncomp->add1;
+			}
+			ncomp->add1 = 0;
+		    }
+		}
+	    }
+	    if (match) {
+		ecomp->num1 = 0;
+	    }
+	    ecomp->add1 = 0;
+	}
+	ecomp = (ECompare *)HashNext(&compdict);
+    }
 
     // Remove non-matching zero-value devices.  This can
     // be done on a per-instance basis.
 
-    ecomp = (ECompare *)HashFirst(comptab, OBJHASHSIZE);
+    ecomp = (ECompare *)HashFirst(&compdict);
     while (ecomp != NULL) {
 	if ((ecomp->num1 != ecomp->num2) && (ecomp->cell1 != NULL) &&
 			(ecomp->cell1->class == CLASS_RES)) {
@@ -1466,6 +1693,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 					if (found) break;
 				    }
 				    if (found) {
+					Fprintf(stdout, "Removing zero-valued device"
+						"%s from cell %s makes a better match\n",
+						tsub1->name,
+						tc1->name);
+
 					/* merge node of endpoints */
 					for (ob2 = tc1->cell; ob2; ob2 = ob2->next) {
 					    if (ob2->node == node2)
@@ -1565,6 +1797,11 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 					if (found) break;
 				    }
 				    if (found) {
+					Fprintf(stdout, "Removing zero-valued device"
+						"%s from cell %s makes a better match\n",
+						tsub2->name,
+						tc2->name);
+
 					/* merge node of endpoints */
 					for (ob1 = tc2->cell; ob1; ob1 = ob1->next) {
 					    if (ob1->node == node2)
@@ -1616,19 +1853,102 @@ PrematchLists(char *name1, int file1, char *name2, int file2)
 		}
 	    }
 	}
+	ecomp = (ECompare *)HashNext(&compdict);
+    }
 
-	ecomp = (ECompare *)HashNext(comptab, OBJHASHSIZE);
+    // Finally, check all entries in listX0 vs. all entries in list0X to see
+    // if flattening one side will improve the matching.  Ignore entries
+    // that are duplicates (already matched).  Also do this only if there
+    // are no other modifications, as this rule is relaxed compared to other
+    // rules, and the other rules should be exhaustively applied first.
+
+    if ((listX0 != NULL) && (list0X != NULL) && (modified == 0)) {
+	ECompare *ecomp0X, *ecompX0;
+	ECompList *elist0X, *elistX0;
+	for (elistX0 = listX0; elistX0; elistX0 = elistX0->next) {
+	    ecompX0 = elistX0->ecomp;
+
+	    for (elist0X = list0X; elist0X; elist0X = elist0X->next) {
+		ecomp0X = elist0X->ecomp;
+
+		// Check that this has not already been processed and flattened
+		if (ecompX0->num1 > 0 && ecomp0X->num2 > 0) {
+
+		    // Are any components of ecompX0->cell1 in the ecomp0X list?
+
+		    for (ob1 = ecompX0->cell1->cell; ob1; ob1 = ob1->next) {
+			if (ob1->type == FIRSTPIN) {
+			    char *dstr = NULL;
+			    tc1 = LookupCellFile(ob1->model.class, ecompX0->cell1->file);
+			    if (tc1->flags & CELL_DUPLICATE) {
+				dstr = strstr(ob1->model.class, "[[");
+				if (dstr) *dstr = '\0';
+			    }
+		   	    ncomp = (ECompare *)HashInt2Lookup(ob1->model.class,
+					ecompX0->cell1->file, &compdict);
+			    if (dstr) *dstr = '[';
+			    if ((ncomp == ecomp0X) && (ecomp0X->num2 <= ecompX0->num1)) {
+				Fprintf(stdout, "Flattening instances of %s in cell %s"
+					" makes a better match\n", ecompX0->cell1->name,
+					name1);
+				flattenInstancesOf(name1, file1, ecompX0->cell1->name); 
+			        ecompX0->num1 = 0;
+			        ecomp0X->num1 += ecompX0->num1;
+				modified++;
+				break;
+			    }
+			}
+		    }
+
+		    // Are any components of ecomp0X->cell2 in the ecompX0 list?
+
+		    for (ob2 = ecomp0X->cell2->cell; ob2; ob2 = ob2->next) {
+			if (ob2->type == FIRSTPIN) {
+			    char *dstr = NULL;
+			    tc2 = LookupCellFile(ob2->model.class, ecomp0X->cell2->file);
+			    if (tc2->flags & CELL_DUPLICATE) {
+				dstr = strstr(ob1->model.class, "[[");
+				if (dstr) *dstr = '\0';
+			    }
+		   	    ncomp = (ECompare *)HashInt2Lookup(ob2->model.class,
+					ecomp0X->cell2->file, &compdict);
+			    if (dstr) *dstr = '[';
+			    if ((ncomp == ecompX0) && (ecompX0->num1 <= ecomp0X->num2)) {
+				Fprintf(stdout, "Flattening instances of %s in cell %s"
+					" makes a better match\n", ecomp0X->cell2->name,
+					name2);
+				flattenInstancesOf(name2, file2, ecomp0X->cell2->name); 
+			        ecomp0X->num2 = 0;
+			        ecompX0->num2 += ecomp0X->num2;
+				modified++;
+				break;
+			    }
+			}
+		    }
+		}
+	    }
+	}
     }
 
     // Free the hash table and its contents.
 
-    ecomp = (ECompare *)HashFirst(comptab, OBJHASHSIZE);
+    ecomp = (ECompare *)HashFirst(&compdict);
     while (ecomp != NULL) {
 	if (--ecomp->refcount == (char)0) FREE(ecomp);
-	ecomp = (ECompare *)HashNext(comptab, OBJHASHSIZE);
+	ecomp = (ECompare *)HashNext(&compdict);
     } 
-    HashKill(comptab, OBJHASHSIZE);
-    FREE(comptab);
+    HashKill(&compdict);
 
+    // Free the 0:X and X:0 lists
+    while (listX0 != NULL) {
+	ECompList *nextptr = listX0->next;
+	FREE(listX0);
+	listX0 = nextptr;
+    }
+    while (list0X != NULL) {
+	ECompList *nextptr = list0X->next;
+	FREE(list0X);
+	list0X = nextptr;
+    }
     return modified;
 }

base/hash.c

@@ -33,22 +33,25 @@ unsigned long (*hashfunc)(char *, int) = NULL;
 int (*matchfunc)(char *, char *) = NULL;
 int (*matchintfunc)(char *, char *, int, int) = NULL;
 
-void InitializeHashTable(struct hashlist **tab, int size)
+void InitializeHashTable(struct hashdict *dict, int size)
 {
-	int i;
-	for (i = 0; i < size; i++) tab[i] = NULL;
+    struct hashlist **hashtab;
+
+    dict->hashtab = (struct hashlist **)CALLOC(size, sizeof(struct hashlist *));
+    dict->hashsize = size;
+    dict->hashfirstindex = 0;
+    dict->hashfirstptr = NULL;
 }
 
-int RecurseHashTable(struct hashlist **hashtab, int hashsize,
-	int (*func)(struct hashlist *elem))
+int RecurseHashTable(struct hashdict *dict, int (*func)(struct hashlist *elem))
 /* returns the sum of the return values of (*func) */
 {
 	int i, sum;
 	struct hashlist *p;
 	
 	sum = 0;
-	for (i = 0; i < hashsize; i++)
-		for (p = hashtab[i]; p != NULL; p = p->next) 
+	for (i = 0; i < dict->hashsize; i++)
+		for (p = dict->hashtab[i]; p != NULL; p = p->next) 
 			sum += (*func)(p);
 	return(sum);
 }
@@ -57,15 +60,15 @@ int RecurseHashTable(struct hashlist **hashtab, int hashsize,
  * type int value to the function.
  */
 
-int RecurseHashTableValue(struct hashlist **hashtab, int hashsize,
+int RecurseHashTableValue(struct hashdict *dict,
 	int (*func)(struct hashlist *elem, int), int value)
 {
 	int i, sum;
 	struct hashlist *p;
 	
 	sum = 0;
-	for (i = 0; i < hashsize; i++)
-		for (p = hashtab[i]; p != NULL; p = p->next) 
+	for (i = 0; i < dict->hashsize; i++)
+		for (p = dict->hashtab[i]; p != NULL; p = p->next) 
 			sum += (*func)(p, value);
 	return(sum);
 }
@@ -76,7 +79,7 @@ int RecurseHashTableValue(struct hashlist **hashtab, int hashsize,
  * function through that structure.
  */
 
-struct nlist *RecurseHashTablePointer(struct hashlist **hashtab, int hashsize,
+struct nlist *RecurseHashTablePointer(struct hashdict *dict,
 	struct nlist *(*func)(struct hashlist *elem, void *),
 	void *pointer)
 {
@@ -84,8 +87,8 @@ struct nlist *RecurseHashTablePointer(struct hashlist **hashtab, int hashsize,
     struct hashlist *p;
     struct nlist *tp;
  
-    for (i = 0; i < hashsize; i++) {
-	for (p = hashtab[i]; p != NULL; p = p->next) {
+    for (i = 0; i < dict->hashsize; i++) {
+	for (p = dict->hashtab[i]; p != NULL; p = p->next) {
 	    tp = (*func)(p, pointer);
 	    if (tp != NULL) return tp;
 	}
@@ -150,19 +153,28 @@ unsigned long hash(char *s, int hashsize)
 	return (hashsize == 0) ? hashval : (hashval % hashsize);
 }
 
+unsigned long genhash(char *s, int c, int hashsize)
+{
+	unsigned long hashval;
+	
+	for (hashval = (unsigned long)c; *s != '\0'; )
+	    hashval = (*s++) + (hashval << 6) + (hashval << 16) - hashval;
+	return (hashsize == 0) ? hashval : (hashval % hashsize);
+}
+
 /*----------------------------------------------------------------------*/
 /* HashLookup --							*/
 /* return the 'ptr' field of the hash table entry, or NULL if not found */
 /*----------------------------------------------------------------------*/
 
-void *HashLookup(char *s, struct hashlist **hashtab, int hashsize)
+void *HashLookup(char *s, struct hashdict *dict)
 {
   struct hashlist *np;
   unsigned long hashval;
 	
-  hashval = (*hashfunc)(s, hashsize);
+  hashval = (*hashfunc)(s, dict->hashsize);
 	
-  for (np = hashtab[hashval]; np != NULL; np = np->next)
+  for (np = dict->hashtab[hashval]; np != NULL; np = np->next)
     if ((*matchfunc)(s, np->name)) return (np->ptr);	/* correct match */
   return (NULL); /* not found */
 }
@@ -174,14 +186,14 @@ void *HashLookup(char *s, struct hashlist **hashtab, int hashsize)
 /* passed integer value i						*/
 /*----------------------------------------------------------------------*/
 
-void *HashIntLookup(char *s, int i, struct hashlist **hashtab, int hashsize)
+void *HashIntLookup(char *s, int i, struct hashdict *dict)
 {
   struct hashlist *np;
   unsigned long hashval;
 	
-  hashval = (*hashfunc)(s, hashsize);
+  hashval = (*hashfunc)(s, dict->hashsize);
 
-  for (np = hashtab[hashval]; np != NULL; np = np->next) {
+  for (np = dict->hashtab[hashval]; np != NULL; np = np->next) {
     if (np->ptr == NULL) {
        if ((*matchintfunc)(s, np->name, i, -1))
 	  return NULL;
@@ -195,17 +207,37 @@ void *HashIntLookup(char *s, int i, struct hashlist **hashtab, int hashsize)
 }
 
 /*----------------------------------------------------------------------*/
-/* return the hashlist entry, after (re)initializing its 'ptr' field */
+/* Similar to HashIntLookup, but HashInt2Lookup adds the integer c as	*/
+/* part of the hash, using a special hash function to hash the char	*/
+/* first, then the character string.					*/
 /*----------------------------------------------------------------------*/
 
-struct hashlist *HashPtrInstall(char *name, void *ptr, 
-				struct hashlist **hashtab, int hashsize)
+void *HashInt2Lookup(char *s, int c, struct hashdict *dict)
 {
   struct hashlist *np;
   unsigned long hashval;
 	
-  hashval = (*hashfunc)(name,hashsize);
-  for (np = hashtab[hashval]; np != NULL; np = np->next)
+  hashval = genhash(s, c, dict->hashsize);
+	
+  for (np = dict->hashtab[hashval]; np != NULL; np = np->next)
+    if (!strcmp(s, np->name))
+      return (np->ptr);	/* correct match */
+
+  return (NULL); /* not found */
+}
+
+
+/*----------------------------------------------------------------------*/
+/* return the hashlist entry, after (re)initializing its 'ptr' field */
+/*----------------------------------------------------------------------*/
+
+struct hashlist *HashPtrInstall(char *name, void *ptr, struct hashdict *dict)
+{
+  struct hashlist *np;
+  unsigned long hashval;
+	
+  hashval = (*hashfunc)(name, dict->hashsize);
+  for (np =  dict->hashtab[hashval]; np != NULL; np = np->next)
     if ((*matchfunc)(name, np->name)) {
       np->ptr = ptr;
       return (np);		/* match found in hash table */
@@ -216,8 +248,8 @@ struct hashlist *HashPtrInstall(char *name, void *ptr,
     return (NULL);
   if ((np->name = strsave(name)) == NULL) return (NULL);
   np->ptr = ptr;
-  np->next = hashtab[hashval];
-  return(hashtab[hashval] = np);
+  np->next =  dict->hashtab[hashval];
+  return(dict->hashtab[hashval] = np);
 }
 
 /*----------------------------------------------------------------------*/
@@ -226,13 +258,13 @@ struct hashlist *HashPtrInstall(char *name, void *ptr,
 /*----------------------------------------------------------------------*/
 
 struct hashlist *HashIntPtrInstall(char *name, int value, void *ptr,
-			struct hashlist **hashtab, int hashsize)
+			struct hashdict *dict)
 {
   struct hashlist *np;
   unsigned long hashval;
 	
-  hashval = (*hashfunc)(name,hashsize);
-  for (np = hashtab[hashval]; np != NULL; np = np->next)
+  hashval = (*hashfunc)(name, dict->hashsize);
+  for (np =  dict->hashtab[hashval]; np != NULL; np = np->next)
     if ((*matchintfunc)(name, np->name, value, (int)(*((int *)np->ptr)))) {
       np->ptr = ptr;
       return (np);		/* match found in hash table */
@@ -243,27 +275,57 @@ struct hashlist *HashIntPtrInstall(char *name, int value, void *ptr,
     return (NULL);
   if ((np->name = strsave(name)) == NULL) return (NULL);
   np->ptr = ptr;
-  np->next = hashtab[hashval];
-  return(hashtab[hashval] = np);
+  np->next = dict->hashtab[hashval];
+  return(dict->hashtab[hashval] = np);
+}
+
+/*----------------------------------------------------------------------*/
+/* And the following is used with HashInt2.			*/
+/*----------------------------------------------------------------------*/
+
+struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr,
+			struct hashdict *dict)
+{
+  struct hashlist *np;
+  unsigned long hashval;
+	
+  hashval = genhash(name, c, dict->hashsize);
+  for (np = dict->hashtab[hashval]; np != NULL; np = np->next)
+    if (!strcmp(name, np->name)) {
+      np->ptr = ptr;
+      return (np);		/* match found in hash table */
+    }
+
+  /* not in table, so install it */
+  if ((np = (struct hashlist *) CALLOC(1,sizeof(struct hashlist))) == NULL)
+    return (NULL);
+  if ((np->name = strsave(name)) == NULL) return (NULL);
+  np->ptr = ptr;
+  np->next = dict->hashtab[hashval];
+  return(dict->hashtab[hashval] = np);
 }
 
 /*----------------------------------------------------------------------*/
 /* destroy a hash table, freeing associated memory 			*/
 /*----------------------------------------------------------------------*/
 
-void *HashKill(struct hashlist **hashtab, int hashsize)
+void *HashKill(struct hashdict *dict)
 {
   struct hashlist *np, *p;
   int i;
 
-  for (i = 0; i < hashsize; i++) {
-    for (p = hashtab[i]; p != NULL; ) {
+  if (dict->hashtab == NULL) return;	// Hash not initialized
+
+  for (i = 0; i < dict->hashsize; i++) {
+    for (p = dict->hashtab[i]; p != NULL; ) {
       np = p->next;
       FREE(p->name);
       FREE(p);
       p = np;
     }
   }
+  FREE(dict->hashtab);
+  dict->hashtab = NULL;
 }
 
 /*----------------------------------------------------------------------*/
@@ -271,14 +333,13 @@ void *HashKill(struct hashlist **hashtab, int hashsize)
 /* to the new hash entry.						*/
 /*----------------------------------------------------------------------*/
 
-struct hashlist *HashInstall(char *name, 
-			     struct hashlist **hashtab, int hashsize)
+struct hashlist *HashInstall(char *name, struct hashdict *dict)
 {
   struct hashlist *np;
   unsigned long hashval;
 	
-  hashval = (*hashfunc)(name,hashsize);
-  for (np = hashtab[hashval]; np != NULL; np = np->next)
+  hashval = (*hashfunc)(name, dict->hashsize);
+  for (np = dict->hashtab[hashval]; np != NULL; np = np->next)
     if ((*matchfunc)(name, np->name)) return (np); /* match found in hash table */
 
   /* not in table, so install it */
@@ -286,27 +347,27 @@ struct hashlist *HashInstall(char *name,
     return (NULL);
   if ((np->name = strsave(name)) == NULL) return (NULL);
   np->ptr = NULL;
-  np->next = hashtab[hashval];
-  return(hashtab[hashval] = np);
+  np->next = dict->hashtab[hashval];
+  return(dict->hashtab[hashval] = np);
 }
 
 /*----------------------------------------------------------------------*/
 /* frees a hash table entry, (but not the 'ptr' field) 			*/
 /*----------------------------------------------------------------------*/
 
-void HashDelete(char *name, struct hashlist **hashtab, int hashsize)
+void HashDelete(char *name, struct hashdict *dict)
 {
   unsigned long hashval;
   struct hashlist *np;
   struct hashlist *np2;
   
-  hashval = (*hashfunc)(name, hashsize);
-  np = hashtab[hashval];
+  hashval = (*hashfunc)(name, dict->hashsize);
+  np = dict->hashtab[hashval];
   if (np == NULL) return;
 
   if ((*matchfunc)(name, np->name)) {
     /* it is the first element in the list */
-    hashtab[hashval] = np->next;
+    dict->hashtab[hashval] = np->next;
     FREE(np->name);
     FREE(np);
     return;
@@ -329,19 +390,19 @@ void HashDelete(char *name, struct hashlist **hashtab, int hashsize)
 /* HashDelete with additional integer value matching			*/
 /*----------------------------------------------------------------------*/
 
-void HashIntDelete(char *name, int value, struct hashlist **hashtab, int hashsize)
+void HashIntDelete(char *name, int value, struct hashdict *dict)
 {
   unsigned long hashval;
   struct hashlist *np;
   struct hashlist *np2;
   
-  hashval = (*hashfunc)(name, hashsize);
-  np = hashtab[hashval];
+  hashval = (*hashfunc)(name, dict->hashsize);
+  np = dict->hashtab[hashval];
   if (np == NULL) return;
 
   if ((*matchintfunc)(name, np->name, value, (int)(*((int *)np->ptr)))) {
     /* it is the first element in the list */
-    hashtab[hashval] = np->next;
+    dict->hashtab[hashval] = np->next;
     FREE(np->name);
     FREE(np);
     return;
@@ -361,33 +422,35 @@ void HashIntDelete(char *name, int value, struct hashlist **hashtab, int hashsiz
   }
 }
 
+/*----------------------------------------------------------------------*/
+/* Hash key iterator							*/
+/* returns 'ptr' field of next element, NULL when done 			*/
 /*----------------------------------------------------------------------*/
 
-static int hashfirstindex; /* was long */
-static struct hashlist *hashfirstptr;
-
-void *HashNext(struct hashlist **hashtab, int hashsize)
-/* returns 'ptr' field of next element, NULL when done */
+void *HashNext(struct hashdict *dict)
 {
-  if (hashfirstptr != NULL && hashfirstptr->next != NULL) {
-    hashfirstptr = hashfirstptr->next;
-    return(hashfirstptr->ptr);
-  }
-  while (hashfirstindex < hashsize) {
-    if ((hashfirstptr = hashtab[hashfirstindex++]) != NULL) {
-      return(hashfirstptr->ptr);
-    }
-  }
-  hashfirstindex = 0;
-  hashfirstptr = NULL;
-  return(NULL);
+   if (dict->hashfirstptr != NULL && dict->hashfirstptr->next != NULL) {
+      dict->hashfirstptr = dict->hashfirstptr->next;
+      return(dict->hashfirstptr->ptr);
+   }
+   while (dict->hashfirstindex < dict->hashsize) {
+      if ((dict->hashfirstptr = dict->hashtab[dict->hashfirstindex++]) != NULL) {
+         return(dict->hashfirstptr->ptr);
+      }
+   }
+
+   dict->hashfirstindex = 0;
+   dict->hashfirstptr = NULL;
+   return(NULL);
 }
 
-void *HashFirst(struct hashlist **hashtab, int hashsize)
+/*----------------------------------------------------------------------*/
+/* Hash key iterator setup						*/
+/*----------------------------------------------------------------------*/
+
+void *HashFirst(struct hashdict *dict)
 {
-  hashfirstindex = 0;
-  hashfirstptr = NULL;
-  return(HashNext(hashtab,hashsize));
+   dict->hashfirstindex = 0;
+   dict->hashfirstptr = NULL;
+   return HashNext(dict);
 }
-
-

base/hash.h

@@ -7,35 +7,44 @@ struct hashlist {
   struct hashlist *next;
 };
 
-extern void InitializeHashTable(struct hashlist **tab, int size);
-extern int RecurseHashTable(struct hashlist **hashtab, int hashsize,
+struct hashdict {
+  int hashsize;
+  int hashfirstindex;
+  struct hashlist *hashfirstptr;
+  struct hashlist **hashtab;
+};
+
+
+extern void InitializeHashTable(struct hashdict *dict, int size);
+extern int RecurseHashTable(struct hashdict *dict,
 	int (*func)(struct hashlist *elem));
-extern int RecurseHashTableValue(struct hashlist **hashtab, int hashsize,
+extern int RecurseHashTableValue(struct hashdict *dict,
 	int (*func)(struct hashlist *elem, int), int);
-extern struct nlist *RecurseHashTablePointer(struct hashlist **hashtab,
-	int hashsize, struct nlist *(*func)(struct hashlist *elem,
-	void *), void *pointer);
+extern struct nlist *RecurseHashTablePointer(struct hashdict *dict,
+	struct nlist *(*func)(struct hashlist *elem, void *),
+	void *pointer);
+extern void HashDelete(char *name, struct hashdict *dict);
+extern void HashIntDelete(char *name, int value, struct hashdict *dict);
 
 
 extern int CountHashTableEntries(struct hashlist *p);
 extern int CountHashTableBinsUsed(struct hashlist *p);
-extern void HashDelete(char *name, struct hashlist **hashtab, int hashsize);
-extern void HashIntDelete(char *name, int value, struct hashlist **hashtab,
-		int hashsize);
 
 /* these functions return a pointer to a hash list element */
-extern struct hashlist *HashInstall(char *name, struct hashlist **hashtab,
-		int hashsize);
+extern struct hashlist *HashInstall(char *name, struct hashdict *dict);
 extern struct hashlist *HashPtrInstall(char *name, void *ptr, 
-		struct hashlist **hashtab, int hashsize);
+		struct hashdict *dict);
 extern struct hashlist *HashIntPtrInstall(char *name, int value, void *ptr, 
-		struct hashlist **hashtab, int hashsize);
+		struct hashdict *dict);
+extern struct hashlist *HashInt2PtrInstall(char *name, int c, void *ptr, 
+		struct hashdict *dict);
 
 /* these functions return the ->ptr field of a struct hashlist */
-extern void *HashLookup(char *s, struct hashlist **hashtab, int hashsize);
-extern void *HashIntLookup(char *s, int i, struct hashlist **hashtab, int hashsize);
-extern void *HashFirst(struct hashlist **hashtab, int hashsize);
-extern void *HashNext(struct hashlist **hashtab, int hashsize);
+extern void *HashLookup(char *s, struct hashdict *dict);
+extern void *HashIntLookup(char *s, int i, struct hashdict *dict);
+extern void *HashInt2Lookup(char *s, int c, struct hashdict *dict);
+extern void *HashFirst(struct hashdict *dict);
+extern void *HashNext(struct hashdict *dict);
 
 extern unsigned long hashnocase(char *s, int hashsize);
 extern unsigned long hash(char *s, int hashsize);

base/netcmp.h

@@ -32,7 +32,7 @@ extern int PermuteForget(char *model, int filenum, char *pin1, char *pin2);
 extern int EquivalenceElements(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceNodes(char *name1, int file1, char *name2, int file2);
 extern int EquivalenceClasses(char *name1, int file1, char *name2, int file2);
-extern int IgnoreClass(char *name, int file);
+extern int IgnoreClass(char *name, int file, unsigned char type);
 extern int MatchPins(struct nlist *tp1, struct nlist *tp2);
 
 extern int  CreateCompareQueue(char *, int, char *, int);

base/netfile.c

@@ -730,7 +730,6 @@ char *readbuf;
 int bytes_in_buffer;
 char *bufptr;
 
-INLINE
 int READ(void *buf, int bytes)
 {
   if (bytes_in_buffer >= bytes) {

base/netgen.h

@@ -37,12 +37,14 @@ extern struct property *PropertyString(char *name, int fnum, char *key,
 extern int  PropertyDelete(char *name, int fnum, char *key);
 extern int  PropertyTolerance(char *name, int fnum, char *key, int ival,
 		double dval);
+extern int  PropertyMerge(char *name, int fnum, char *key, int merge_type);
 extern void ResolveProperties(char *name1, int file1, char *name2, int file2);
 extern void CopyProperties(struct objlist *obj_to, struct objlist *obj_from);
 extern int PromoteProperty(struct property *, struct valuelist *);
+extern int SetPropertyDefault(struct property *, struct valuelist *);
 extern struct objlist *LinkProperties(char *model, struct keyvalue *topptr);
-extern int ReduceExpressions(struct objlist *instprop, struct nlist *parent,
-		int glob);
+extern int ReduceExpressions(struct objlist *instprop, struct objlist *parprops,
+		struct nlist *parent, int glob);
 extern void Node(char *name);
 extern void Global(char *name);
 extern void UniqueGlobal(char *name);
@@ -114,6 +116,8 @@ extern void FlattenCurrent();
 extern void ConvertGlobals(char *name, int fnum);
 extern int  CleanupPins(char *name, int fnum);
 extern void ConnectAllNodes(char *model, int fnum);
+extern void CombineParallel(char *model, int fnum);
+extern void CombineSerial(char *model, int fnum);
 extern int  NoDisconnectedNodes;
 extern int  PropertyKeyMatch(char *, char *);
 extern int  PropertyValueMatch(char *, char *);

base/objlist.c

@@ -251,18 +251,18 @@ void PrintMemoryStats(void)
 
 
 #define CELLHASHSIZE 1000
-static struct hashlist *cell_hashtab[CELLHASHSIZE]; 
+static struct hashdict cell_dict;
 
 void InitCellHashTable(void)
 {
-	hashfunc = hash;
-	matchfunc = match;
-	InitializeHashTable(cell_hashtab, CELLHASHSIZE);
+    hashfunc = hash;
+    matchfunc = match;
+    InitializeHashTable(&cell_dict, CELLHASHSIZE);
 }
 
 struct nlist *LookupCell(char *s)
 {
-  return((struct nlist *)HashLookup(s, cell_hashtab, CELLHASHSIZE));
+    return((struct nlist *)HashLookup(s, &cell_dict));
 }
 
 /* Similar hash lookup to the above, but will check if the matching	*/
@@ -274,7 +274,7 @@ struct nlist *LookupCellFile(char *s, int f)
    struct nlist *he;
 
    if (f == -1) return LookupCell(s);
-   return HashIntLookup(s, f, cell_hashtab, CELLHASHSIZE);
+   return HashIntLookup(s, f, &cell_dict);
 }
 
 struct nlist *InstallInCellHashTable(char *name, int fnum)
@@ -291,34 +291,23 @@ struct nlist *InstallInCellHashTable(char *name, int fnum)
   if (p == NULL) return(NULL);
   if ((p->name = strsave(name)) == NULL) goto fail;
   p->file = fnum;
-  if ((p->objtab = (struct hashlist **)CALLOC(OBJHASHSIZE, 
-	    sizeof(struct hashlist *))) == NULL) goto fail;
-  if ((p->insttab = (struct hashlist **)CALLOC(OBJHASHSIZE, 
-	    sizeof(struct hashlist *))) == NULL) goto fail;
-  if ((p->proptab = (struct hashlist **)CALLOC(OBJHASHSIZE, 
-	    sizeof(struct hashlist *))) == NULL) goto fail;
+  InitializeHashTable(&(p->objdict), OBJHASHSIZE);
+  InitializeHashTable(&(p->instdict), OBJHASHSIZE);
+  InitializeHashTable(&(p->propdict), OBJHASHSIZE);
   p->permutes = NULL;
 
   // Hash size 0 indicates to hash function that no binning is being done
   p->classhash = (*hashfunc)(name, 0);
 
-  ptr = HashIntPtrInstall(name, fnum, p, cell_hashtab, CELLHASHSIZE);
+  ptr = HashIntPtrInstall(name, fnum, p, &cell_dict);
   if (ptr == NULL) return(NULL);
   return(p);
  fail:
   if (p->name != NULL) FREE(p->name);
-  if (p->objtab != NULL) {
-    HashKill(p->objtab, OBJHASHSIZE);
-    FREE(p->objtab);
-  }
-  if (p->insttab != NULL) {
-    HashKill(p->insttab, OBJHASHSIZE);
-    FREE(p->insttab);
-  }
-  if (p->proptab != NULL) {
-    HashKill(p->proptab, OBJHASHSIZE);
-    FREE(p->proptab);
-  }
+  HashKill(&(p->objdict));
+  HashKill(&(p->instdict));
+  RecurseHashTable(&(p->propdict), freeprop);
+  HashKill(&(p->propdict));
   FREE(p);
   return(NULL);
 }
@@ -341,9 +330,9 @@ void CellRehash(char *name, char *newname, int file)
   FREE(tp->name);
   tp->name = strsave(newname);
 
-  ptr = HashIntPtrInstall(newname, file, (void *)tp, cell_hashtab, CELLHASHSIZE);
+  ptr = HashIntPtrInstall(newname, file, (void *)tp, &cell_dict);
   if (ptr != NULL)
-     HashIntDelete(name, file, cell_hashtab, CELLHASHSIZE);
+     HashIntDelete(name, file, &cell_dict);
 
   // Change the classhash to reflect the new name
   tp->classhash = (*hashfunc)(newname, 0);
@@ -351,6 +340,71 @@ void CellRehash(char *name, char *newname, int file)
 
 struct nlist *OldCell;
 
+int removeshorted(struct hashlist *p, int file)
+{
+   struct nlist *ptr;
+   struct objlist *ob, *lob, *nob, *tob;
+   unsigned char shorted;
+
+   ptr = (struct nlist *)(p->ptr);
+
+   if ((file != -1) && (ptr->file != file)) return;
+
+   lob = NULL;
+   for (ob = ptr->cell; ob != NULL;) {
+      nob = ob->next;
+      if ((ob->type == FIRSTPIN) && (ob->model.class != NULL)) {
+	 if ((*matchfunc)(ob->model.class, OldCell->name)) {
+            shorted = (unsigned char)1;
+	    for (tob = nob; tob->type > FIRSTPIN; tob = tob->next) {
+	       if (tob->node != ob->node) {
+	           shorted = (unsigned char)0;
+	           break;
+	       }
+            }
+	    if (shorted == (unsigned char)0) {
+               lob = ob;
+               ob = nob;
+	       continue;
+	    }
+	    HashDelete(ob->instance.name, &(ptr->instdict));
+	    while (1) {
+	       FreeObjectAndHash(ob, ptr);
+	       ob = nob;
+	       if (ob == NULL) break;
+	       nob = ob->next;
+	       if (ob->type != PROPERTY && ob->type <= FIRSTPIN) break;
+	    }
+	    if (lob == NULL)
+	       ptr->cell = ob;
+	    else
+	       lob->next = ob;
+	 }
+	 else {
+	    lob = ob;
+	    ob = nob;
+	 }
+      }
+      else {
+         lob = ob;
+         ob = nob;
+      }
+   }
+}
+
+/* Remove shorted instances of class "class" from the database */
+
+void RemoveShorted(char *class, int file)
+{
+   if (file == -1)
+      OldCell = LookupCell(class);
+   else
+      OldCell = LookupCellFile(class, file);
+
+   if (OldCell == NULL) return;
+   RecurseCellFileHashTable(removeshorted, file);
+}
+
 int deleteclass(struct hashlist *p, int file)
 {
    struct nlist *ptr;
@@ -365,13 +419,13 @@ int deleteclass(struct hashlist *p, int file)
       nob = ob->next;
       if ((ob->type == FIRSTPIN) && (ob->model.class != NULL)) {
 	 if ((*matchfunc)(ob->model.class, OldCell->name)) {
-	    HashDelete(ob->instance.name, ptr->insttab, OBJHASHSIZE);
+	    HashDelete(ob->instance.name, &(ptr->instdict));
 	    while (1) {
 	       FreeObjectAndHash(ob, ptr);
 	       ob = nob;
 	       if (ob == NULL) break;
 	       nob = ob->next;
-	       if (ob->type <= FIRSTPIN) break;
+	       if (ob->type != PROPERTY && ob->type <= FIRSTPIN) break;
 	    }
 	    if (lob == NULL)
 	       ptr->cell = ob;
@@ -482,22 +536,13 @@ void CellDelete(char *name, int fnum)
     return;
   }
 
-  HashIntDelete(name, fnum, cell_hashtab, CELLHASHSIZE);
+  HashIntDelete(name, fnum, &cell_dict);
   /* now make sure that we free all the fields of the nlist struct */
   if (tp->name != NULL) FREE(tp->name);
-  if (tp->objtab != NULL) {
-    HashKill(tp->objtab, OBJHASHSIZE);
-    FREE(tp->objtab);
-  }
-  if (tp->insttab != NULL) {
-    HashKill(tp->insttab, OBJHASHSIZE);
-    FREE(tp->insttab);
-  }
-  if (tp->proptab != NULL) {
-    RecurseHashTable(tp->proptab, OBJHASHSIZE, freeprop);
-    HashKill(tp->proptab, OBJHASHSIZE);
-    FREE(tp->proptab);
-  }
+  HashKill(&(tp->objdict));
+  HashKill(&(tp->instdict));
+  RecurseHashTable(&(tp->propdict), freeprop);
+  HashKill(&(tp->propdict));
   FreeNodeNames(tp);
   ob = tp->cell;
   while (ob != NULL) {
@@ -548,8 +593,8 @@ void PrintCellHashTable(int full, int filenum)
 
   TopFile = filenum;
 
-  bins  = RecurseHashTable(cell_hashtab, CELLHASHSIZE, CountHashTableBinsUsed);
-  total = RecurseHashTable(cell_hashtab, CELLHASHSIZE, CountHashTableEntries);
+  bins  = RecurseHashTable(&cell_dict, CountHashTableBinsUsed);
+  total = RecurseHashTable(&cell_dict, CountHashTableEntries);
   if (full != 2)
      Printf("Hash table: %d of %d bins used; %d cells total (%.2f per bin)\n",
 		bins, CELLHASHSIZE, total, (bins == 0) ? 0 :
@@ -557,7 +602,7 @@ void PrintCellHashTable(int full, int filenum)
 	
   OldDebug = Debug;
   Debug = full;
-  RecurseHashTable(cell_hashtab, CELLHASHSIZE, PrintCellHashTableElement);
+  RecurseHashTable(&cell_dict, PrintCellHashTableElement);
   Debug = OldDebug;
 #ifndef TCL_NETGEN
   if (full == 2) Printf("\n");
@@ -566,12 +611,12 @@ void PrintCellHashTable(int full, int filenum)
 
 struct nlist *FirstCell(void)
 {
-  return((struct nlist *)HashFirst(cell_hashtab, CELLHASHSIZE));
+  return((struct nlist *)HashFirst(&cell_dict));
 }
 
 struct nlist *NextCell(void)
 {
-  return((struct nlist *)HashNext(cell_hashtab, CELLHASHSIZE));
+  return((struct nlist *)HashNext(&cell_dict));
 }
 
 static int ClearDumpedElement(struct hashlist *np)
@@ -585,17 +630,17 @@ static int ClearDumpedElement(struct hashlist *np)
 
 void ClearDumpedList(void)
 {
-	RecurseHashTable(cell_hashtab, CELLHASHSIZE, ClearDumpedElement);
+	RecurseHashTable(&cell_dict, ClearDumpedElement);
 }
 
 int RecurseCellHashTable(int (*foo)(struct hashlist *np))
 {
-  return RecurseHashTable(cell_hashtab, CELLHASHSIZE, foo);
+  return RecurseHashTable(&cell_dict, foo);
 }
 
 int RecurseCellFileHashTable(int (*foo)(struct hashlist *, int), int value)
 {
-  return RecurseHashTableValue(cell_hashtab, CELLHASHSIZE, foo, value);
+  return RecurseHashTableValue(&cell_dict, foo, value);
 }
 
 /* Yet another version, passing one parameter that is a pointer */
@@ -603,7 +648,7 @@ int RecurseCellFileHashTable(int (*foo)(struct hashlist *, int), int value)
 struct nlist *RecurseCellHashTable2(struct nlist *(*foo)(struct hashlist *,
 	void *), void *pointer)
 {
-  return RecurseHashTablePointer(cell_hashtab, CELLHASHSIZE, foo, pointer);
+  return RecurseHashTablePointer(&cell_dict, foo, pointer);
 }
 
 /************************** WILD-CARD STUFF *******************************/
@@ -863,7 +908,7 @@ int ListLength(char *list_template)
 
 
 
-struct objlist *CopyObjList(struct objlist *oldlist)
+struct objlist *CopyObjList(struct objlist *oldlist, unsigned char doforall)
 /* copies list pointed to by oldlist, creating
    a list whose head pointer is returned */
 {
@@ -900,6 +945,13 @@ struct objlist *CopyObjList(struct objlist *oldlist)
       tail->next = newob;
     tail = newob;
     tmp = tmp->next;
+
+    // If "doforall" is 0, then only copy one object;  otherwise,
+    // copy to the end of the list.
+    if (!doforall) {
+      if ((tmp == NULL) || ((tmp->type <= FIRSTPIN) && (tmp->type != PROPERTY)))
+	 break;
+    }
   }
   return (head);
 }
@@ -914,13 +966,13 @@ struct objlist *CopyObjList(struct objlist *oldlist)
 
 struct objlist *LookupObject(char *name, struct nlist *WhichCell)
 {
-   return((struct objlist *)HashLookup(name, WhichCell->objtab, OBJHASHSIZE));
+   return((struct objlist *)HashLookup(name, &(WhichCell->objdict)));
 }
 
 struct objlist *LookupInstance(char *name, struct nlist *WhichCell)
 /* searches for exact match of instance 'name' in cell 'WhichCell' */
 {
-   return((struct objlist *)HashLookup(name, WhichCell->insttab, OBJHASHSIZE));
+   return((struct objlist *)HashLookup(name, &(WhichCell->instdict)));
 }
 
 
@@ -939,7 +991,7 @@ void AddToCurrentCell(struct objlist *ob)
 
    /* add to object hash table for this cell */
    if (CurrentCell != NULL) {
-      HashPtrInstall(ob->name, ob, CurrentCell->objtab, OBJHASHSIZE);
+      HashPtrInstall(ob->name, ob, &(CurrentCell->objdict));
    }
 }
 
@@ -966,13 +1018,13 @@ void AddToCurrentCellNoHash(struct objlist *ob)
 void AddInstanceToCurrentCell(struct objlist *ob)
 {
   /* add to instance hash table for this cell */
-  HashPtrInstall(ob->instance.name, ob, CurrentCell->insttab, OBJHASHSIZE);
+  HashPtrInstall(ob->instance.name, ob, &(CurrentCell->instdict));
 }
 
 void FreeObject(struct objlist *ob)
 {
   /* This just frees the object record.  Beware of pointer left	*/
-  /* in the objtab hash table.  Hash table records should be	*/
+  /* in the objlist hash table.  Hash table records should be	*/
   /* removed first.						*/
 
   if (ob->name != NULL) FreeString(ob->name);
@@ -1013,7 +1065,7 @@ void FreeObject(struct objlist *ob)
 
 void FreeObjectAndHash(struct objlist *ob, struct nlist *ptr)
 {
-   HashDelete(ob->name, ptr->objtab, OBJHASHSIZE);
+   HashDelete(ob->name, &(ptr->objdict));
    FreeObject(ob);
 }
 

base/objlist.h

@@ -3,6 +3,10 @@
 #ifndef _OBJLIST_H
 #define _OBJLIST_H
 
+#ifndef _HASH_H
+#include "hash.h"
+#endif
+
 #define SEPARATOR "/"
 #define INSTANCE_DELIMITER "#"
 #define PORT_DELIMITER "."
@@ -99,10 +103,22 @@ struct valuelist {
 
 /* Part 3:  Keys & Defaults (kept in the cell record as a hash table) */
 
+#define MERGE_NONE	0	/* Property does not change when devices merge */
+#define MERGE_ADD	1	/* Properties sum with device merge */
+#define MERGE_ADD_CRIT	2	/* Properties sum with device merge */
+#define MERGE_PAR	3	/* Properties add in parallel with device merge */
+#define MERGE_PAR_CRIT	4	/* Properties add in parallel with device merge */
+
+/* Note:  A "critical" merge means that the property causes the number of	*/
+/* devices to change.  e.g., transistor width is critical;  transistor drain	*/
+/* area sums when devices are merged, but does not change the number of devices.*/
+/* More than one property can be critical.  e.g., width and number of fingers.	*/
+
 struct property {
   char *key;			/* name of the property */
   unsigned char idx;		/* index into valuelist */
   unsigned char type;		/* string, integer, double, value, expression */
+  unsigned char merge;		/* how property changes when devices are merged */
   union {
      char *string;
      double dval;
@@ -143,9 +159,16 @@ extern struct objlist *LastPlaced;
 struct IgnoreList {
     char *class;
     int file;
+    unsigned char type;
     struct IgnoreList *next;
 };
 
+/* Types used by IgnoreList above */
+
+#define IGNORE_NONE	(unsigned char)0
+#define IGNORE_CLASS	(unsigned char)1
+#define IGNORE_SHORTED	(unsigned char)2
+
 /* Record structure for handling pin permutations in a cell	*/
 /* Linked list structure allows multiple permutations per cell.	*/
 
@@ -172,9 +195,9 @@ struct nlist {
   unsigned long classhash;	/* randomized hash value for cell class */
   struct Permutation *permutes;	/* list of permuting pins */
   struct objlist *cell;
-  struct hashlist **objtab;  /* hash table of object names */
-  struct hashlist **insttab; /* hash table of instance names */
-  struct hashlist **proptab; /* hash table of property keys */
+  struct hashdict objdict;  /* hash table of object names */
+  struct hashdict instdict; /* hash table of instance names */
+  struct hashdict propdict; /* hash table of property keys */
   struct objlist **nodename_cache;
   long nodename_cache_maxnodenum;  /* largest node number in cache */
   void *embedding;   /* this will be cast to the appropriate data structure */
@@ -188,6 +211,7 @@ struct nlist {
 #define CELL_TOP		0x04	/* cell is a top-level cell */
 #define CELL_PLACEHOLDER	0x08	/* cell is a placeholder cell */
 #define CELL_PROPSMATCHED	0x10	/* properties matched to matching cell */
+#define CELL_DUPLICATE		0x20	/* cell has a duplicate */
 
 /* Flags for combination allowances */
 
@@ -215,7 +239,7 @@ extern int ListLength(char *list_template);
 extern struct nlist *LookupPrematchedClass(struct nlist *, int);
 extern struct objlist *LookupObject(char *name, struct nlist *WhichCell);
 extern struct objlist *LookupInstance(char *name, struct nlist *WhichCell);
-extern struct objlist *CopyObjList(struct objlist *oldlist);
+extern struct objlist *CopyObjList(struct objlist *oldlist, unsigned char doforall);
 extern void UpdateNodeNumbers(struct objlist *lst, int from, int to);
 
 /* Function pointer to List or ListExact, allowing regular expressions	*/

base/place.c

@@ -315,7 +315,6 @@ void PrintE(FILE *outfile, int E)
 
 
 #if 0
-INLINE
 int UsedLeaves(int E1, int E2)
 /* returns the number of leaves in E1 + E2, which are assumed independent */
 {
@@ -327,7 +326,6 @@ int UsedLeaves(int E1, int E2)
 #endif
 
 
-INLINE
 int CommonNodes(int E1, int E2, int IncludeGlobals)
 /* returns the number of nodes that E1 and E2 share */
 /* if IncludeGlobals == 0, do not count large connectivity nodes */
@@ -350,7 +348,6 @@ int CommonNodes(int E1, int E2, int IncludeGlobals)
   return(result);
 }
 
-INLINE
 int GlobalNodes(int E)
 /* return the number of global nodes that E contacts */
 /* for now, global nodes are just cell ports */

base/query.c

@@ -345,7 +345,7 @@ void ElementNodes(char *cell, char *element, int fnum)
   struct nlist *np;
   struct objlist *ob, *nob, *nob2;
   int ckto;
-  char *elementname;
+  char *elementname, *obname;
 
   if ((fnum == -1) && (Circuit1 != NULL) && (Circuit2 != NULL)) {
       ElementNodes(cell, element, Circuit1->file);
@@ -368,8 +368,10 @@ void ElementNodes(char *cell, char *element, int fnum)
 
   ckto = strlen(elementname);
   for (ob = np->cell; ob != NULL; ob = ob->next) {
-    if (!strncmp(elementname, ob->name, ckto))
-       if (*(ob->name + ckto) == '/' || *(ob->name + ckto) == '\0')
+    obname = ob->name;
+    if (*obname == '/') obname++;
+    if (!strncmp(elementname, obname, ckto))
+       if (*(obname + ckto) == '/' || *(obname + ckto) == '\0')
 	  break;
   }
   if (ob == NULL) {
@@ -379,13 +381,15 @@ void ElementNodes(char *cell, char *element, int fnum)
 
   Printf("Device '%s' Pins:\n", elementname);
   for (; ob != NULL; ob = ob->next) {
-    if (!strncmp(elementname, ob->name, ckto)) {
-       if (*(ob->name + ckto) != '/' && *(ob->name + ckto) != '\0')
+    obname = ob->name;
+    if (*obname == '/') obname++;
+    if (!strncmp(elementname, obname, ckto)) {
+       if (*(obname + ckto) != '/' && *(obname + ckto) != '\0')
 	  continue;
 
        Printf("   ");
        PrintObjectType(ob->type);
-       Printf(" (%s)", ob->name + ckto + 1);
+       Printf(" (%s)", obname + ckto + 1);
        for (nob = np->cell; nob != NULL; nob = nob->next) {
 	 if (nob->node == ob->node) {
 	    if (nob->type == NODE) {
@@ -797,8 +801,9 @@ void DescribeInstance(char *name, int file)
   {
     if (ob->node > nodemax) nodemax = ob->node;
     else if ((ob->node == -1) && (ob->model.port != PROXY)) {
+      if (disconnectednodes == 0) Fprintf(stderr, "\n");
       disconnectednodes++;
-      Fprintf(stderr, "  disconnected node: %s\n", ob->name);
+      Fprintf(stderr, "Cell %s disconnected node: %s\n", tp->name, ob->name);
     }
   }
   instlist = (unsigned char *) CALLOC((nodemax + 1), sizeof(unsigned char));
@@ -948,6 +953,7 @@ void Query(void)
   char repstr2[100];
   float StartTime;   /* for elapsed CPU times */
   int Timing;  /* if true, print times of each command */
+  int filenum = -1;
 	
   if (!SuppressPrompts)
     Printf("Netgen %s.%s: %s, %s, %s\n", NETGEN_VERSION, NETGEN_REVISION,
@@ -961,8 +967,8 @@ void Query(void)
     if (Timing) StartTime = CPUTime();
     reply = repstr[0];
     switch (reply) {
-    case 'h' : PrintCellHashTable(0, -1); break;
-    case 'H' : PrintCellHashTable(1, -1); break;
+    case 'h' : PrintCellHashTable(0, filenum); break;
+    case 'H' : PrintCellHashTable(1, filenum); break;
     case 'N' :
       promptstring("Enter circuit name: ", repstr);
       PrintNodes(repstr, -1);
@@ -983,15 +989,15 @@ void Query(void)
       break;
     case 'c' : 
       promptstring("Enter circuit name: ", repstr);
-      PrintCell(repstr);
+      PrintCell(repstr, filenum);
       break;
     case 'i' :
       promptstring("Enter circuit name: ", repstr);
-      PrintInstances(repstr, -1);
+      PrintInstances(repstr, filenum);
       break;
     case 'd':
       promptstring("Enter circuit name: ", repstr);
-      DescribeInstance(repstr, -1);
+      DescribeInstance(repstr, filenum);
       break;
 /* output file formats */
     case 'k' : 
@@ -1000,11 +1006,11 @@ void Query(void)
       break;
     case 'x' : 
       promptstring("Write EXT: Enter circuit name: ", repstr);
-      Ext(repstr);
+      Ext(repstr, filenum);
       break;
     case 'z' : 
       promptstring("Write SIM: Enter circuit name: ", repstr);
-      Sim(repstr);
+      Sim(repstr, filenum);
       break;
     case 'w' : 
       promptstring("Write WOMBAT: circuit name: ", repstr);
@@ -1016,7 +1022,7 @@ void Query(void)
       break;
     case 's':
       promptstring("Write SPICE: circuit name: ", repstr);
-      SpiceCell(repstr, -1, "");
+      SpiceCell(repstr, filenum, "");
       break;
     case 'E':
       promptstring("Write ESACAP: circuit name: ", repstr);
@@ -1034,19 +1040,19 @@ void Query(void)
     case 'r':
     case 'R':
       promptstring("Read file: ",repstr);
-      ReadNetlist(repstr);
+      ReadNetlist(repstr, &filenum);
       break;
     case 'X' : 
       promptstring("Read EXT: Enter file name: ", repstr);
-      ReadExtHier(repstr);
+      ReadExtHier(repstr, &filenum);
       break;
     case 'Z' : 
       promptstring("Read SIM: Enter file name: ", repstr);
-      ReadSim(repstr);
+      ReadSim(repstr, &filenum);
       break;
     case 'K' : 
       promptstring("Read NTK: file? ", repstr);
-      ReadNtk(repstr);
+      ReadNtk(repstr, &filenum);
       break;
     case 'A' : 
       printf("Reading ACTEL library.\n");
@@ -1054,24 +1060,24 @@ void Query(void)
       break;
     case 'S':
       promptstring("Read SPICE (.ckt) file? ", repstr);
-      ReadSpice(repstr);
+      ReadSpice(repstr, &filenum);
       break;
     case 'G' : 
       promptstring("Read NETGEN: file? ", repstr);
-      ReadNetgenFile(repstr);
+      ReadNetgenFile(repstr, &filenum);
       break;
 
     case 'f' : 
       promptstring("Enter circuit name to flatten: ", repstr);
-      Flatten(repstr, -1);
+      Flatten(repstr, filenum);
       break;
     case 'F' : 
       promptstring("Enter class of circuit to flatten: ", repstr);
-      FlattenInstancesOf(repstr, -1);
+      FlattenInstancesOf(repstr, filenum);
       break;
     case 'p' : 
       promptstring("Enter circuit name: ", repstr);
-      PrintPortsInCell(repstr, -1);
+      PrintPortsInCell(repstr, filenum);
       break;
     case 'T' : 
       NETCOMP();
@@ -1079,7 +1085,7 @@ void Query(void)
     case 'l' : 
       ClearDumpedList();
       promptstring("Enter circuit name: ", repstr);
-      PrintLeavesInCell(repstr, -1);
+      PrintLeavesInCell(repstr, filenum);
       break;
     case 'L' : 
       printf("List of all leaf circuits:\n");

base/spice.c

@@ -40,7 +40,21 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 #include "print.h"
 
 // Global storage for parameters from .PARAM
-struct hashlist **spiceparams;
+struct hashdict spiceparams;
+
+// Check if a token represents a numerical value (with
+// units) or an expression.  This is basically a hack
+// to see if it either passes StringIsValue() or is
+// enclosed in braces.  Probably should attempt to
+// parse the expression, to be pedantic.  Not sure all
+// expressions have to be in braces.
+
+int StringIsValueOrExpression(char *token)
+{
+    if (StringIsValue(token)) return TRUE;
+    else if (*token == '{') return TRUE;
+    else return FALSE;
+}
 
 void SpiceSubCell(struct nlist *tp, int IsSubCell)
 {
@@ -73,7 +87,7 @@ void SpiceSubCell(struct nlist *tp, int IsSubCell)
   for (ob = tp->cell; ob != NULL; ob = ob->next)
     if (ob->node > maxnode) maxnode = ob->node;
 
-/* was:  for (node = 0; node <= maxnode; node++)  */
+  /* was:  for (node = 0; node <= maxnode; node++)  */
   for (node = 1; node <= maxnode; node++) 
     FlushString("# %3d = %s\n", node, NodeName(tp, node));
 
@@ -154,7 +168,6 @@ void SpiceSubCell(struct nlist *tp, int IsSubCell)
 
 	/* caps and resistors, print out device value */
 
-
 	/* print out device type (model/subcircuit name) */
 
 	switch (tp2->class) {
@@ -358,6 +371,12 @@ int renamepins(struct hashlist *p, int file)
 	 obp = ob;
 	 for (ob2 = tc->cell; ob2 != NULL; ob2 = ob2->next) {
 	    if (ob2->type != PORT) break;
+	    else if ((obp->type < FIRSTPIN) || (obp->type == FIRSTPIN && obp != ob)) {
+	       Fprintf(stderr, "Pin count mismatch between cell and instance of %s\n",
+			tc->name);
+	       InputParseError(stderr);
+	       break;
+	    }
 	    if (!matchnocase(ob2->name, obp->name + strlen(obp->instance.name) + 1)) {
 	       // Printf("Cell %s pin correspondence: %s vs. %s\n",
 	       // 	tc->name, obp->name, ob2->name);
@@ -467,7 +486,7 @@ extern void IncludeSpice(char *, int, struct cellstack **, int);
 void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 		int blackbox)
 {
-  int cdnum = 1, rdnum = 1, ndev, multi;
+  int cdnum = 1, rdnum = 1;
   int warnings = 0, update = 0, hasports = 0;
   char *eqptr, devtype, in_subckt;
   struct keyvalue *kvlist = NULL;
@@ -520,6 +539,10 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	 int n;
 	 char *ds;
 
+	 // NOTE:  Use this to ignore the new definition---should be
+	 // an option to netgen.
+	 /* goto skip_ends; */
+
 	 ds = strrchr(model, '[');
 	 if ((ds != NULL) && (*(ds + 1) == '['))
 	    sscanf(ds + 2, "%d", &n);
@@ -530,6 +553,7 @@ void ReadSpiceFile(char *fname, int filenum, struct cellstack **CellStackPtr,
 	 }
 
 	 Printf("Duplicate cell %s in file\n", nexttok);
+	 tp->flags |= CELL_DUPLICATE;
          while (tp != NULL) {
 	    n++;
 	    /* Append "[[n]]" to the preexisting model name to force uniqueness */
@@ -773,7 +797,7 @@ skip_ends:
 	    kl->type = PROP_STRING;
 	    kl->slop.ival = 0;
 	    kl->pdefault.string = strsave(eqptr + 1);
-	    HashPtrInstall(nexttok, kl, spiceparams, OBJHASHSIZE);
+	    HashPtrInstall(nexttok, kl, &spiceparams);
 	 }
       }
     }
@@ -810,7 +834,6 @@ skip_ends:
       /* Read the device model */
       snprintf(model, 99, "%s", nexttok);
 
-      ndev = 1;
       while (nexttok != NULL)
       {
 	 /* Parse for M and other parameters */
@@ -820,10 +843,7 @@ skip_ends:
 	 if ((eqptr = strchr(nexttok, '=')) != NULL)
 	 {
 	    *eqptr = '\0';
-	    if (!strcasecmp(nexttok, "M"))
-		sscanf(eqptr + 1, "%d", &ndev);
-	    else 
-		AddProperty(&kvlist, nexttok, eqptr + 1);
+	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
       }
 
@@ -832,6 +852,7 @@ skip_ends:
 	 Port("collector");
 	 Port("base");
 	 Port("emitter");
+	 PropertyInteger(model, filenum, "M", 0, 1);
 	 SetClass(CLASS_BJT);
          EndCell();
 	 ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -842,16 +863,10 @@ skip_ends:
 	 goto baddevice;
       }
 
-      multi = (ndev > 1) ? 1 : 0;
-      if (!multi) snprintf(instname, 255, "%s%s", model, inst);
-      while (ndev > 0)
-      {
-         if (multi) snprintf(instname, 255, "%s%s.%d", model, inst, ndev);
-	 Cell(instname, model, collector, base, emitter);
-	 pobj = LinkProperties(model, kvlist);
-	 ReduceExpressions(pobj, CurrentCell, TRUE);
-	 ndev--;
-      }
+      snprintf(instname, 255, "%s%s", model, inst);
+      Cell(instname, model, collector, base, emitter);
+      pobj = LinkProperties(model, kvlist);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
       DeleteProperties(&kvlist);
     }
     else if (toupper(nexttok[0]) == 'M') {
@@ -885,7 +900,6 @@ skip_ends:
       /* Read the device model */
       snprintf(model, 99, "%s", nexttok);
 
-      ndev = 1;
       while (nexttok != NULL)
       {
 	 /* Parse for parameters; treat "M" separately */
@@ -895,14 +909,7 @@ skip_ends:
 	 if ((eqptr = strchr(nexttok, '=')) != NULL)
 	 {
 	    *eqptr = '\0';
-	    if (!strcasecmp(nexttok, "M"))
-		sscanf(eqptr + 1, "%d", &ndev);
-	    else if (!strcasecmp(nexttok, "L"))
-		AddProperty(&kvlist, "length", eqptr + 1);
-	    else if (!strcasecmp(nexttok, "W"))
-		AddProperty(&kvlist, "width", eqptr + 1);
-	    else 
-		AddProperty(&kvlist, nexttok, eqptr + 1);
+	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
       }
 
@@ -916,8 +923,9 @@ skip_ends:
 	 Port("gate");
 	 Port("source");
 	 Port("bulk");
-	 PropertyDouble(model, filenum, "length", 0.01, 0.0);
-	 PropertyDouble(model, filenum, "width", 0.01, 0.0);
+	 PropertyDouble(model, filenum, "L", 0.01, 0.0);
+	 PropertyDouble(model, filenum, "W", 0.01, 0.0);
+	 PropertyInteger(model, filenum, "M", 0, 1);
 	 SetClass(CLASS_FET);
          EndCell();
 	 ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -928,16 +936,10 @@ skip_ends:
 	 goto baddevice;
       }
 
-      multi = (ndev > 1) ? 1 : 0;
-      if (!multi) snprintf(instname, 255, "%s%s", model, inst);
-      while (ndev > 0)
-      {
-         if (multi) snprintf(instname, 255, "%s%s.%d", model, inst, ndev);
-	 Cell(instname, model, drain, gate, source, bulk);
-	 pobj = LinkProperties(model, kvlist);
-	 ReduceExpressions(pobj, CurrentCell, TRUE);
-	 ndev--;
-      }
+      snprintf(instname, 255, "%s%s", model, inst);
+      Cell(instname, model, drain, gate, source, bulk);
+      pobj = LinkProperties(model, kvlist);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
       DeleteProperties(&kvlist);
       SpiceSkipNewLine();
     }
@@ -968,7 +970,7 @@ skip_ends:
 
 	/* Get capacitor value (if present), save as property "value" */
 	if (nexttok != NULL) {
-	   if (StringIsValue(nexttok)) {
+	   if (StringIsValueOrExpression(nexttok)) {
 	      AddProperty(&kvlist, "value", nexttok);
 	      SpiceTokNoNewline();
 	   }
@@ -982,17 +984,13 @@ skip_ends:
 	   snprintf(model, 99, "%s", nexttok);
 
 	/* Any other device properties? */
-	ndev = 1;
         while (nexttok != NULL)
         {
 	   SpiceTokNoNewline();
 	   if ((nexttok == NULL) || (nexttok[0] == '\0')) break;
 	   if ((eqptr = strchr(nexttok, '=')) != NULL) {
 	      *eqptr = '\0';
-	      if (!strcasecmp(nexttok, "M"))
-		 sscanf(eqptr + 1, "%d", &ndev);
-	      else
-	         AddProperty(&kvlist, nexttok, eqptr + 1);
+	      AddProperty(&kvlist, nexttok, eqptr + 1);
 	   }
 	   else if (!strncmp(nexttok, "$[", 2)) {
 	      // Support for CDL modeled capacitor format
@@ -1000,7 +998,7 @@ skip_ends:
 	      if ((eqptr = strchr(model, ']')) != NULL)
 		 *eqptr = '\0';
 	   }
-	   else if (StringIsValue(nexttok)) {
+	   else if (StringIsValueOrExpression(nexttok)) {
 		// Suport for value passed to modeled capacitor
 	        AddProperty(&kvlist, "value", nexttok);
 	   }
@@ -1015,6 +1013,7 @@ skip_ends:
 	      Port("top");
 	      Port("bottom");
 	      PropertyValue(model, filenum, "value", 0.01, 0.0);
+	      PropertyInteger(model, filenum, "M", 0, 1);
 	      SetClass(CLASS_CAP);
               EndCell();
 	      ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1028,19 +1027,13 @@ skip_ends:
 	   usemodel = 1;
 	}
 
-	multi = (ndev > 1) ? 1 : 0;
-	if (!multi) snprintf(instname, 255, "%s%s", model, inst);
-
-	while (ndev > 0) {
-	   if (multi) snprintf(instname, 255, "%s%s.%d", model, inst, ndev);
-	   if (usemodel)
-              Cell(instname, model, ctop, cbot);
-	   else
-              Cap((*CellStackPtr)->cellname, instname, ctop, cbot);
-	   pobj = LinkProperties(model, kvlist);
-	   ReduceExpressions(pobj, CurrentCell, TRUE);
-	   ndev--;
-	}
+	snprintf(instname, 255, "%s%s", model, inst);
+	if (usemodel)
+           Cell(instname, model, ctop, cbot);
+	else
+           Cap((*CellStackPtr)->cellname, instname, ctop, cbot);
+	pobj = LinkProperties(model, kvlist);
+	ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
 	DeleteProperties(&kvlist);
       }
     }
@@ -1071,7 +1064,7 @@ skip_ends:
 	/* Get resistor value (if present); save as property "value" */
 
 	if (nexttok != NULL) {
-	   if (StringIsValue(nexttok)) {
+	   if (StringIsValueOrExpression(nexttok)) {
 	      AddProperty(&kvlist, "value", nexttok);
 	      SpiceTokNoNewline();
 	   }
@@ -1085,16 +1078,12 @@ skip_ends:
 	   snprintf(model, 99, "%s", nexttok);
 
 	/* Any other device properties? */
-	ndev = 1;
         while (nexttok != NULL) {
 	   SpiceTokNoNewline();
 	   if ((nexttok == NULL) || (nexttok[0] == '\0')) break;
 	   if ((eqptr = strchr(nexttok, '=')) != NULL) {
 	      *eqptr = '\0';
-	      if (!strcasecmp(nexttok, "M"))
-		 sscanf(eqptr + 1, "%d", &ndev);
-	      else
-	         AddProperty(&kvlist, nexttok, eqptr + 1);
+	       AddProperty(&kvlist, nexttok, eqptr + 1);
 	   }
 	   else if (!strncmp(nexttok, "$[", 2)) {
 	      // Support for CDL modeled resistor format
@@ -1102,7 +1091,7 @@ skip_ends:
 	      if ((eqptr = strchr(model, ']')) != NULL)
 		 *eqptr = '\0';
 	   }
-	   else if (StringIsValue(nexttok)) {
+	   else if (StringIsValueOrExpression(nexttok)) {
 		// Suport for value passed to modeled resistor
 	        AddProperty(&kvlist, "value", nexttok);
 	   }
@@ -1115,6 +1104,7 @@ skip_ends:
 	      Port("end_a");
 	      Port("end_b");
 	      PropertyValue(model, filenum, "value", 0.01, 0.0);
+	      PropertyInteger(model, filenum, "M", 0, 1);
 	      SetClass(CLASS_RES);
               EndCell();
 	      ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1130,19 +1120,13 @@ skip_ends:
 	else
 	   strcpy(model, "r");		/* Use default resistor model */
 
-	multi = (ndev > 1) ? 1 : 0;
-	if (!multi) snprintf(instname, 255, "%s%s", model, inst);
-
-	while (ndev > 0) {
-	   if (multi) snprintf(instname, 255, "%s%s.%d", model, inst, ndev);
-	   if (usemodel)
-	      Cell(instname, model, rtop, rbot);
-	   else
-              Res((*CellStackPtr)->cellname, instname, rtop, rbot);
-	   pobj = LinkProperties(model, kvlist);
-	   ReduceExpressions(pobj, CurrentCell, TRUE);
-	   ndev--;
-	}
+	snprintf(instname, 255, "%s%s", model, inst);
+	if (usemodel)
+	   Cell(instname, model, rtop, rbot);
+	else
+           Res((*CellStackPtr)->cellname, instname, rtop, rbot);
+	pobj = LinkProperties(model, kvlist);
+	ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
 	DeleteProperties(&kvlist);
       }
     }
@@ -1167,7 +1151,6 @@ skip_ends:
       /* Read the device model */
       snprintf(model, 99, "%s", nexttok);
 
-      ndev = 1;
       while (nexttok != NULL)
       {
 	 /* Parse for M and other parameters */
@@ -1177,10 +1160,7 @@ skip_ends:
 	 if ((eqptr = strchr(nexttok, '=')) != NULL)
 	 {
 	    *eqptr = '\0';
-	    if (!strcasecmp(nexttok, "M"))
-		sscanf(eqptr + 1, "%d", &ndev);
-	    else 
-		AddProperty(&kvlist, nexttok, eqptr + 1);
+	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
       }
 
@@ -1188,6 +1168,7 @@ skip_ends:
 	 CellDefNoCase(model, filenum);
 	 Port("anode");
 	 Port("cathode");
+         PropertyInteger(model, filenum, "M", 0, 1);
 	 SetClass(CLASS_DIODE);
          EndCell();
 	 ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1197,16 +1178,10 @@ skip_ends:
 	 Fprintf(stderr, "Device \"%s\" has wrong number of ports for a diode.\n");
 	 goto baddevice;
       }
-      multi = (ndev > 1) ? 1 : 0;
-      if (!multi) snprintf(instname, 255, "%s%s", model, inst);
-      while (ndev > 0)
-      {
-         if (multi) snprintf(instname, 255, "%s%s.%d", model, inst, ndev);
-	 Cell(instname, model, anode, cathode);
-	 pobj = LinkProperties(model, kvlist);
-	 ReduceExpressions(pobj, CurrentCell, TRUE);
-	 ndev--;
-      }
+      snprintf(instname, 255, "%s%s", model, inst);
+      Cell(instname, model, anode, cathode);
+      pobj = LinkProperties(model, kvlist);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
       DeleteProperties(&kvlist);
     }
     else if (toupper(nexttok[0]) == 'T') {	/* transmission line */
@@ -1249,16 +1224,12 @@ skip_ends:
 	   snprintf(model, 99, "%s", nexttok);
 
 	/* Any other device properties? */
-	ndev = 1;
         while (nexttok != NULL) {
 	   SpiceTokNoNewline();
 	   if ((nexttok == NULL) || (nexttok[0] == '\0')) break;
 	   if ((eqptr = strchr(nexttok, '=')) != NULL) {
 	      *eqptr = '\0';
-	      if (!strcasecmp(nexttok, "M"))
-		 sscanf(eqptr + 1, "%d", &ndev);
-	      else
-	         AddProperty(&kvlist, nexttok, eqptr + 1);
+	      AddProperty(&kvlist, nexttok, eqptr + 1);
 	   }
 	}
 
@@ -1270,6 +1241,7 @@ skip_ends:
 	      Port("node2");
 	      Port("node3");
 	      Port("node4");
+	      PropertyInteger(model, filenum, "M", 0, 1);
 	      SetClass(CLASS_XLINE);
               EndCell();
 	      ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1285,20 +1257,15 @@ skip_ends:
 	else
 	   strcpy(model, "t");		/* Use default xline model */
 
-	multi = (ndev > 1) ? 1 : 0;
-	if (!multi) snprintf(instname, 255, "%s%s", model, inst);
+	snprintf(instname, 255, "%s%s", model, inst);
 
-	while (ndev > 0) {
-	   if (multi) snprintf(instname, 255, "%s%s.%d", model, inst, ndev);
-	   if (usemodel)
-	      Cell(instname, model, node1, node2, node3, node4);
-	   else
-              XLine((*CellStackPtr)->cellname, instname, node1, node2,
+	if (usemodel)
+	   Cell(instname, model, node1, node2, node3, node4);
+	else
+           XLine((*CellStackPtr)->cellname, instname, node1, node2,
 			node3, node4);
-	   pobj = LinkProperties(model, kvlist);
-	   ReduceExpressions(pobj, CurrentCell, TRUE);
-	   ndev--;
-	}
+	pobj = LinkProperties(model, kvlist);
+	ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
 	DeleteProperties(&kvlist);
       }
     }
@@ -1324,7 +1291,7 @@ skip_ends:
       /* Get inductance value (if present); save as property "value" */
 
       if (nexttok != NULL) {
-	  if (StringIsValue(nexttok)) {
+	  if (StringIsValueOrExpression(nexttok)) {
 	      AddProperty(&kvlist, "value", nexttok);
 	      SpiceTokNoNewline();
 	  }
@@ -1338,7 +1305,6 @@ skip_ends:
 	  snprintf(model, 99, "%s", nexttok);
 
       /* Any other device properties? */
-      ndev = 1;
       while (nexttok != NULL)
       {
 	 /* Parse for M and other parameters */
@@ -1348,10 +1314,7 @@ skip_ends:
 	 if ((eqptr = strchr(nexttok, '=')) != NULL)
 	 {
 	    *eqptr = '\0';
-	    if (!strcasecmp(nexttok, "M"))
-		sscanf(eqptr + 1, "%d", &ndev);
-	    else 
-		AddProperty(&kvlist, nexttok, eqptr + 1);
+	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
       }
 
@@ -1361,6 +1324,7 @@ skip_ends:
 	    CellDefNoCase(model, filenum);
 	    Port("end_a");
 	    Port("end_b");
+	    PropertyInteger(model, filenum, "M", 0, 1);
 	    SetClass(CLASS_INDUCTOR);
             EndCell();
 	    ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1376,19 +1340,13 @@ skip_ends:
       else
 	 strcpy(model, "l");		/* Use default inductor model */
 
-      multi = (ndev > 1) ? 1 : 0;
-      if (!multi) snprintf(instname, 255, "%s%s", model, inst);
-      while (ndev > 0)
-      {
-         if (multi) snprintf(instname, 255, "%s%s.%d", model, inst, ndev);
-	 if (usemodel)
-	    Cell(instname, model, end_a, end_b);
-	 else
-	    Inductor((*CellStackPtr)->cellname, instname, end_a, end_b);
-	 pobj = LinkProperties(model, kvlist);
-	 ReduceExpressions(pobj, CurrentCell, TRUE);
-	 ndev--;
-      }
+      snprintf(instname, 255, "%s%s", model, inst);
+      if (usemodel)
+	 Cell(instname, model, end_a, end_b);
+      else
+	 Inductor((*CellStackPtr)->cellname, instname, end_a, end_b);
+      pobj = LinkProperties(model, kvlist);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
       DeleteProperties(&kvlist);
     }
 
@@ -1424,7 +1382,7 @@ skip_ends:
 	    *eqptr = '\0';
 	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
-	 else if (StringIsValue(nexttok)) {
+	 else if (StringIsValueOrExpression(nexttok)) {
 	    AddProperty(&kvlist, "value", nexttok);
 	    SpiceTokNoNewline();
 	 }
@@ -1434,6 +1392,7 @@ skip_ends:
 	 CellDefNoCase(model, filenum);
 	 Port("pos");
 	 Port("neg");
+	 PropertyInteger(model, filenum, "M", 0, 1);
 	 SetClass(CLASS_MODULE);
          EndCell();
 	 ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1446,7 +1405,7 @@ skip_ends:
       }
       Cell(instname, model, pos, neg);
       pobj = LinkProperties(model, kvlist);
-      ReduceExpressions(pobj, CurrentCell, TRUE);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
       DeleteProperties(&kvlist);
     }
     else if (toupper(nexttok[0]) == 'I') {	/* current source */
@@ -1477,7 +1436,7 @@ skip_ends:
 	    *eqptr = '\0';
 	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
-	 else if (StringIsValue(nexttok)) {
+	 else if (StringIsValueOrExpression(nexttok)) {
 	    AddProperty(&kvlist, "value", nexttok);
 	    SpiceTokNoNewline();
 	 }
@@ -1487,6 +1446,7 @@ skip_ends:
 	 CellDefNoCase(model, filenum);
 	 Port("pos");
 	 Port("neg");
+	 PropertyInteger(model, filenum, "M", 0, 1);
 	 SetClass(CLASS_MODULE);
          EndCell();
 	 ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1499,7 +1459,7 @@ skip_ends:
       }
       Cell(instname, model, pos, neg);
       pobj = LinkProperties(model, kvlist);
-      ReduceExpressions(pobj, CurrentCell, TRUE);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
       DeleteProperties(&kvlist);
     }
     else if (toupper(nexttok[0]) == 'E') {	/* controlled voltage source */
@@ -1539,7 +1499,7 @@ skip_ends:
 	    *eqptr = '\0';
 	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	 }
-	 else if (StringIsValue(nexttok)) {
+	 else if (StringIsValueOrExpression(nexttok)) {
 	    AddProperty(&kvlist, "value", nexttok);
 	    SpiceTokNoNewline();
 	 }
@@ -1551,6 +1511,7 @@ skip_ends:
 	 Port("neg");
 	 Port("ctrlp");
 	 Port("ctrln");
+	 PropertyInteger(model, filenum, "M", 0, 1);
 	 SetClass(CLASS_MODULE);
          EndCell();
 	 ReopenCellDef((*CellStackPtr)->cellname, filenum);	/* Reopen */
@@ -1563,12 +1524,14 @@ skip_ends:
       }
       Cell(instname, model, pos, neg, ctrlp, ctrln);
       pobj = LinkProperties(model, kvlist);
-      ReduceExpressions(pobj, CurrentCell, TRUE);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
       DeleteProperties(&kvlist);
     }
 
     else if (toupper(nexttok[0]) == 'X') {	/* subcircuit instances */
       char instancename[100], subcktname[100];
+      int itype;
+
       instancename[99] = '\0';
       subcktname[99] = '\0';
 
@@ -1590,7 +1553,6 @@ skip_ends:
       head = NULL;
       tail = NULL;
       SpiceTokNoNewline();
-      ndev = 1;
       while (nexttok != NULL) {
 	/* must still be a node or a parameter */
 	struct portelement *new_port;
@@ -1618,10 +1580,7 @@ skip_ends:
 	    	((tp = LookupCellFile(nexttok, filenum)) == NULL))
 	{
 	    *eqptr = '\0';
-	    if (!strcasecmp(nexttok, "M"))
-		sscanf(eqptr + 1, "%d", &ndev);
-	    else 
-		AddProperty(&kvlist, nexttok, eqptr + 1);
+	    AddProperty(&kvlist, nexttok, eqptr + 1);
 	}
 	else
 	{
@@ -1645,6 +1604,34 @@ skip_ends:
       if (scan->next != NULL) scan = scan->next;
       tail->next = NULL;
 
+      /* Check for ignored class */
+
+      if ((itype = IsIgnored(subcktname, filenum)) == IGNORE_CLASS) {
+          Printf("Class '%s' instanced in input but is being ignored.\n", model);
+          return;
+      }
+
+      /* Check for shorted pins */
+
+      if ((itype == IGNORE_SHORTED) && (head != NULL)) {
+         unsigned char shorted = (unsigned char)1;
+         struct portelement *p;
+         for (p = head->next; p; p = p->next) {
+            if (strcasecmp(head->name, p->name))
+               shorted = (unsigned char)0;
+               break;
+         }
+         if (shorted == (unsigned char)1) {
+            Printf("Instance of '%s' is shorted, ignoring.\n", subcktname);
+	    while (head) {
+	       p = head->next;
+	       FREE(head);
+	       head = p;
+            }
+            return;
+         }
+      }
+
       /* Create cell name and revise instance name based on the cell name */
       /* For clarity, if "instancename" does not contain the cellname,	  */
       /* then prepend the cellname to the instance name.  HOWEVER, if any */
@@ -1693,6 +1680,7 @@ skip_ends:
 	 if (head == NULL) {
 	    Port((char *)NULL);	// Must have something for pin 1
 	 }
+	 PropertyInteger(subcktname, filenum, "M", 0, 1);
 	 SetClass(CLASS_MODULE);
          EndCell();
 	 ReopenCellDef((*CellStackPtr)->cellname, filenum);		/* Reopen */
@@ -1700,38 +1688,31 @@ skip_ends:
       }
 
       /* nexttok is now NULL, scan->name points to class */
-      multi = (ndev > 1) ? 1 : 0;
-      if (multi) strcat(instancename, ".");
-      while (ndev > 0) {
-         if (multi) {
-	    char *dotptr = strrchr(instancename, '.');
-	    sprintf(dotptr + 1, "%d", ndev);
-	 }
-         Instance(subcktname, instancename);
-	 pobj = LinkProperties(subcktname, kvlist);
-	 ReduceExpressions(pobj, CurrentCell, TRUE);
-	 ndev--;
 
-         /* (Diagnostic) */
-         /* Fprintf(stderr, "instancing subcell: %s (%s):", subcktname, instancename); */
-         /*
+      Instance(subcktname, instancename);
+      pobj = LinkProperties(subcktname, kvlist);
+      ReduceExpressions(pobj, NULL, CurrentCell, TRUE);
+
+      /* (Diagnostic) */
+      /* Fprintf(stderr, "instancing subcell: %s (%s):", subcktname, instancename); */
+      /*
          for (scan = head; scan != NULL; scan = scan->next)
-	   Fprintf(stderr," %s", scan->name);
+	    Fprintf(stderr," %s", scan->name);
          Fprintf(stderr,"\n");
-         */
+      */
       
-         obptr = LookupInstance(instancename, CurrentCell);
-         if (obptr != NULL) {
-           scan = head;
-	   if (scan != NULL)
-           do {
-	     if (LookupObject(scan->name, CurrentCell) == NULL) Node(scan->name);
-	     join(scan->name, obptr->name);
-	     obptr = obptr->next;
-	     scan = scan->next;
-           } while (obptr != NULL && obptr->type > FIRSTPIN && scan != NULL);
+      obptr = LookupInstance(instancename, CurrentCell);
+      if (obptr != NULL) {
+         scan = head;
+	 if (scan != NULL)
+         do {
+	    if (LookupObject(scan->name, CurrentCell) == NULL) Node(scan->name);
+	    join(scan->name, obptr->name);
+	    obptr = obptr->next;
+	    scan = scan->next;
+         } while (obptr != NULL && obptr->type > FIRSTPIN && scan != NULL);
 
-           if ((obptr == NULL && scan != NULL) ||
+         if ((obptr == NULL && scan != NULL) ||
 		(obptr != NULL && scan == NULL && obptr->type > FIRSTPIN)) {
 	     if (warnings <= 100) {
 	        Fprintf(stderr,"Parameter list mismatch in %s: ", instancename);
@@ -1745,8 +1726,7 @@ skip_ends:
 	           Fprintf(stderr, "Too many warnings. . . will not report any more.\n");
              }
 	     warnings++;
-	   }
-         }	// repeat over ndev
+	  }
       }
       DeleteProperties(&kvlist);
 
@@ -1839,8 +1819,7 @@ char *ReadSpiceTop(char *fname, int *fnum, int blackbox)
   matchintfunc = matchfilenocase;
   hashfunc = hashnocase;
 
-  spiceparams = (struct hashlist **)CALLOC(OBJHASHSIZE,
-	sizeof(struct hashlist *));
+  InitializeHashTable(&spiceparams, OBJHASHSIZE);
 
   /* All spice files should start with a comment line,	*/
   /* but we won't depend upon it.  Any comment line	*/
@@ -1852,10 +1831,8 @@ char *ReadSpiceTop(char *fname, int *fnum, int blackbox)
   // Cleanup
   while (CellStack != NULL) PopStack(&CellStack);
 
-  RecurseHashTable(spiceparams, OBJHASHSIZE, freeprop);
-  HashKill(spiceparams, OBJHASHSIZE);
-  FREE(spiceparams);
-  spiceparams = NULL;
+  RecurseHashTable(&spiceparams, freeprop);
+  HashKill(&spiceparams);
 
   // Important:  If the file is a library, containing subcircuit
   // definitions but no components, then it needs to be registered

base/xilinx.c

@@ -36,7 +36,7 @@ the Free Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */
 
 #define XILINXHASHSIZE 99
 static long xilinxhashbase = 0xA00;
-static struct hashlist *xilinxnametab[XILINXHASHSIZE];
+static struct hashdict xilinxnamedict;
 static FILE *xilinxfile;
 
 char *gndnet = "0";
@@ -156,7 +156,7 @@ Xilinx(cellname, filename)
 		return;
 	}
 	ClearDumpedList();
-	InitializeHashTable(xilinxnametab, XILINXHASHSIZE);
+	InitializeHashTable(&xilinxnamedict, XILINXHASHSIZE);
 	if (LookupCell(cellname) != NULL)
 		xilinxCell(cellname);
 	CloseFile(FileName);

defs.mak

@@ -56,7 +56,8 @@ RANLIB                 = ranlib
 SHDLIB_EXT	       = .so
 LDDL_FLAGS             =  -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
 LD_RUN_PATH            = 
-LIB_SPECS              =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+LIB_SPECS              =  -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6
+LIB_SPECS_NOSTUB       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
 WISH_EXE	       = /usr/bin/wish
 TCL_LIB_DIR	       = /usr/lib
 
@@ -65,7 +66,8 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"45\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -fPIC 
 
 DEPEND_FILE            = Depend

install.log

@@ -1,668 +0,0 @@
-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/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'
-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/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/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/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/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/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'

netgen/Makefile

@@ -23,7 +23,7 @@ tclnetgen${SHDLIB_EXT}: ${EXTRA_LIBS}
 	${RM} tclnetgen${SHDLIB_EXT}
 	${CC} ${CFLAGS} ${CPPFLAGS} -o $@ ${LDDL_FLAGS} \
 		${LD_RUN_PATH} ${EXTRA_LIBS} ${LD_EXTRA_LIBS} -lc ${LIBS} \
-		${TCL_LIB_SPEC} ${LDFLAGS}
+		${LIB_SPECS} ${LDFLAGS}
 
 $(DESTDIR)${BINDIR}/netgen:
 	${RM} $@

netgen/netcomp.c

@@ -52,6 +52,7 @@ int main(int argc, char *argv[])
 {
 #ifndef HAVE_GETOPT
   char cell1[200], cell2[200];
+  int filenum = -1;
 
   Debug = 0;
   if (argc < 3 || argc > 5) {
@@ -60,10 +61,10 @@ int main(int argc, char *argv[])
   }
   Initialize();
 
-  STRCPY(cell1, ReadNetlist(argv[1]));
+  STRCPY(cell1, ReadNetlist(argv[1], &filenum));
   if (argc >= 4) STRCPY(cell1, argv[3]);  /* if explicit cell name specified */
 
-  STRCPY(cell2, ReadNetlist(argv[2]));
+  STRCPY(cell2, ReadNetlist(argv[2], &filenum));
   if (argc == 5) STRCPY(cell2, argv[4]);  /* if explicit cell name specified */
 #else
   char cell1[200], cell2[200];

netgen/ntk2adl.c

@@ -46,6 +46,7 @@ void STRCPY(char *dest, char *source)
 int main(int argc, char *argv[])
 {
   char cellname[200];
+  int filenum = -1;
 
   Debug = 0;
   if (argc < 2 || argc > 3) {
@@ -55,7 +56,7 @@ int main(int argc, char *argv[])
   Initialize();
   ActelLib();
 
-  STRCPY(cellname, ReadNetlist(argv[1]));
+  STRCPY(cellname, ReadNetlist(argv[1], &filenum));
   if (argc == 3) STRCPY(cellname, argv[2]);
 
   Actel(cellname, NULL);

netgen/ntk2xnf.c

@@ -48,6 +48,7 @@ void STRCPY(char *dest, char *source)
 int main(int argc, char *argv[])
 {
   char cellname[200];
+  int filenum = -1;
 
   Debug = 0;
   if (argc < 2 || argc > 3) {
@@ -57,7 +58,7 @@ int main(int argc, char *argv[])
   Initialize();
   XilinxLib();
 
-  STRCPY(cellname, ReadNetlist(argv[1]));
+  STRCPY(cellname, ReadNetlist(argv[1], &filenum));
   if (argc == 3) STRCPY(cellname, argv[2]);
 
   Xilinx(cellname, NULL);

scripts/config.log

@@ -39,24 +39,24 @@ PATH: /usr/local/bin
 ## Core tests. ##
 ## ----------- ##
 
-configure:2395: checking build system type
-configure:2409: result: x86_64-unknown-linux-gnu
-configure:2429: checking host system type
-configure:2442: result: x86_64-unknown-linux-gnu
-configure:2462: checking target system type
-configure:2475: result: x86_64-unknown-linux-gnu
-configure:2566: checking for gcc
-configure:2582: found /bin/gcc
-configure:2593: result: gcc
-configure:2822: checking for C compiler version
-configure:2831: gcc --version >&5
+configure:2397: checking build system type
+configure:2411: result: x86_64-unknown-linux-gnu
+configure:2431: checking host system type
+configure:2444: result: x86_64-unknown-linux-gnu
+configure:2464: checking target system type
+configure:2477: result: x86_64-unknown-linux-gnu
+configure:2568: checking for gcc
+configure:2584: found /bin/gcc
+configure:2595: result: gcc
+configure:2824: checking for C compiler version
+configure:2833: gcc --version >&5
 gcc (GCC) 4.9.2 20141101 (Red Hat 4.9.2-1)
 Copyright (C) 2014 Free Software Foundation, Inc.
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
-configure:2842: $? = 0
-configure:2831: gcc -v >&5
+configure:2844: $? = 0
+configure:2833: gcc -v >&5
 Using built-in specs.
 COLLECT_GCC=gcc
 COLLECT_LTO_WRAPPER=/usr/libexec/gcc/x86_64-redhat-linux/4.9.2/lto-wrapper
@@ -64,58 +64,58 @@ Target: x86_64-redhat-linux
 Configured with: ../configure --prefix=/usr --mandir=/usr/share/man --infodir=/usr/share/info --with-bugurl=http://bugzilla.redhat.com/bugzilla --enable-bootstrap --enable-shared --enable-threads=posix --enable-checking=release --enable-multilib --with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions --enable-gnu-unique-object --enable-linker-build-id --with-linker-hash-style=gnu --enable-languages=c,c++,objc,obj-c++,fortran,ada,go,lto --enable-plugin --enable-initfini-array --disable-libgcj --with-isl=/builddir/build/BUILD/gcc-4.9.2-20141101/obj-x86_64-redhat-linux/isl-install --with-cloog=/builddir/build/BUILD/gcc-4.9.2-20141101/obj-x86_64-redhat-linux/cloog-install --enable-gnu-indirect-function --with-tune=generic --with-arch_32=i686 --build=x86_64-redhat-linux
 Thread model: posix
 gcc version 4.9.2 20141101 (Red Hat 4.9.2-1) (GCC) 
-configure:2842: $? = 0
-configure:2831: gcc -V >&5
+configure:2844: $? = 0
+configure:2833: gcc -V >&5
 gcc: error: unrecognized command line option '-V'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2842: $? = 4
-configure:2831: gcc -qversion >&5
+configure:2844: $? = 4
+configure:2833: gcc -qversion >&5
 gcc: error: unrecognized command line option '-qversion'
 gcc: fatal error: no input files
 compilation terminated.
-configure:2842: $? = 4
-configure:2862: checking whether the C compiler works
-configure:2884: gcc -g   conftest.c  >&5
-configure:2888: $? = 0
-configure:2936: result: yes
-configure:2939: checking for C compiler default output file name
-configure:2941: result: a.out
-configure:2947: checking for suffix of executables
-configure:2954: gcc -o conftest -g   conftest.c  >&5
-configure:2958: $? = 0
-configure:2980: result: 
-configure:3002: checking whether we are cross compiling
-configure:3010: gcc -o conftest -g   conftest.c  >&5
-configure:3014: $? = 0
-configure:3021: ./conftest
-configure:3025: $? = 0
-configure:3040: result: no
-configure:3045: checking for suffix of object files
-configure:3067: gcc -c -g  conftest.c >&5
-configure:3071: $? = 0
-configure:3092: result: o
-configure:3096: checking whether we are using the GNU C compiler
-configure:3115: gcc -c -g  conftest.c >&5
-configure:3115: $? = 0
-configure:3124: result: yes
-configure:3133: checking whether gcc accepts -g
-configure:3153: gcc -c -g  conftest.c >&5
-configure:3153: $? = 0
-configure:3194: result: yes
-configure:3211: checking for gcc option to accept ISO C89
-configure:3274: gcc  -c -g  conftest.c >&5
-configure:3274: $? = 0
-configure:3287: result: none needed
-configure:3312: checking how to run the C preprocessor
-configure:3343: gcc -E  conftest.c
-configure:3343: $? = 0
-configure:3357: gcc -E  conftest.c
+configure:2844: $? = 4
+configure:2864: checking whether the C compiler works
+configure:2886: gcc -g   conftest.c  >&5
+configure:2890: $? = 0
+configure:2938: result: yes
+configure:2941: checking for C compiler default output file name
+configure:2943: result: a.out
+configure:2949: checking for suffix of executables
+configure:2956: gcc -o conftest -g   conftest.c  >&5
+configure:2960: $? = 0
+configure:2982: result: 
+configure:3004: checking whether we are cross compiling
+configure:3012: gcc -o conftest -g   conftest.c  >&5
+configure:3016: $? = 0
+configure:3023: ./conftest
+configure:3027: $? = 0
+configure:3042: result: no
+configure:3047: checking for suffix of object files
+configure:3069: gcc -c -g  conftest.c >&5
+configure:3073: $? = 0
+configure:3094: result: o
+configure:3098: checking whether we are using the GNU C compiler
+configure:3117: gcc -c -g  conftest.c >&5
+configure:3117: $? = 0
+configure:3126: result: yes
+configure:3135: checking whether gcc accepts -g
+configure:3155: gcc -c -g  conftest.c >&5
+configure:3155: $? = 0
+configure:3196: result: yes
+configure:3213: checking for gcc option to accept ISO C89
+configure:3276: gcc  -c -g  conftest.c >&5
+configure:3276: $? = 0
+configure:3289: result: none needed
+configure:3314: checking how to run the C preprocessor
+configure:3345: gcc -E  conftest.c
+configure:3345: $? = 0
+configure:3359: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3357: $? = 1
+configure:3359: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -125,18 +125,18 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "45"
+| #define NETGEN_REVISION "60"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3382: result: gcc -E
-configure:3402: gcc -E  conftest.c
-configure:3402: $? = 0
-configure:3416: gcc -E  conftest.c
+configure:3384: result: gcc -E
+configure:3404: gcc -E  conftest.c
+configure:3404: $? = 0
+configure:3418: gcc -E  conftest.c
 conftest.c:11:28: fatal error: ac_nonexistent.h: No such file or directory
  #include <ac_nonexistent.h>
                             ^
 compilation terminated.
-configure:3416: $? = 1
+configure:3418: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -146,104 +146,104 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "45"
+| #define NETGEN_REVISION "60"
 | /* end confdefs.h.  */
 | #include <ac_nonexistent.h>
-configure:3445: checking for library containing strerror
-configure:3476: gcc -o conftest -g   conftest.c  >&5
-configure:3476: $? = 0
-configure:3493: result: none required
-configure:3515: checking for a BSD-compatible install
-configure:3583: result: /bin/install -c
-configure:3637: checking for ranlib
-configure:3653: found /bin/ranlib
-configure:3664: result: ranlib
-configure:3691: checking for gm4
-configure:3724: result: no
-configure:3691: checking for gnum4
-configure:3724: result: no
-configure:3691: checking for m4
-configure:3709: found /bin/m4
-configure:3721: result: /bin/m4
-configure:3762: checking for ld used by GCC
-configure:3825: result: /bin/ld
-configure:3832: checking if the linker (/bin/ld) is GNU ld
+configure:3447: checking for library containing strerror
+configure:3478: gcc -o conftest -g   conftest.c  >&5
+configure:3478: $? = 0
+configure:3495: result: none required
+configure:3517: checking for a BSD-compatible install
+configure:3585: result: /bin/install -c
+configure:3639: checking for ranlib
+configure:3655: found /bin/ranlib
+configure:3666: result: ranlib
+configure:3693: checking for gm4
+configure:3726: result: no
+configure:3693: checking for gnum4
+configure:3726: result: no
+configure:3693: checking for m4
+configure:3711: found /bin/m4
+configure:3723: result: /bin/m4
+configure:3764: checking for ld used by GCC
+configure:3827: result: /bin/ld
+configure:3834: checking if the linker (/bin/ld) is GNU ld
 GNU ld version 2.24
-configure:3844: result: yes
-configure:3851: checking for grep that handles long lines and -e
-configure:3909: result: /bin/grep
-configure:3914: checking for egrep
-configure:3976: result: /bin/grep -E
-configure:3981: checking for ANSI C header files
-configure:4001: gcc -c -g  conftest.c >&5
-configure:4001: $? = 0
-configure:4074: gcc -o conftest -g   conftest.c  >&5
-configure:4074: $? = 0
-configure:4074: ./conftest
-configure:4074: $? = 0
-configure:4085: result: yes
-configure:4098: checking for sys/types.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for sys/stat.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for stdlib.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for string.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for memory.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for strings.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for inttypes.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for stdint.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4098: checking for unistd.h
-configure:4098: gcc -c -g  conftest.c >&5
-configure:4098: $? = 0
-configure:4098: result: yes
-configure:4114: checking size of void *
-configure:4119: gcc -o conftest -g   conftest.c  >&5
-configure:4119: $? = 0
-configure:4119: ./conftest
-configure:4119: $? = 0
-configure:4133: result: 8
-configure:4147: checking size of unsigned int
-configure:4152: gcc -o conftest -g   conftest.c  >&5
-configure:4152: $? = 0
-configure:4152: ./conftest
-configure:4152: $? = 0
-configure:4166: result: 4
-configure:4180: checking size of unsigned long
-configure:4185: gcc -o conftest -g   conftest.c  >&5
-configure:4185: $? = 0
-configure:4185: ./conftest
-configure:4185: $? = 0
-configure:4199: result: 8
-configure:4213: checking size of unsigned long long
-configure:4218: gcc -o conftest -g   conftest.c  >&5
-configure:4218: $? = 0
-configure:4218: ./conftest
-configure:4218: $? = 0
-configure:4232: result: 8
-configure:4243: checking whether byte ordering is bigendian
-configure:4258: gcc -c -g  conftest.c >&5
+configure:3846: result: yes
+configure:3853: checking for grep that handles long lines and -e
+configure:3911: result: /bin/grep
+configure:3916: checking for egrep
+configure:3978: result: /bin/grep -E
+configure:3983: checking for ANSI C header files
+configure:4003: gcc -c -g  conftest.c >&5
+configure:4003: $? = 0
+configure:4076: gcc -o conftest -g   conftest.c  >&5
+configure:4076: $? = 0
+configure:4076: ./conftest
+configure:4076: $? = 0
+configure:4087: result: yes
+configure:4100: checking for sys/types.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for sys/stat.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for stdlib.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for string.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for memory.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for strings.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for inttypes.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for stdint.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4100: checking for unistd.h
+configure:4100: gcc -c -g  conftest.c >&5
+configure:4100: $? = 0
+configure:4100: result: yes
+configure:4116: checking size of void *
+configure:4121: gcc -o conftest -g   conftest.c  >&5
+configure:4121: $? = 0
+configure:4121: ./conftest
+configure:4121: $? = 0
+configure:4135: result: 8
+configure:4149: checking size of unsigned int
+configure:4154: gcc -o conftest -g   conftest.c  >&5
+configure:4154: $? = 0
+configure:4154: ./conftest
+configure:4154: $? = 0
+configure:4168: result: 4
+configure:4182: checking size of unsigned long
+configure:4187: gcc -o conftest -g   conftest.c  >&5
+configure:4187: $? = 0
+configure:4187: ./conftest
+configure:4187: $? = 0
+configure:4201: result: 8
+configure:4215: checking size of unsigned long long
+configure:4220: gcc -o conftest -g   conftest.c  >&5
+configure:4220: $? = 0
+configure:4220: ./conftest
+configure:4220: $? = 0
+configure:4234: result: 8
+configure:4245: checking whether byte ordering is bigendian
+configure:4260: gcc -c -g  conftest.c >&5
 conftest.c:26:9: error: unknown type name 'not'
          not a universal capable compiler
          ^
@@ -251,7 +251,7 @@ conftest.c:26:15: error: expected '=', ',', ';', 'asm' or '__attribute__' before
          not a universal capable compiler
                ^
 conftest.c:26:15: error: unknown type name 'universal'
-configure:4258: $? = 1
+configure:4260: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -261,7 +261,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "45"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -282,9 +282,9 @@ configure: failed program was:
 | 	     #endif
 | 	     typedef int dummy;
 | 
-configure:4303: gcc -c -g  conftest.c >&5
-configure:4303: $? = 0
-configure:4321: gcc -c -g  conftest.c >&5
+configure:4305: gcc -c -g  conftest.c >&5
+configure:4305: $? = 0
+configure:4323: gcc -c -g  conftest.c >&5
 conftest.c: In function 'main':
 conftest.c:32:4: error: unknown type name 'not'
     not big endian
@@ -292,7 +292,7 @@ conftest.c:32:4: error: unknown type name 'not'
 conftest.c:32:12: error: expected '=', ',', ';', 'asm' or '__attribute__' before 'endian'
     not big endian
             ^
-configure:4321: $? = 1
+configure:4323: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -302,7 +302,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "45"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -331,48 +331,48 @@ configure: failed program was:
 |   ;
 |   return 0;
 | }
-configure:4449: result: no
-configure:4468: checking for ANSI C header files
-configure:4572: result: yes
-configure:4584: checking for setenv
-configure:4584: gcc -o conftest -g   conftest.c  >&5
-configure:4584: $? = 0
-configure:4584: result: yes
-configure:4584: checking for putenv
-configure:4584: gcc -o conftest -g   conftest.c  >&5
-configure:4584: $? = 0
-configure:4584: result: yes
-configure:4594: checking for vfork
-configure:4594: gcc -o conftest -g   conftest.c  >&5
-configure:4594: $? = 0
-configure:4594: result: yes
-configure:4602: checking dirent.h usability
-configure:4602: gcc -c -g  conftest.c >&5
-configure:4602: $? = 0
-configure:4602: result: yes
-configure:4602: checking dirent.h presence
-configure:4602: gcc -E -x c  conftest.c
-configure:4602: $? = 0
-configure:4602: result: yes
-configure:4602: checking for dirent.h
-configure:4602: result: yes
-configure:4615: checking limits.h usability
-configure:4615: gcc -c -g  conftest.c >&5
-configure:4615: $? = 0
-configure:4615: result: yes
-configure:4615: checking limits.h presence
-configure:4615: gcc -E -x c  conftest.c
-configure:4615: $? = 0
-configure:4615: result: yes
-configure:4615: checking for limits.h
-configure:4615: result: yes
-configure:4628: checking param.h usability
-configure:4628: gcc -c -g  conftest.c >&5
+configure:4451: result: no
+configure:4470: checking for ANSI C header files
+configure:4574: result: yes
+configure:4586: checking for setenv
+configure:4586: gcc -o conftest -g   conftest.c  >&5
+configure:4586: $? = 0
+configure:4586: result: yes
+configure:4586: checking for putenv
+configure:4586: gcc -o conftest -g   conftest.c  >&5
+configure:4586: $? = 0
+configure:4586: result: yes
+configure:4596: checking for vfork
+configure:4596: gcc -o conftest -g   conftest.c  >&5
+configure:4596: $? = 0
+configure:4596: result: yes
+configure:4604: checking dirent.h usability
+configure:4604: gcc -c -g  conftest.c >&5
+configure:4604: $? = 0
+configure:4604: result: yes
+configure:4604: checking dirent.h presence
+configure:4604: gcc -E -x c  conftest.c
+configure:4604: $? = 0
+configure:4604: result: yes
+configure:4604: checking for dirent.h
+configure:4604: result: yes
+configure:4617: checking limits.h usability
+configure:4617: gcc -c -g  conftest.c >&5
+configure:4617: $? = 0
+configure:4617: result: yes
+configure:4617: checking limits.h presence
+configure:4617: gcc -E -x c  conftest.c
+configure:4617: $? = 0
+configure:4617: result: yes
+configure:4617: checking for limits.h
+configure:4617: result: yes
+configure:4630: checking param.h usability
+configure:4630: gcc -c -g  conftest.c >&5
 conftest.c:63:19: fatal error: param.h: No such file or directory
  #include <param.h>
                    ^
 compilation terminated.
-configure:4628: $? = 1
+configure:4630: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -382,7 +382,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "45"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -437,14 +437,14 @@ configure: failed program was:
 | # include <unistd.h>
 | #endif
 | #include <param.h>
-configure:4628: result: no
-configure:4628: checking param.h presence
-configure:4628: gcc -E -x c  conftest.c
+configure:4630: result: no
+configure:4630: checking param.h presence
+configure:4630: gcc -E -x c  conftest.c
 conftest.c:30:19: fatal error: param.h: No such file or directory
  #include <param.h>
                    ^
 compilation terminated.
-configure:4628: $? = 1
+configure:4630: $? = 1
 configure: failed program was:
 | /* confdefs.h */
 | #define PACKAGE_NAME "netgen"
@@ -454,7 +454,7 @@ configure: failed program was:
 | #define PACKAGE_BUGREPORT "[email protected]"
 | #define PACKAGE_URL ""
 | #define NETGEN_VERSION "1.5"
-| #define NETGEN_REVISION "45"
+| #define NETGEN_REVISION "60"
 | #define STDC_HEADERS 1
 | #define HAVE_SYS_TYPES_H 1
 | #define HAVE_SYS_STAT_H 1
@@ -476,52 +476,52 @@ configure: failed program was:
 | #define HAVE_LIMITS_H 1
 | /* end confdefs.h.  */
 | #include <param.h>
-configure:4628: result: no
-configure:4628: checking for param.h
-configure:4628: result: no
-configure:4639: checking for va_copy
-configure:4657: gcc -o conftest -g   conftest.c  >&5
-configure:4657: $? = 0
-configure:4666: result: yes
-configure:4674: checking for __va_copy
-configure:4692: gcc -o conftest -g   conftest.c  >&5
-configure:4692: $? = 0
-configure:4701: result: yes
-configure:4831: checking for tclConfig.sh
-configure:4903: result: /usr/lib64/tclConfig.sh
-configure:4919: checking for tkConfig.sh
-configure:4992: result: /usr/lib64/tkConfig.sh
-configure:5106: checking for wish executable
-configure:5133: result: /usr/bin/wish
-configure:5139: checking for tclsh executable
-configure:5165: result: /usr/bin/tclsh
-configure:5288: checking for X
-configure:5427: gcc -o conftest -g   conftest.c -lX11  >&5
-configure:5427: $? = 0
-configure:5477: result: libraries , headers 
-configure:5576: gcc -o conftest -g   conftest.c   -lX11 >&5
-configure:5576: $? = 0
-configure:5674: checking for gethostbyname
-configure:5674: gcc -o conftest -g   conftest.c  >&5
-configure:5674: $? = 0
-configure:5674: result: yes
-configure:5771: checking for connect
-configure:5771: gcc -o conftest -g   conftest.c  >&5
-configure:5771: $? = 0
-configure:5771: result: yes
-configure:5820: checking for remove
-configure:5820: gcc -o conftest -g   conftest.c  >&5
-configure:5820: $? = 0
-configure:5820: result: yes
-configure:5869: checking for shmat
-configure:5869: gcc -o conftest -g   conftest.c  >&5
-configure:5869: $? = 0
-configure:5869: result: yes
-configure:5927: checking for IceConnectionNumber in -lICE
-configure:5952: gcc -o conftest -g   conftest.c -lICE   >&5
-configure:5952: $? = 0
-configure:5961: result: yes
-configure:6675: creating ./config.status
+configure:4630: result: no
+configure:4630: checking for param.h
+configure:4630: result: no
+configure:4641: checking for va_copy
+configure:4659: gcc -o conftest -g   conftest.c  >&5
+configure:4659: $? = 0
+configure:4668: result: yes
+configure:4676: checking for __va_copy
+configure:4694: gcc -o conftest -g   conftest.c  >&5
+configure:4694: $? = 0
+configure:4703: result: yes
+configure:4834: checking for tclConfig.sh
+configure:4906: result: /usr/lib64/tclConfig.sh
+configure:4922: checking for tkConfig.sh
+configure:4995: result: /usr/lib64/tkConfig.sh
+configure:5128: checking for wish executable
+configure:5155: result: /usr/bin/wish
+configure:5161: checking for tclsh executable
+configure:5187: result: /usr/bin/tclsh
+configure:5310: checking for X
+configure:5449: gcc -o conftest -g   conftest.c -lX11  >&5
+configure:5449: $? = 0
+configure:5499: result: libraries , headers 
+configure:5598: gcc -o conftest -g   conftest.c   -lX11 >&5
+configure:5598: $? = 0
+configure:5696: checking for gethostbyname
+configure:5696: gcc -o conftest -g   conftest.c  >&5
+configure:5696: $? = 0
+configure:5696: result: yes
+configure:5793: checking for connect
+configure:5793: gcc -o conftest -g   conftest.c  >&5
+configure:5793: $? = 0
+configure:5793: result: yes
+configure:5842: checking for remove
+configure:5842: gcc -o conftest -g   conftest.c  >&5
+configure:5842: $? = 0
+configure:5842: result: yes
+configure:5891: checking for shmat
+configure:5891: gcc -o conftest -g   conftest.c  >&5
+configure:5891: $? = 0
+configure:5891: result: yes
+configure:5949: checking for IceConnectionNumber in -lICE
+configure:5974: gcc -o conftest -g   conftest.c -lICE   >&5
+configure:5974: $? = 0
+configure:5983: result: yes
+configure:6705: creating ./config.status
 
 ## ---------------------- ##
 ## Running config.status. ##
@@ -538,8 +538,8 @@ generated by GNU Autoconf 2.69.  Invocation command line was
 
 on stravinsky
 
-config.status:781: creating defs.mak
-config.status:884: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
+config.status:783: creating defs.mak
+config.status:886: WARNING:  'defs.mak.in' seems to ignore the --datarootdir setting
 
 ## ---------------- ##
 ## Cache variables. ##
@@ -621,7 +621,7 @@ CC='gcc'
 CFLAGS='-g -m64 -fPIC'
 CPP='gcc -E -x c'
 CPPFLAGS=''
-DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"45\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
+DEFS='-DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1'
 DEPEND_FLAG='-MM'
 ECHO_C=''
 ECHO_N='printf'
@@ -641,7 +641,8 @@ LDFLAGS=''
 LD_RUN_PATH=''
 LIBOBJS=''
 LIBS=''
-LIB_SPECS=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
+LIB_SPECS=' -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6'
+LIB_SPECS_NOSTUB=' -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6'
 LTLIBOBJS=''
 M4='/bin/m4'
 OBJEXT='o'
@@ -712,6 +713,7 @@ programs=' tcltk'
 psdir='${docdir}'
 sbindir='${exec_prefix}/sbin'
 sharedstatedir='${prefix}/com'
+stub_defs=' -DUSE_TCL_STUBS -DUSE_TK_STUBS'
 sub_extra_libs=''
 sysconfdir='${prefix}/etc'
 target='x86_64-unknown-linux-gnu'
@@ -734,7 +736,7 @@ unused=''
 #define PACKAGE_BUGREPORT "[email protected]"
 #define PACKAGE_URL ""
 #define NETGEN_VERSION "1.5"
-#define NETGEN_REVISION "45"
+#define NETGEN_REVISION "60"
 #define STDC_HEADERS 1
 #define HAVE_SYS_TYPES_H 1
 #define HAVE_SYS_STAT_H 1

scripts/config.status

@@ -601,6 +601,7 @@ S["sub_extra_libs"]=""
 S["top_extra_libs"]=""
 S["ld_extra_objs"]=""
 S["ld_extra_libs"]=""
+S["stub_defs"]=" -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 S["extra_defs"]=" -DCAD_DIR=\\\"${LIBDIR}\\\" -DTCL_DIR=\\\"${TCLDIR}\\\""
 S["extra_libs"]=" ${NETGENDIR}/tcltk/libtcltk.o"
 S["SCRIPTS"]=""
@@ -609,7 +610,8 @@ S["VERSION"]=""
 S["TCL_LIB_DIR"]="/usr/lib"
 S["TCLSH_EXE"]="/usr/bin/tclsh"
 S["WISH_EXE"]="/usr/bin/wish"
-S["LIB_SPECS"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
+S["LIB_SPECS_NOSTUB"]=" -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6"
+S["LIB_SPECS"]=" -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6"
 S["INC_SPECS"]=""
 S["EXTRA_LIB_SPECS"]="-ldl"
 S["SHLIB_LIB_SPECS"]=""
@@ -657,7 +659,7 @@ S["ECHO_T"]=""
 S["ECHO_N"]="-n"
 S["ECHO_C"]=""
 S["DEFS"]="-DPACKAGE_NAME=\\\"netgen\\\" -DPACKAGE_TARNAME=\\\"netgen\\\" -DPACKAGE_VERSION=\\\"1.3\\\" -DPACKAGE_STRING=\\\"netgen\\ 1.3\\\" -DPACKAGE_BUGREPORT=\\\"eda-dev@open"\
-"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"45\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
+"circuitdesign.com\\\" -DPACKAGE_URL=\\\"\\\" -DNETGEN_VERSION=\\\"1.5\\\" -DNETGEN_REVISION=\\\"60\\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -"\
 "DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -D"\
 "SIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHA"\
 "VE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1"

scripts/configure

@@ -641,6 +641,7 @@ sub_extra_libs
 top_extra_libs
 ld_extra_objs
 ld_extra_libs
+stub_defs
 extra_defs
 extra_libs
 SCRIPTS
@@ -649,6 +650,7 @@ VERSION
 TCL_LIB_DIR
 TCLSH_EXE
 WISH_EXE
+LIB_SPECS_NOSTUB
 LIB_SPECS
 INC_SPECS
 EXTRA_LIB_SPECS
@@ -4712,6 +4714,7 @@ fi
 $as_echo "#define DBUG_OFF 1" >>confdefs.h
 
 
+stub_defs=""
 extra_defs="$extra_defs -DCAD_DIR=\\\"\${LIBDIR}\\\""
 X_LIBS=
 X_CFLAGS=
@@ -4861,7 +4864,7 @@ $as_echo_n "checking for tclConfig.sh... " >&6; }
     #  1. Search previously named locations.
 
     for dir in \
-     $prefix \
+     $ac_default_prefix \
      $exec_prefix
     do
       if test -r "$dir/tclConfig.sh" ; then
@@ -4948,7 +4951,7 @@ $as_echo_n "checking for tkConfig.sh... " >&6; }
     #  1. Search previously named locations.
     #
     for dir in \
-     $prefix \
+     $ac_default_prefix \
      $exec_prefix
     do
       if test -r "$dir/tkConfig.sh" ; then
@@ -5007,6 +5010,25 @@ if test $usingTcl ; then
   . $tcl_config_sh
   . $tk_config_sh
 
+  # Should probably trust the config file contents, but this configure
+  # file checks the Tcl and Tk include and lib directories.  Since
+  # the config file doesn't separate out the libraries from the strings
+  # passed to the compiler/linker, do it manually here.
+  #
+  # Extract TCL_LIB_DIR from TCL_LIB_SPEC
+  # Extract TK_LIB_DIR from TK_LIB_SPEC
+  # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC
+  # Extract TK_INC_DIR from TK_INCLUDE_SPEC
+  #
+  # These will be the defaults unless overridden by configure command line
+
+  tmpstr=${TCL_LIB_SPEC#*-L}
+  TCL_LIB_DIR=${tmpstr% -l*}
+  tmpstr=${TK_LIB_SPEC#*-L}
+  TK_LIB_DIR=${tmpstr% -l*}
+  TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I}
+  TK_INC_DIR=${TK_INCLUDE_SPEC#*-I}
+
   if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
     :
   elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then
@@ -5992,6 +6014,7 @@ if test $usingTcl ; then
 
   extra_libs="$extra_libs \${NETGENDIR}/tcltk/libtcltk.o"
   extra_defs="$extra_defs -DTCL_DIR=\\\"\${TCLDIR}\\\""
+  stub_defs="$stub_defs -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 else
   programs="$programs netgen"
   unused="$unused tcltk"
@@ -6070,6 +6093,7 @@ esac
 # -----------------------------------------------------------------------
 
 if test $usingTcl ; then
+    LIB_SPECS_NOSTUB="${LIB_SPECS}"
 
 # -----------------------------------------------------------------------
 #
@@ -6081,9 +6105,11 @@ if test $usingTcl ; then
   fi
   if test "${TK_LIB_DIR}" = "/usr/lib" -o \
         "${TK_LIB_DIR}" = "/usr/lib64" ; then
-    LIB_SPECS="${LIB_SPECS} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TK_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TK_LIB_DIR}"
     else
@@ -6107,9 +6133,11 @@ if test $usingTcl ; then
   if test "${TCL_LIB_DIR}" = "/usr/lib" -o \
         "${TCL_LIB_DIR}" = "/usr/lib64" -o \
         "${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then
-    LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TCL_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TCL_LIB_DIR}"
     else
@@ -6482,6 +6510,7 @@ fi
 
 
 
+
 fi
 
 if test "$GCC" = "yes" ; then
@@ -6517,6 +6546,7 @@ fi
 
 
 
+
 
 
 ac_config_files="$ac_config_files defs.mak"

scripts/configure.in

@@ -195,6 +195,7 @@ fi
 # not ANSI-compliant and won't compile without quite a bit of work.
 AC_DEFINE(DBUG_OFF)
 
+stub_defs=""
 extra_defs="$extra_defs -DCAD_DIR=\\\"\${LIBDIR}\\\""
 X_LIBS=
 X_CFLAGS=
@@ -472,6 +473,25 @@ if test $usingTcl ; then
   . $tcl_config_sh
   . $tk_config_sh
 
+  # Should probably trust the config file contents, but this configure
+  # file checks the Tcl and Tk include and lib directories.  Since
+  # the config file doesn't separate out the libraries from the strings
+  # passed to the compiler/linker, do it manually here.
+  #
+  # Extract TCL_LIB_DIR from TCL_LIB_SPEC
+  # Extract TK_LIB_DIR from TK_LIB_SPEC
+  # Extract TCL_INC_DIR from TCL_INCLUDE_SPEC
+  # Extract TK_INC_DIR from TK_INCLUDE_SPEC
+  #
+  # These will be the defaults unless overridden by configure command line
+
+  tmpstr=${TCL_LIB_SPEC#*-L}
+  TCL_LIB_DIR=${tmpstr% -l*}
+  tmpstr=${TK_LIB_SPEC#*-L}
+  TK_LIB_DIR=${tmpstr% -l*}
+  TCL_INC_DIR=${TCL_INCLUDE_SPEC#*-I}
+  TK_INC_DIR=${TK_INCLUDE_SPEC#*-I}
+
   if test "$TCL_VERSION" = "7.6" -a "$TK_VERSION" = "4.2" ; then
     :
   elif test "$TCL_VERSION" = "7.5" -a "$TK_VERSION" = "4.1" ; then
@@ -779,6 +799,7 @@ if test $usingTcl ; then
   AC_DEFINE(TCL_NETGEN)
   extra_libs="$extra_libs \${NETGENDIR}/tcltk/libtcltk.o"
   extra_defs="$extra_defs -DTCL_DIR=\\\"\${TCLDIR}\\\""
+  stub_defs="$stub_defs -DUSE_TCL_STUBS -DUSE_TK_STUBS"
 else
   programs="$programs netgen"
   unused="$unused tcltk"
@@ -858,6 +879,7 @@ esac
 # -----------------------------------------------------------------------
 
 if test $usingTcl ; then
+    LIB_SPECS_NOSTUB="${LIB_SPECS}"
 
 # -----------------------------------------------------------------------
 #
@@ -869,9 +891,11 @@ if test $usingTcl ; then
   fi
   if test "${TK_LIB_DIR}" = "/usr/lib" -o \
         "${TK_LIB_DIR}" = "/usr/lib64" ; then
-    LIB_SPECS="${LIB_SPECS} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TK_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TK_LIB_DIR} ${TK_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TK_LIB_DIR} ${TK_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TK_LIB_DIR}"
     else
@@ -895,9 +919,11 @@ if test $usingTcl ; then
   if test "${TCL_LIB_DIR}" = "/usr/lib" -o \
         "${TCL_LIB_DIR}" = "/usr/lib64" -o \
         "${TCL_LIB_DIR}" = "${TK_LIB_DIR}" ; then
-    LIB_SPECS="${LIB_SPECS} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} ${TCL_STUB_LIB_SPEC}"
   else
-    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS_NOSTUB="${LIB_SPECS_NOSTUB} -L${TCL_LIB_DIR} ${TCL_LIB_SPEC}"
+    LIB_SPECS="${LIB_SPECS} -L${TCL_LIB_DIR} ${TCL_STUB_LIB_SPEC}"
     if test "x${loader_run_path}" = "x" ; then
       loader_run_path="${TCL_LIB_DIR}"
     else
@@ -1216,6 +1242,7 @@ if test $usingTcl ; then
   AC_SUBST(LDFLAGS)
   AC_SUBST(INC_SPECS)
   AC_SUBST(LIB_SPECS)
+  AC_SUBST(LIB_SPECS_NOSTUB)
   AC_SUBST(WISH_EXE)
   AC_SUBST(TCLSH_EXE)
   AC_SUBST(TCL_LIB_DIR)
@@ -1233,6 +1260,7 @@ AC_SUBST(PACKAGE)
 AC_SUBST(SCRIPTS)
 AC_SUBST(extra_libs)
 AC_SUBST(extra_defs)
+AC_SUBST(stub_defs)
 AC_SUBST(ld_extra_libs)
 AC_SUBST(ld_extra_objs)
 AC_SUBST(top_extra_libs)

scripts/defs.mak

@@ -56,7 +56,8 @@ RANLIB                 = ranlib
 SHDLIB_EXT	       = .so
 LDDL_FLAGS             =  -shared -Wl,-soname,$@ -Wl,--version-script=${NETGENDIR}/netgen/symbol.map
 LD_RUN_PATH            = 
-LIB_SPECS              =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
+LIB_SPECS              =  -L/usr/lib64 -ltkstub8.6 -L/usr/lib64 -ltclstub8.6
+LIB_SPECS_NOSTUB       =  -L/usr/lib64 -ltk8.6 -L/usr/lib64 -ltcl8.6
 WISH_EXE	       = /usr/bin/wish
 TCL_LIB_DIR	       = /usr/lib
 
@@ -65,7 +66,8 @@ CPP                    = gcc -E -x c
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} 
-DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"45\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS                 =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\"  -DUSE_TCL_STUBS -DUSE_TK_STUBS -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
+DFLAGS_NOSTUB          =  -DCAD_DIR=\"${LIBDIR}\" -DTCL_DIR=\"${TCLDIR}\" -DPACKAGE_NAME=\"netgen\" -DPACKAGE_TARNAME=\"netgen\" -DPACKAGE_VERSION=\"1.3\" -DPACKAGE_STRING=\"netgen\ 1.3\" -DPACKAGE_BUGREPORT=\"[email protected]\" -DPACKAGE_URL=\"\" -DNETGEN_VERSION=\"1.5\" -DNETGEN_REVISION=\"60\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DSIZEOF_VOID_P=8 -DSIZEOF_UNSIGNED_INT=4 -DSIZEOF_UNSIGNED_LONG=8 -DSIZEOF_UNSIGNED_LONG_LONG=8 -DSTDC_HEADERS=1 -DHAVE_SETENV=1 -DHAVE_PUTENV=1 -DHAVE_DIRENT_H=1 -DHAVE_LIMITS_H=1 -DHAVE_VA_COPY=1 -DHAVE___VA_COPY=1 -DDBUG_OFF=1 -DTCL_NETGEN=1 -Dlinux=1 -DSYSV=1 -DISC=1 -DSHDLIB_EXT=\".so\" -DNDEBUG
 CFLAGS                 = -g -m64 -fPIC -fPIC 
 
 DEPEND_FILE            = Depend

scripts/defs.mak.in

@@ -57,6 +57,7 @@ SHDLIB_EXT	       = @SHDLIB_EXT@
 LDDL_FLAGS             = @LDDL_FLAGS@
 LD_RUN_PATH            = @LD_RUN_PATH@
 LIB_SPECS              = @LIB_SPECS@
+LIB_SPECS_NOSTUB       = @LIB_SPECS_NOSTUB@
 WISH_EXE	       = @WISH_EXE@
 TCL_LIB_DIR	       = @TCL_LIB_DIR@
 
@@ -65,7 +66,8 @@ CPP                    = @CPP@
 CXX                    = @CXX@
 
 CPPFLAGS               = -I. -I${NETGENDIR} @CPPFLAGS@
-DFLAGS                 = @extra_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
+DFLAGS                 = @extra_defs@ @stub_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
+DFLAGS_NOSTUB          = @extra_defs@ @DEFS@ -DSHDLIB_EXT=\"@SHDLIB_EXT@\" -DNDEBUG
 CFLAGS                 = @CFLAGS@ @SHLIB_CFLAGS@ @INC_SPECS@
 
 DEPEND_FILE            = Depend

tcltk/Makefile

@@ -23,8 +23,9 @@ install-tcl: netgenexec${EXEEXT} $(DESTDIR)${BINDIR}/netgen.sh ${TCL_FILES}
 	${CP} netgenexec${EXEEXT} $(DESTDIR)${TCLDIR}/netgenexec${EXEEXT}
 
 netgenexec${EXEEXT}: netgenexec.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS} netgenexec.c -o netgenexec${EXEEXT} \
-		${LDFLAGS} ${LIBS} ${LIB_SPECS}
+	${CC} ${CFLAGS} ${CPPFLAGS} ${DFLAGS_NOSTUB} netgenexec.c \
+		-o netgenexec${EXEEXT} \
+		${LDFLAGS} ${LIBS} ${LIB_SPECS_NOSTUB}
 
 netgen.tcl: netgen.tcl.in
 	sed -e /TCL_DIR/s%TCL_DIR%${TCLDIR}%g \

tcltk/netgen.tcl.in

@@ -20,7 +20,11 @@ foreach i $nlist {
    }
 }
 
-load TCL_DIR/tclnetgenSHDLIB_EXT
+if {${tcl_version} >= 8.6} {
+   load -lazy TCL_DIR/tclnetgenSHDLIB_EXT
+} else {
+   load TCL_DIR/tclnetgenSHDLIB_EXT
+}
 
 #----------------------------------------------------------------
 # Define the "lvs" command as a way of calling the netgen options
@@ -126,7 +130,7 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
       }
    } else {
       netgen::permute default	;# transistors and resistors
-      netgen::combine default	;# standard parallel/serial allowances
+      netgen::property default
    }
 
    puts stdout "Comparison output logged to file $logfile"
@@ -145,8 +149,8 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
       if {[verify equivalent]} {
 	 # Resolve automorphisms by pin and property
          netgen::run resolve
-	 set result [verify unique]
-         if {$result == 0} {
+	 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"
@@ -161,10 +165,15 @@ proc netgen::lvs { name1 name2 {setupfile setup.tcl} {logfile comp.out}} {
 	 } else {
 	    # Match pins
             netgen::log echo off
-	    equate pins "$fnum1 [lindex $endval 0]" "$fnum2 [lindex $endval 1]"
+	    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]"
+	    }
             netgen::log echo on
 	 }
-	 if {$result == 2} {lappend properr [lindex $endval 0]}
+	 if {$uresult == 2} {lappend properr [lindex $endval 0]}
       } else {
 	 # Flatten the non-matching subcircuit (but not the top-level cells)
          if {[netgen::print queue] != {}} {

tcltk/tclnetgen.c

@@ -91,7 +91,6 @@ 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_combine(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_restart(ClientData, Tcl_Interp *, int, Tcl_Obj *CONST objv[]);
@@ -122,7 +121,7 @@ Command netgen_cmds[] = {
 		"<format> <file>\n   "
 		"write a netlist file"},
 	{"flatten",		_netgen_flatten,
-		"[class] <cell>\n   "
+		"[class] [<parent>] <cell>\n   "
 		"flatten a hierarchical cell"},
 	{"nodes",		_netgen_nodes,
 		"[<element>] <cell> <file>\n   "
@@ -231,14 +230,8 @@ Command netcmp_cmds[] = {
 		"capacitor: enable capacitor permutations\n   "
 		"transistor: enable transistor permutations\n   "
 		"(none): enable transistor and resistor permutations"},
-	{"combine",		_netcmp_combine,
-		"[transistors|resistors|capacitors|<model>]\n   "
-		"<model> [<serial>|<parallel>]: enable combinations of device model\n   "
-		"resistor: enable resistor serial/parallel combinations\n   "
-		"capacitor: enable capacitor parallel combinations\n   "
-		"transistor: enable transistor parallel combinations\n   "
-		"(none): enable standard combinations"},
 	{"property",		_netcmp_property,
+		"default: apply property defaults\n   "
 		"<device>|<model> <property_key> [...]\n   "
 		"<device>: name of a device type (capacitor, etc.)\n  "
 		"<model>: name of a device model\n   "
@@ -1005,9 +998,9 @@ _netgen_flatten(ClientData clientData,
 {
    char *repstr, *file;
    int result, llen, filenum;
-   struct nlist *tp;
+   struct nlist *tp, *tp2;
 
-   if ((objc < 2) || (objc > 3)) {
+   if ((objc < 2) || (objc > 4)) {
       Tcl_WrongNumArgs(interp, 1, objv, "?class? valid_cellname");
       return TCL_ERROR;
    }
@@ -1016,12 +1009,32 @@ _netgen_flatten(ClientData clientData,
    if (result != TCL_OK) return result;
    repstr = tp->name;
 
-   if (objc == 3) {
+   if (objc >= 3) {
       char *argv = Tcl_GetString(objv[1]);
       if (!strcmp(argv, "class")) {
 	 tp = GetTopCell(filenum);
-	 Printf("Flattening instances of %s in file %s\n", repstr, tp->name);
-         FlattenInstancesOf(repstr, filenum);
+
+	 if (objc == 4) {
+	    int numflat;
+	    tp2 = LookupCellFile(Tcl_GetString(objv[2]), filenum);
+	    if (tp2 == NULL) {
+		Tcl_SetResult(interp, "No such cell.", NULL);
+		return TCL_ERROR;
+	    }
+	    else {
+	        Printf("Flattening instances of %s in cell %s within file %s\n",
+			repstr, tp2->name, tp->name);
+		numflat = flattenInstancesOf(tp2->name, filenum, repstr);
+		if (numflat == 0) {
+		   Tcl_SetResult(interp, "No instances found to flatten.", NULL);
+		   return TCL_ERROR;
+		}
+	    }
+	 }
+	 else {
+	    Printf("Flattening instances of %s in file %s\n", repstr, tp->name);
+            FlattenInstancesOf(repstr, filenum);
+	 }
       }
       else {
 	 Tcl_WrongNumArgs(interp, 1, objv, "class valid_cellname");
@@ -2009,8 +2022,9 @@ _netcmp_compare(ClientData clientData,
       return TCL_ERROR;
    }
 
-   CleanupPins(name1, fnum1);		// Remove unconnected pins
-   CleanupPins(name2, fnum2);		// Remove unconnected pins
+   // WIP!
+   // CleanupPins(name1, fnum1);		// Remove unconnected pins
+   // CleanupPins(name2, fnum2);		// Remove unconnected pins
 
    UniquePins(name1, fnum1);		// Check for and remove duplicate pins
    UniquePins(name2, fnum2);		// Check for and remove duplicate pins
@@ -2025,8 +2039,9 @@ _netcmp_compare(ClientData clientData,
    // but define global nodes that are brought out as ports by
    // ConvertGlobals().
 
-   CleanupPins(name1, fnum1);
-   CleanupPins(name2, fnum2);
+   // WIP!
+   // CleanupPins(name1, fnum1);
+   // CleanupPins(name2, fnum2);
 
    CreateTwoLists(name1, fnum1, name2, fnum2);
    while (PrematchLists(name1, fnum1, name2, fnum2) > 0) {
@@ -2342,8 +2357,11 @@ _netcmp_verify(ClientData clientData,
    if (ElementClasses == NULL || NodeClasses == NULL) {
       if (index == EQUIV_IDX || index == UNIQUE_IDX)
 	 Tcl_SetObjResult(interp, Tcl_NewIntObj(-1));
+      else if (CurrentCell != NULL)
+	 Fprintf(stdout, "Verify:  cell %s has no elements and/or nodes."
+		"  Not checked.\n", CurrentCell->name);
       else
-	 Fprintf(stdout, "Cell has no elements and/or nodes.  Not checked.\n");
+	 Fprintf(stdout, "Verify:  no current cell to verify.\n");
       return TCL_OK;
    }
    else {
@@ -2500,10 +2518,10 @@ _netcmp_ignore(ClientData clientData,
     Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
 {
    char *options[] = {
-      "class", NULL
+      "class", "shorted", NULL
    };
    enum OptionIdx {
-      CLASS_IDX
+      CLASS_IDX, SHORTED_IDX
    };
    int result, index;
    int file = -1;
@@ -2524,7 +2542,14 @@ _netcmp_ignore(ClientData clientData,
       Tcl_WrongNumArgs(interp, 1, objv, "[class] valid_cellname");
       return TCL_ERROR;
    }
-   IgnoreClass(name, file);
+   switch (index) {
+      case CLASS_IDX:
+         IgnoreClass(name, file, IGNORE_CLASS);
+	 break;
+      case SHORTED_IDX:
+         IgnoreClass(name, file, IGNORE_SHORTED);
+	 break;
+   }
    return TCL_OK;
 }
 
@@ -2691,7 +2716,10 @@ _netcmp_equate(ClientData clientData,
 
       case ELEM_IDX:
 	 if (ElementClasses == NULL) {
-	    Fprintf(stderr, "Cell has no elements.\n");
+	    if (CurrentCell == NULL)
+		Fprintf(stderr, "Equate elements:  no current cell.\n");
+	    Fprintf(stderr, "Equate elements:  cell %s and/or %s has no elements.\n",
+			name1, name2);
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
 	    return TCL_OK;
 	 }
@@ -2707,7 +2735,10 @@ _netcmp_equate(ClientData clientData,
 
       case PINS_IDX:
 	 if (ElementClasses == NULL) {
-	    Fprintf(stderr, "Cell has no elements.\n");
+	    if (CurrentCell == NULL)
+		Fprintf(stderr, "Equate elements:  no current cell.\n");
+	    Fprintf(stderr, "Equate pins:  cell %s and/or %s has no elements.\n",
+			name1, name2);
 	    Tcl_SetObjResult(interp, Tcl_NewBooleanObj(0));
 	    return TCL_OK;
 	 }
@@ -2939,6 +2970,9 @@ _netcmp_equate(ClientData clientData,
 /*	add	  --- add new property			*/
 /*	remove	  --- delete existing property		*/
 /*	tolerance --- set property tolerance		*/
+/*	merge	  --- set property merge behavior	*/
+/* or							*/
+/*	netgen::property default			*/
 /* Formerly: (none)					*/
 /* Results:						*/
 /* Side Effects:					*/
@@ -2956,10 +2990,10 @@ _netcmp_property(ClientData clientData,
     int ival, argstart;
 
     char *options[] = {
-	"add", "create", "remove", "delete", "tolerance", NULL
+	"add", "create", "remove", "delete", "tolerance", "merge", NULL
     };
     enum OptionIdx {
-	ADD_IDX, CREATE_IDX, REMOVE_IDX, DELETE_IDX, TOLERANCE_IDX
+	ADD_IDX, CREATE_IDX, REMOVE_IDX, DELETE_IDX, TOLERANCE_IDX, MERGE_IDX
     };
     int result, index, idx2;
 
@@ -2970,10 +3004,55 @@ _netcmp_property(ClientData clientData,
 	INTEGER_IDX, DOUBLE_IDX, VALUE_IDX, STRING_IDX
     };
 
+    char *mergeoptions[] = {
+	"none", "add", "add_critical", "par", "par_critical", NULL
+    };
+    enum MergeOptionIdx {
+	NONE_IDX, ADD_ONLY_IDX, ADD_CRIT_IDX, PAR_ONLY_IDX, PAR_CRIT_IDX
+    };
+
     if (objc < 2) {
 	Tcl_WrongNumArgs(interp, 1, objv, "valid_cellname ?option?");
 	return TCL_ERROR;
     }
+
+    /* Check for special command "property default" */
+    if ((objc == 2) && (!strcmp(Tcl_GetString(objv[1]), "default"))) {
+
+	/* For each FET device, do "merge {w add_critical}" and	*/
+	/* "remove as ad ps pd".  This allows parallel devices	*/
+	/* to be added by width, and prevents attempts to	*/
+	/* compare source/drain area and perimeter.		*/
+
+	tp = FirstCell();
+	 while (tp != NULL) {
+	     switch (tp->class) {
+		case CLASS_NMOS: case CLASS_PMOS: case CLASS_FET3:
+		case CLASS_NMOS4: case CLASS_PMOS4: case CLASS_FET4:
+		case CLASS_FET:
+		    PropertyMerge(tp->name, tp->file, "w", MERGE_ADD_CRIT);
+		    PropertyDelete(tp->name, tp->file, "as");
+		    PropertyDelete(tp->name, tp->file, "ad");
+		    PropertyDelete(tp->name, tp->file, "ps");
+		    PropertyDelete(tp->name, tp->file, "pd");
+		    break;
+		case CLASS_RES: case CLASS_RES3:
+		    PropertyMerge(tp->name, tp->file, "l", MERGE_PAR_CRIT);
+		    break;
+		case CLASS_CAP: case CLASS_ECAP: case CLASS_CAP3:
+		    // NOTE:  No attempt to combine area, width, or length;
+		    // only value.
+		    PropertyMerge(tp->name, tp->file, "value", MERGE_ADD_CRIT);
+		    break;
+		case CLASS_INDUCTOR:
+		    PropertyMerge(tp->name, tp->file, "value", MERGE_PAR_CRIT);
+		    break;
+	    }
+	    tp = NextCell();
+	}
+	return TCL_OK;
+    }
+
     result = CommonParseCell(interp, objv[1], &tp, &fnum);
     if (result != TCL_OK) return result;
 
@@ -2981,7 +3060,7 @@ _netcmp_property(ClientData clientData,
 	/* Print all properties of the cell as key/type/tolerance triplets */
 	tobj1 = Tcl_NewListObj(0, NULL);
 
-	kl = (struct property *)HashFirst(tp->proptab, OBJHASHSIZE);
+	kl = (struct property *)HashFirst(&(tp->propdict));
 	while (kl != NULL) {
 	    tobj2 = Tcl_NewListObj(0, NULL);
 
@@ -3008,7 +3087,7 @@ _netcmp_property(ClientData clientData,
 
 	    Tcl_ListObjAppendElement(interp, tobj1, tobj2);
 
-	    kl = (struct property *)HashNext(tp->proptab, OBJHASHSIZE);
+	    kl = (struct property *)HashNext(&(tp->propdict));
 	}
 	Tcl_SetObjResult(interp, tobj1);
     }
@@ -3144,11 +3223,9 @@ _netcmp_property(ClientData clientData,
 		if (objc == 3) {
 		    /* "remove" without additional arguments means	*/
 		    /* delete all properties.				*/
-		    RecurseHashTable(tp->proptab, OBJHASHSIZE, freeprop);
-		    HashKill(tp->proptab, OBJHASHSIZE);
-		    FREE(tp->proptab);
-		    tp->proptab = (struct hashlist **)CALLOC(OBJHASHSIZE,
-				sizeof(struct hashlist *));
+		    RecurseHashTable(&(tp->propdict), freeprop);
+		    HashKill(&(tp->propdict));
+		    InitializeHashTable(&(tp->propdict), OBJHASHSIZE);
 		}
 		else {
 		    for (i = 3; i < objc; i++)
@@ -3175,190 +3252,73 @@ _netcmp_property(ClientData clientData,
 			if (result != TCL_OK) return result;
 
 			result = Tcl_GetIntFromObj(interp, tobj2, &ival);
-			if (result != TCL_OK) Tcl_ResetResult(interp);
-			if ((result = Tcl_GetDoubleFromObj(interp, tobj2, &dval))
-				!= TCL_OK)
-			    return result;
-
+			if (result != TCL_OK) {
+			    Tcl_ResetResult(interp);
+			    if (!strncasecmp(Tcl_GetString(tobj2), "inf", 3)) {
+				ival = 1<<30;
+				dval = 1.0E+300;
+			    }
+			    else if ((result = Tcl_GetDoubleFromObj(interp, tobj2, &dval))
+					!= TCL_OK)
+				return result;
+			}
 			PropertyTolerance(tp->name, fnum, Tcl_GetString(tobj1),
 					ival, dval);
 		    }
 		}
 		break;
+
+	    case MERGE_IDX:
+		if (objc == 3) {
+		    Tcl_WrongNumArgs(interp, 1, objv, "{property_key merge_type} ...");
+		    return TCL_ERROR;
+		}
+		for (i = 3; i < objc; i++) {
+		    // Each value must be a duplet
+		    result = Tcl_ListObjLength(interp, objv[i], &llen);
+		    if ((result != TCL_OK) || (llen != 2)) {
+			Tcl_SetResult(interp, "Not a {key merge_type} pair list.",
+					NULL);
+		    }
+		    else {
+			int mergeval;
+
+			result = Tcl_ListObjIndex(interp, objv[i], 0, &tobj1);
+			if (result != TCL_OK) return result;
+			result = Tcl_ListObjIndex(interp, objv[i], 1, &tobj2);
+			if (result != TCL_OK) return result;
+
+			result = Tcl_GetIndexFromObj(interp, tobj2,
+				(CONST84 char **)mergeoptions,
+				"merge_type", 0, &idx2);
+			if (result != TCL_OK) return result;
+
+			switch (idx2) {
+			    case NONE_IDX:
+				mergeval = MERGE_NONE;
+				break;
+			    case ADD_ONLY_IDX:
+				mergeval = MERGE_ADD;
+				break;
+			    case ADD_CRIT_IDX:
+				mergeval = MERGE_ADD_CRIT;
+				break;
+			    case PAR_ONLY_IDX:
+				mergeval = MERGE_PAR;
+				break;
+			    case PAR_CRIT_IDX:
+				mergeval = MERGE_PAR_CRIT;
+				break;
+			}
+			PropertyMerge(tp->name, fnum, Tcl_GetString(tobj1), mergeval);
+		    }
+		}
+		break;
 	}
     }
     return TCL_OK;
 }
 
-/*--------------------------------------------------------------*/
-/* Function name: _netcmp_combine				*/
-/* Syntax: netgen::combine [default]				*/
-/*	   netgen::combine combine_class			*/
-/*	   netgen::combine valid_cellname serial|parallel	*/
-/*	   netgen::combine forget valid_cellname		*/
-/*	   netgen::combine forget				*/
-/* Formerly: t							*/
-/* Results:							*/
-/* Side Effects:						*/
-/*--------------------------------------------------------------*/
-
-int
-_netcmp_combine(ClientData clientData,
-    Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
-{
-   char *model;
-   char *combineclass[] = {
-      "transistors", "resistors", "capacitors", "default", "forget",
-		"cell", NULL
-   };
-   enum OptionIdx {
-      TRANS_IDX, RES_IDX, CAP_IDX, DEFLT_IDX, FORGET_IDX, CELL_IDX
-   };
-   int result, index, index2, fnum = -1;
-   struct nlist *tp = NULL;
-
-   char *combinetype[] = {
-      "serial", "parallel", NULL
-   };
-   enum SubOptionIdx {
-      SERIAL_IDX, PARALLEL_IDX
-   };
-
-   if (objc > 3) {
-      Tcl_WrongNumArgs(interp, 1, objv, "?valid_cellname serial|parallel?");
-      return TCL_ERROR;
-   }
-   if (objc == 1) {
-      index = DEFLT_IDX;
-   }
-   else {
-      if (Tcl_GetIndexFromObj(interp, objv[1], (CONST84 char **)combineclass,
-		"combine class", 0, &index) != TCL_OK) {
-	    if (objc != 3) {
-		Tcl_WrongNumArgs(interp, 1, objv, "?valid_cellname serial|parallel?");
-		return TCL_ERROR;
-	    }
-	    result = CommonParseCell(interp, objv[1], &tp, &fnum);
-	    if (result != TCL_OK) {
-		Fprintf(stdout, "No such device \"%s\".\n",
-			Tcl_GetString(objv[1]));
-		return result;
-	    }
-	    index = CELL_IDX;
-	    if (Tcl_GetIndexFromObj(interp, objv[2],
-			(CONST84 char **)combinetype,
-			"combine type", 0, &index2) != TCL_OK) {
-	       Tcl_WrongNumArgs(interp, 1, objv,
-			"?valid_cellname serial|parallel?");
-	       return TCL_ERROR;
-	    }
-      }
-      else if (index == CELL_IDX) {
-	 if (objc != 4) {
-	    Tcl_WrongNumArgs(interp, 1, objv, "cell ?valid_cellname serial|parallel?");
-	    return TCL_ERROR;
-	 }
-	 result = CommonParseCell(interp, objv[2], &tp, &fnum);
-	 if (result != TCL_OK) {
-	     Fprintf(stdout, "No such device \"%s\".\n",
-			Tcl_GetString(objv[2]));
-	     return result;
-	 }
-	 if (Tcl_GetIndexFromObj(interp, objv[3],
-			(CONST84 char **)combinetype,
-			"combine type", 0, &index2) != TCL_OK) {
-	    Tcl_WrongNumArgs(interp, 1, objv,
-			"?valid_cellname serial|parallel?");
-	    return TCL_ERROR;
-	 }
-      }
-      else if (index == FORGET_IDX) {
-	 if (objc < 3) {
-	    /* General purpose combine forget */
-	    tp = FirstCell();
-	    while (tp != NULL) {
-	       CombineForget(tp->name, tp->file, NULL);
-	       tp = NextCell();
-	    }
-	    return TCL_OK;
-	 }
-	 else {
-	    /* Specific combine forget */
-	    result = CommonParseCell(interp, objv[2], &tp, &fnum);
-	    if (result != TCL_OK) {
-		Fprintf(stdout, "No such device \"%s\".\n",
-			Tcl_GetString(objv[2]));
-		return result;
-	    }
-	    if (objc != 4) {
-	       if (Tcl_GetIndexFromObj(interp, objv[3],
-				(CONST84 char **)combinetype,
-				"combine type", 0, &index2) != TCL_OK) {
-		    Tcl_WrongNumArgs(interp, 1, objv,
-				"?valid_cellname serial|parallel?");
-		    return TCL_ERROR;
-	       }
-	       if (CombineForget(tp->name, fnum, (index2 == SERIAL_IDX)
-				? COMB_SERIAL : COMB_PARALLEL))
-	          Fprintf(stdout, "Model %s combine %s\n", tp->name,
-			(index2 == SERIAL_IDX) ? "serial" : "parallel");
-	       else
-	          Fprintf(stderr, "Unable to reset model %s %s combination.\n",
-			tp->name, (index2 == SERIAL_IDX) ? "serial" : "parallel");
-	    }
-	    else {
-	       if (CombineForget(tp->name, fnum, NULL))
-	          Fprintf(stdout, "No combinations of circuit %s allowed\n", tp->name);
-	       else
-	          Fprintf(stderr, "Unable to reset model %s %s combinations\n",
-			tp->name, (index2 == SERIAL_IDX) ? "serial" : "parallel");
-	    }
-	    return TCL_OK;
-	 }
-      }
-   }
-
-   if (objc == 1 || objc == 2) {
-      tp = FirstCell();
-      while (tp != NULL) {
-	 switch (tp->class) {
-	    case CLASS_NMOS: case CLASS_PMOS: case CLASS_FET3:
-	    case CLASS_NMOS4: case CLASS_PMOS4: case CLASS_FET4:
-	    case CLASS_FET:
-	       if (index == TRANS_IDX || index == DEFLT_IDX)
-	          CombineSetup(tp->name, tp->file, COMB_PARALLEL);
-	       break;
-	    case CLASS_RES: case CLASS_RES3:
-	       if (index == RES_IDX || index == DEFLT_IDX) {
-	          CombineSetup(tp->name, tp->file, COMB_SERIAL);
-	          CombineSetup(tp->name, tp->file, COMB_PARALLEL);
-	       }
-	       break;
-	    case CLASS_CAP: case CLASS_ECAP: case CLASS_CAP3:
-	       if (index == CAP_IDX)
-	          CombineSetup(tp->name, tp->file, COMB_PARALLEL);
-	       break;
-	 }
-	 tp = NextCell();
-      }
-   }
-   else if (index == CELL_IDX) {
-      if (CombineSetup(tp->name, fnum, ((index2 == SERIAL_IDX) ?
-			COMB_SERIAL : COMB_PARALLEL)))
-         Fprintf(stdout, "Model %s allow %s combinations\n", tp->name,
-			(index2 == SERIAL_IDX) ? "serial" : "parallel");
-      else
-         Fprintf(stderr, "Unable to set model %s %s combinations.\n",
-			tp->name, (index2 == SERIAL_IDX) ?
-			"serial" : "parallel");
-   }
-   else {
-      Tcl_WrongNumArgs(interp, 1, objv, "?valid_cellname serial|parallel?");
-      return TCL_ERROR;
-   }
-   return TCL_OK;
-}
-
 /*--------------------------------------------------------------*/
 /* Function name: _netcmp_permute				*/
 /* Syntax: netgen::permute [default]				*/
@@ -3833,7 +3793,7 @@ int Tclnetgen_Init(Tcl_Interp *interp)
    /* Remember the interpreter */
    netgeninterp = interp;
 
-   if (Tcl_InitStubs(interp, "8.1", 0) == NULL) return TCL_ERROR;
+   if (Tcl_InitStubs(interp, "8.5", 0) == NULL) return TCL_ERROR;
   
    for (n = 0; netgen_cmds[n].name != NULL; n++) {
       sprintf(keyword, "netgen::%s", netgen_cmds[n].name);