Skip to content

Commit

Permalink
Strip brackets from model name in Calibre SPICE reader
Browse files Browse the repository at this point in the history
  • Loading branch information
nikosavola committed Jun 10, 2024
1 parent b2765b9 commit 91730d3
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
4 changes: 4 additions & 0 deletions gplugins/klayout/netlist_spice_reader.py
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ class NoCommentReader(kdb.NetlistSpiceReaderDelegate):
def parse_element(self, s: str, element: str) -> kdb.ParseElementData:
if "$" in s:
s, *_ = s.split("$") # Don't take comments into account

parsed = super().parse_element(s, element)
# ensure uniqueness
parsed.model_name = parsed.model_name + f"_{self.n_nodes}"
Expand All @@ -52,6 +53,9 @@ def wants_subcircuit(self, name: str):

@override
def parse_element(self, s: str, element: str) -> kdb.ParseElementData:
# Allow Calibre-style model name given as `$[model_name]` by removing the brackets
s = re.sub(r"\$\[([^\]]+)\]", r"\1", s)

x_value, y_value = None, None
if "$" in s:
if location_matches := re.search(self.calibre_location_pattern, s):
Expand Down
3 changes: 2 additions & 1 deletion pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,8 @@ lint.ignore = [
"C408", # C408 Unnecessary `dict` call (rewrite as a literal)
"E402", # module level import not at top of file
"B018", # found useless expression
"B028" # no explicit stacklevel
"B028", # no explicit stacklevel
"D301" # allow escape sequences in docstrings
]
lint.select = [
"E", # pycodestyle errors
Expand Down

0 comments on commit 91730d3

Please sign in to comment.