More

Author: chrisrink10

src/basilisp/lang/compiler/analyzer.py

@@ -648,7 +648,12 @@ def get_meta_prop(o: Union[IMeta, Var]) -> Any:
 _tag_meta = _meta_getter(SYM_TAG_META_KEY)
 
 
-def _loc(form: Union[LispForm, ISeq]) -> Optional[Tuple[int, int, int, int]]:
+T_form = TypeVar("T_form", bound=ReaderForm)
+T_node = TypeVar("T_node", bound=Node)
+LispAnalyzer = Callable[[T_form, AnalyzerContext], T_node]
+
+
+def _loc(form: T_form) -> Optional[Tuple[int, int, int, int]]:
     """Fetch the location of the form in the original filename from the
     input form, if it has metadata."""
     # Technically, IMeta is sufficient for fetching `form.meta` but the
@@ -670,22 +675,17 @@ def _loc(form: Union[LispForm, ISeq]) -> Optional[Tuple[int, int, int, int]]:
     return None
 
 
-T_form = TypeVar("T_form", bound=LispForm)
-T_node = TypeVar("T_node", Node, None)
-LispAnalyzer = Callable[[T_form, AnalyzerContext], T_node]
-
-
-def _with_loc(f: LispAnalyzer) -> LispAnalyzer:
+def _with_loc(f: LispAnalyzer[T_form, T_node]) -> LispAnalyzer[T_form, T_node]:
     """Attach any available location information from the input form to
     the node environment returned from the parsing function."""
 
     @wraps(f)
-    def _analyze_form(form: T_form, ctx: AnalyzerContext) -> Node:
+    def _analyze_form(form: T_form, ctx: AnalyzerContext) -> T_node:
         form_loc = _loc(form)
         if form_loc is None:
             return f(form, ctx)
         else:
-            return f(form, ctx).fix_missing_locations(form_loc)
+            return cast(T_node, f(form, ctx).fix_missing_locations(form_loc))
 
     return _analyze_form
 
@@ -801,15 +801,15 @@ def _tag_ast(form: Optional[LispForm], ctx: AnalyzerContext) -> Optional[Node]:
     return _analyze_form(form, ctx)
 
 
-def _with_meta(gen_node: LispAnalyzer) -> LispAnalyzer:
+def _with_meta(gen_node: LispAnalyzer[T_form, T_node]) -> LispAnalyzer[T_form, T_node]:
     """Wraps the node generated by gen_node in a :with-meta AST node if the
     original form has meta.
 
     :with-meta AST nodes are used for non-quoted collection literals and for
     function expressions."""
 
     @wraps(gen_node)
-    def with_meta(form: T_form, ctx: AnalyzerContext) -> Node:
+    def with_meta(form: T_form, ctx: AnalyzerContext) -> T_node:
         assert not ctx.is_quoted, "with-meta nodes are not used in quoted expressions"
 
         descriptor = gen_node(form, ctx)
@@ -822,11 +822,14 @@ def with_meta(form: T_form, ctx: AnalyzerContext) -> Node:
                 assert isinstance(meta_ast, MapNode) or (
                     isinstance(meta_ast, Const) and meta_ast.type == ConstType.MAP
                 )
-                return WithMeta(
-                    form=cast(T_form, form),
-                    meta=meta_ast,
-                    expr=descriptor,
-                    env=ctx.get_node_env(pos=ctx.syntax_position),
+                return cast(
+                    T_node,
+                    WithMeta(
+                        form=cast(LispForm, form),
+                        meta=meta_ast,
+                        expr=descriptor,
+                        env=ctx.get_node_env(pos=ctx.syntax_position),
+                    ),
                 )
 
         return descriptor

src/basilisp/lang/compiler/nodes.py

@@ -192,7 +192,7 @@ def visit(self, f: Callable[..., None], *args, **kwargs):
 
     def fix_missing_locations(
         self, form_loc: Optional[Tuple[int, int, int, int]] = None
-    ) -> "Node":
+    ) -> "Node[T]":
         """Return a transformed copy of this node with location in this node's
         environment updated to match the `form_loc` if given, or using its
         existing location otherwise. All child nodes will be recursively