Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Strip brackets from model name in Calibre SPICE reader #419

Merged
merged 1 commit into from
Jun 11, 2024
Merged

Strip brackets from model name in Calibre SPICE reader #419

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions gplugins/klayout/netlist_spice_reader.py
View file
Open in desktop
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
View file
Open in desktop
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
Loading