Merge branch 'master' into qflow-1.4

RTimothyEdwards · Nov 25, 2020 · fbddbf0 · fbddbf0
2 parents 4bc9616 + 6dff67c
commit fbddbf0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.4.88
+1.4.89
diff --git a/scripts/spi2xspice.py.in b/scripts/spi2xspice.py.in
@@ -504,29 +504,31 @@ def read_spice(filein, fileout, celldefs, debug, modelfile, timing):
                     outlist = []
                     if 'inputs' in cellrec:
                         for subpin in cellrec['inputs']:
-                            if subpin in cellrec['spicepins']:
-                                i = cellrec['spicepins'].index(subpin)
+                            subpinname = subpin.strip('"')
+                            if subpinname in cellrec['spicepins']:
+                                i = cellrec['spicepins'].index(subpinname)
                                 # "pins[i]" is the name of the connecting net
                                 # on the top level
                                 if len(pins) > i:
                                     inlist.append(pins[i])
                                     if pins[i] in pindefs:
                                         pindefs[pins[i]] = 'input'
                                 else:
-                                    print('Pin ' + subpin + ' of subckt ' + cellname + ' does not have a connecting net', file=sys.stderr)
+                                    print('Pin ' + subpinname + ' of subckt ' + cellname + ' does not have a connecting net', file=sys.stderr)
 
                     if 'outputs' in cellrec:
                         for subpin in cellrec['outputs']:
-                            if subpin in cellrec['spicepins']:
-                                i = cellrec['spicepins'].index(subpin)
+                            subpinname = subpin.strip('"')
+                            if subpinname in cellrec['spicepins']:
+                                i = cellrec['spicepins'].index(subpinname)
                                 # "pins[i]" is the name of the connecting net
                                 # on the top level
                                 if len(pins) > i:
                                     outlist.append(pins[i])
                                     if pins[i] in pindefs:
                                         pindefs[pins[i]] = 'output'
                                 else:
-                                    print('Pin ' + subpin + ' of subckt ' + cellname + ' does not have a connecting net', file=sys.stderr)
+                                    print('Pin ' + subpinname + ' of subckt ' + cellname + ' does not have a connecting net', file=sys.stderr)
 
                     intext = ' '.join(inlist)
                     outtext = ' '.join(outlist)