Allow LazyLibrary to store Trees as well?

masque/library.py

@@ -841,7 +841,7 @@ class LazyLibrary(MutableLibrary):
     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.
     """
-    dict: Dict[str, Callable[[], 'Pattern']]
+    dict: Dict[str, Union[Callable[[], 'Pattern'], Callable[[], 'Tree']]]
     cache: Dict[str, 'Pattern']
     _lookups_in_progress: Set[str]
 
@@ -853,7 +853,7 @@ class LazyLibrary(MutableLibrary):
     def __setitem__(
             self,
             key: str,
-            value: Union['Pattern', Callable[[], 'Pattern']],
+            value: Union['Pattern', Callable[[], 'Pattern'], Callable[[], 'Tree']],
             ) -> None:
         if key in self.dict:
             raise LibraryError(f'"{key}" already exists in the library. Overwriting is not allowed!')
@@ -887,8 +887,14 @@ class LazyLibrary(MutableLibrary):
 
         self._lookups_in_progress.add(key)
         func = self.dict[key]
-        pat = func()
+        pat_or_tree = func()
         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)
+
         self.cache[key] = pat
         return pat
 
@@ -1025,7 +1031,7 @@ class Tree(MutableLibrary):
     def __delitem__(self, key: str) -> None:
         del self.library[key]
 
-    def __iadd__(self, other: 'Tree') -> None:
+    def __lshift__(self, other: 'Tree') -> None:
         self.add_tree(other)