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

LazyLibrary should not contain Trees

Browse Source 
altering itself during iteration is not a good idea
This commit is contained in:
Jan Petykiewicz 2023-02-06 19:01:42 -08:00
parent dc2c12c26f
commit 1d649389a0
1 changed files with 3 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
masque/library.py
View File

@ -867,7 +867,7 @@ class LazyLibrary(MutableLibrary):
This class is usually used to create a library of Patterns by mapping names to This class is usually used to create a library of Patterns by mapping names to
functions which generate or load the relevant `Pattern` object as-needed. functions which generate or load the relevant `Pattern` object as-needed.
""" """
dict: Dict[str, Union[Callable[[], 'Pattern'], Callable[[], 'Tree']]] dict: Dict[str, Callable[[], 'Pattern']]
cache: Dict[str, 'Pattern'] cache: Dict[str, 'Pattern']
_lookups_in_progress: Set[str] _lookups_in_progress: Set[str]
@ -879,7 +879,7 @@ class LazyLibrary(MutableLibrary):
def __setitem__( def __setitem__(
self, self,
key: str, key: str,
value: Union['Pattern', Callable[[], 'Pattern'], Callable[[], 'Tree']], value: Union['Pattern', Callable[[], 'Pattern']],
) -> None: ) -> None:
if key in self.dict: if key in self.dict:
raise LibraryError(f'"{key}" already exists in the library. Overwriting is not allowed!') raise LibraryError(f'"{key}" already exists in the library. Overwriting is not allowed!')
@ -913,16 +913,8 @@ class LazyLibrary(MutableLibrary):
self._lookups_in_progress.add(key) self._lookups_in_progress.add(key)
func = self.dict[key] func = self.dict[key]
pat_or_tree = func() pat = func()
self._lookups_in_progress.remove(key) self._lookups_in_progress.remove(key)
if isinstance(pat_or_tree, Tree):
tree = pat_or_tree
pat = tree[tree.top]
del tree[tree.top]
self.add(tree)
else:
pat = pat_or_tree
self.cache[key] = pat self.cache[key] = pat
return pat return pat