Merge branch 'master' into qflow-1.4

RTimothyEdwards · Feb 25, 2021 · fd12bc0 · fd12bc0
2 parents 513a9a3 + 6185182
commit fd12bc0
Show file tree

Hide file tree

Showing 3 changed files with 171 additions and 92 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.92
+1.4.93
diff --git a/scripts/spi2xspice.py.in b/scripts/spi2xspice.py.in
@@ -275,12 +275,12 @@ def read_spice(filein, fileout, celldefs, debug, modelfile, timing):
 
             # If there is an include line, parse it and read the
             # library cells from that include file.
-            imatch = increx.match(line)
+            imatch = increx.match(line) if not skipsub else []
             if imatch:
                 read_spice_lib(imatch.group(1), celldefs, debug) 
                 continue
 
-            xmatch = xrex.match(line)
+            xmatch = xrex.match(line) if not skipsub else []
             if xmatch:
                 # Replace subcircuit call with xspice call
                 instname = xmatch.group(1)