.asy: SYMATTR Prefix is case senstitive (better) #99

nunobrum · Sep 27, 2024 · f9da167 · f9da167
1 parent 4593800
commit f9da167
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/spicelib/editor/asc_editor.py b/spicelib/editor/asc_editor.py
@@ -172,6 +172,9 @@ def reset_netlist(self, create_blank: bool = False) -> None:
                             # then create the attribute "SUBCKT"
                             component.attributes["_SUBCKT"] = self._get_subcircuit(symbol)
                     else:
+                        # make sure prefix is uppercase, as this is used in a lot of places
+                        if ref.upper() == "PREFIX":
+                            text = text.upper()
                         component.attributes[ref] = text
                 elif line.startswith("TEXT"):
                     match = TEXT_REGEX.match(line)

diff --git a/spicelib/editor/asy_reader.py b/spicelib/editor/asy_reader.py
@@ -67,6 +67,9 @@ def __init__(self, asy_file: Union[Path, str]):
                     else:
                         continue
                     text = text.strip()  # Gets rid of the \n terminator
+                    # make sure prefix is uppercase, as this is used in a lot of places
+                    if ref.upper() == "PREFIX":
+                        text = text.upper()
                     self.attributes[ref] = text
                 elif line.startswith("Version"):
                     tag, version = line.split()
@@ -255,7 +258,8 @@ def to_qsch(self, *args):
         return symbol
 
     def is_subcircuit(self):
-        return self.symbol_type == 'BLOCK' or self.attributes.get('Prefix').upper() == 'X'
+        # Prefix is guaranteed to be uppercase
+        return self.symbol_type == 'BLOCK' or self.attributes.get('Prefix') == 'X'
 
     def get_library(self) -> str:
         """Returns the library name of the model. If not found, returns None."""