From 24cc7d0c942f117c17619c21be6a8d165b4d3063 Mon Sep 17 00:00:00 2001
From: Tim Edwards <tim@opencircuitdesign.com>
Date: Sun, 18 Jun 2017 22:47:51 -0400
Subject: [PATCH] Update to add "property parallel none" command option.

---
 base/netgen.c     |  3 ++-
 base/netgen.h     |  1 +
 tcltk/tclnetgen.c | 18 +++++++++++++++++-
 3 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/base/netgen.c b/base/netgen.c
index e998873..3946b48 100644
--- a/base/netgen.c
+++ b/base/netgen.c
@@ -49,6 +49,7 @@ int NextNode;
 
 int Composition = NONE;
 int QuickSearch = 0;
+int GlobalParallelNone = FALSE;
 
 int AddToExistingDefinition = 0;  /* default: overwrite cell when reopened */
 
@@ -1192,7 +1193,7 @@ void CellDef(char *name, int fnum)
 	np = InstallInCellHashTable(name, fnum);
 	CurrentCell = LookupCellFile(name, fnum);
 	CurrentCell->class = CLASS_SUBCKT;	/* default */
-	CurrentCell->flags = 0;
+	CurrentCell->flags = (GlobalParallelNone) ? COMB_NO_PARALLEL : 0;
 
 	LastPlaced = NULL;
 	CurrentTail = NULL;
diff --git a/base/netgen.h b/base/netgen.h
index d8af108..4d46375 100644
--- a/base/netgen.h
+++ b/base/netgen.h
@@ -132,6 +132,7 @@ extern int IgnoreRC;	  /* set this to 1 to ignore capacitance and resistance */
 extern int NoOutput;      /* set this to 1 to disable stdout output */
 extern int Composition;	  /* direction of composition */
 extern int UnixWildcards; /* TRUE if *,?,{},[] only; false if full REGEXP */
+extern int GlobalParallelNone;	/* If TRUE, don't parallel combine any cells */
 /* magic internal flag to restrict searches to recently placed cells */
 extern int QuickSearch;
 /* does re"CellDef"ing a cell add to it or overwrite it??? */
diff --git a/tcltk/tclnetgen.c b/tcltk/tclnetgen.c
index ae8e556..f99bc98 100644
--- a/tcltk/tclnetgen.c
+++ b/tcltk/tclnetgen.c
@@ -3093,8 +3093,12 @@ _netcmp_equate(ClientData clientData,
 /*	netgen::property <device>|<model> <option>	*/
 /*		yes|no					*/
 /* Where <option> is one of:				*/
-/*     serial	 --- allow/prohibit serial combination	*/
+/*     serial	--- allow/prohibit serial combination	*/
 /*     parallel --- allow/prohibit parallel combination	*/
+/* or							*/
+/*	netgen::property parallel none			*/
+/*		--- prohibit parallel combinations by	*/
+/*		    default.				*/
 /*							*/
 /* Formerly: (none)					*/
 /* Results:						*/
@@ -3188,6 +3192,18 @@ _netcmp_property(ClientData clientData,
 	}
 	return TCL_OK;
     }
+    else if ((objc == 3) && (!strcmp(Tcl_GetString(objv[1]), "parallel"))) {
+	if (!strcmp(Tcl_GetString(objv[2]), "none"))
+	    GlobalParallelNone = TRUE;
+	else if (!strcmp(Tcl_GetString(objv[2]), "all"))
+	    GlobalParallelNone = FALSE;
+	else {
+	    Tcl_SetResult(interp, "Bad option, should be property parallel none|all",
+			NONE);
+	    return TCL_ERROR;
+	}
+	return TCL_OK;
+    }
 
     result = CommonParseCell(interp, objv[1], &tp, &fnum);
     if (result != TCL_OK) return result;