jan/masque
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes to subtree and lshift, as well as some cast() improvements

Browse Source
This commit is contained in:
jan 2023-04-07 16:48:40 -07:00
parent 45265faec4
commit 340fe7f656
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
masque/library.py
View File

@ -142,6 +142,7 @@ class Library(Mapping[str, 'Pattern'], metaclass=ABCMeta):
""" """
Return a new `Library`, containing only the specified patterns and the patterns they Return a new `Library`, containing only the specified patterns and the patterns they
reference (recursively). reference (recursively).
Dangling references do not cause an error.
Args: Args:
tops: Name(s) of patterns to keep tops: Name(s) of patterns to keep
@ -152,7 +153,7 @@ class Library(Mapping[str, 'Pattern'], metaclass=ABCMeta):
if isinstance(tops, str): if isinstance(tops, str):
tops = (tops,) tops = (tops,)
keep: set[str] = self.referenced_patterns(tops) - set((None,)) # type: ignore keep = cast(set[str], self.referenced_patterns(tops) - set((None,)))
keep |= set(tops) keep |= set(tops)
filtered = {kk: vv for kk, vv in self.items() if kk in keep} filtered = {kk: vv for kk, vv in self.items() if kk in keep}
@ -251,7 +252,7 @@ class Library(Mapping[str, 'Pattern'], metaclass=ABCMeta):
flatten_single(top) flatten_single(top)
assert None not in flattened.values() assert None not in flattened.values()
return flattened # type: ignore return cast(dict[str, 'Pattern'], flattened)
def get_name( def get_name(
self, self,
@ -592,8 +593,11 @@ class MutableLibrary(Library, MutableMapping[str, 'Pattern'], metaclass=ABCMeta)
if len(other) == 1: if len(other) == 1:
name = next(iter(other)) name = next(iter(other))
else: else:
if not isinstance(other, Library):
other = WrapROLibrary(other)
tops = other.tops() tops = other.tops()
if len(other.tops()) > 1: if len(tops) > 1:
raise LibraryError('Received a library containing multiple topcells!') raise LibraryError('Received a library containing multiple topcells!')
name = tops[0] name = tops[0]
@ -762,6 +766,7 @@ class MutableLibrary(Library, MutableMapping[str, 'Pattern'], metaclass=ABCMeta)
""" """
Return a new `Library`, containing only the specified patterns and the patterns they Return a new `Library`, containing only the specified patterns and the patterns they
reference (recursively). reference (recursively).
Dangling references do not cause an error.
Args: Args:
tops: Name(s) of patterns to keep tops: Name(s) of patterns to keep
@ -772,11 +777,11 @@ class MutableLibrary(Library, MutableMapping[str, 'Pattern'], metaclass=ABCMeta)
if isinstance(tops, str): if isinstance(tops, str):
tops = (tops,) tops = (tops,)
keep: set[str] = self.referenced_patterns(tops) - set((None,)) # type: ignore keep = cast(set[str], self.referenced_patterns(tops) - set((None,)))
keep |= set(tops) keep |= set(tops)
new = type(self)() new = type(self)()
for key in keep: for key in keep - set(self.keys()):
new._merge(key, self, key) new._merge(key, self, key)
return new return new