Merge branch 'master' into work

about property errors to show up, not due to property errors, but
due to proxy pins being inserted in the middle of a device record.
However, the first one was fixed for the case of proxy pins being
added to circuit 1, but the same fix was not made for the opposite
case of proxy pins being added to circuit 2.  This commit corrects
that omission.

VERSION

@@ -1 +1 @@
-1.5.77
+1.5.79

base/flatten.c

@@ -486,24 +486,30 @@ int flattenInstancesOf(char *name, int fnum, char *instance)
       }
 
       /* splice instance out of parent */
-      if (ParentParams == ThisCell->cell) {
-	/* ParentParams are the very first thing in the list */
-	ThisCell->cell = ChildObjList;
-	for (ob2 = ChildObjList; ob2 && ob2->next != NULL; ob2 = ob2->next) ;
+      if ((ParentParams == ThisCell->cell) && (ChildObjList == NULL)) {
+	ThisCell->cell = ob2;	/* Child cell was empty */
+	tmp = ob2;
       }
       else {
-	/* find ParentParams in ThisCell list */
-	for (ob2 = ThisCell->cell; ob2 && ob2->next != ParentParams; ob2=ob2->next); 
-	if (ob2)
-	   for (ob2->next = ChildObjList; ob2->next != NULL; ob2 = ob2->next) ;
-      }
-      /* now, ob2 is last element in child list, so skip and reclaim parent */
+         if (ParentParams == ThisCell->cell) {
+	   /* ParentParams are the very first thing in the list */
+	   ThisCell->cell = ChildObjList;
+	   for (ob2 = ChildObjList; ob2 && ob2->next != NULL; ob2 = ob2->next) ;
+         }
+         else {
+	   /* find ParentParams in ThisCell list */
+	   for (ob2 = ThisCell->cell; ob2 && ob2->next != ParentParams; ob2=ob2->next); 
+	   if (ob2)
+	      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) || (tmp->type == PROPERTY)));
-      if (ob2) ob2->next = tmp;
+         tmp = ParentParams;
+         do {
+	   tmp = tmp->next;
+         } while ((tmp != NULL) && ((tmp->type > FIRSTPIN) || (tmp->type == PROPERTY)));
+         if (ob2) ob2->next = tmp;
+      }
       while (ParentParams != tmp) {
 	ob2 = ParentParams->next;
 	FreeObjectAndHash(ParentParams, ThisCell);

base/netcmp.c

@@ -6661,8 +6661,15 @@ int MatchPins(struct nlist *tc1, struct nlist *tc2, int dolist)
          obn->model.port = (i - j);
          obn->instance.name = NULL;
          obn->node = -1;
-         obn->next = ob2->next;
-         ob2->next = obn;
+
+	 if (ob2 == tc2->cell) {
+	    obn->next = ob2;
+	    tc2->cell = obn;
+	 }
+	 else {
+            obn->next = ob2->next;
+            ob2->next = obn;
+	 }
          ob2 = obn;
 	 hasproxy2 = 1;
 

base/netgen.c

@@ -3306,11 +3306,6 @@ int CombineSerial(char *model, int file)
    int i, j, scnt = 0;
    struct valuelist *kv;
 
-   // To avoid posting a non-working version, serial combination is
-   // disabled here until code is finished to compare the serial/parallel
-   // property networks.
-   // return 0;
-
    if ((tp = LookupCellFile(model, file)) == NULL) {
       Printf("Cell: %s does not exist.\n", model);
       return -1;