jaclang 0.7.2__py3-none-any.whl → 0.7.5__py3-none-any.whl

jaclang/compiler/passes/main/pyast_load_pass.py

@@ -150,6 +150,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 node.name if node.name != "root" else "root_"
             ),  # root is a reserved keyword
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name),
             pos_start=0,
@@ -262,6 +263,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name,
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name),
             pos_start=0,
@@ -272,6 +274,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.KW_CLASS,
             value="class",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -284,17 +287,18 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 and isinstance(body_stmt.name_ref, ast.Name)
                 and body_stmt.name_ref.value == "__init__"
             ):
-                tok = ast.Token(
+                tok = ast.Name(
                     file_path=self.mod_path,
                     name=Tok.KW_INIT,
                     value="init",
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len("init"),
                     pos_start=0,
                     pos_end=0,
                 )
-                body_stmt.name_ref = ast.SpecialVarRef(var=tok, kid=[tok])
+                body_stmt.name_ref = ast.SpecialVarRef(var=tok)
             if (
                 isinstance(body_stmt, ast.Ability)
                 and body_stmt.signature
@@ -373,17 +377,18 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                         converted_stmt.expr, ast.String
                     ):
                         continue
-                    tok = ast.Token(
+                    pintok = ast.Token(
                         file_path=self.mod_path,
                         name=Tok.PYNLINE,
                         value=py_ast.unparse(class_body_stmt),
                         line=node.lineno,
+                        end_line=node.end_lineno if node.end_lineno else node.lineno,
                         col_start=node.col_offset,
                         col_end=node.col_offset + len(py_ast.unparse(class_body_stmt)),
                         pos_start=0,
                         pos_end=0,
                     )
-                    valid_enum_body.append(ast.PyInlineCode(code=tok, kid=[tok]))
+                    valid_enum_body.append(ast.PyInlineCode(code=pintok, kid=[pintok]))
 
             valid_enum_body2: list[ast.EnumBlockStmt] = [
                 i for i in valid_enum_body if isinstance(i, ast.EnumBlockStmt)
@@ -903,17 +908,18 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             and isinstance(value.target, ast.Name)
             and value.target.value == "super"
         ):
-            tok = ast.Token(
+            tok = ast.Name(
                 file_path=self.mod_path,
                 name=Tok.KW_SUPER,
                 value="super",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len("super"),
                 pos_start=0,
                 pos_end=0,
             )
-            value = ast.SpecialVarRef(var=tok, kid=[tok])
+            value = ast.SpecialVarRef(var=tok)
             # exit()
         attribute = ast.Name(
             file_path=self.mod_path,
@@ -924,6 +930,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 else "init" if node.attr == "__init__" else node.attr
             ),
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.attr),
             pos_start=0,
@@ -1030,6 +1037,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.KW_BREAK,
             value="break",
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -1144,6 +1152,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     else str(node.value)
                 ),
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len(str(node.value)),
                 pos_start=0,
@@ -1155,6 +1164,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.ELLIPSIS,
                 value="...",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 3,
                 pos_start=0,
@@ -1170,6 +1180,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.KW_CONTINUE,
             value="continue",
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -1246,6 +1257,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value="Exception",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 9,
                 pos_start=0,
@@ -1256,6 +1268,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value="e",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 1,
                 pos_start=0,
@@ -1267,6 +1280,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             #     name=Tok.NAME,
             #     value=no,
             #     line=node.lineno,
+            #     end_line = (node.end_lineno if node.end_lineno else node.lineno,)
             #     col_start=node.col_offset,
             #     col_end=node.col_offset + 9,
             #     pos_start=0,
@@ -1278,6 +1292,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     name=Tok.NAME,
                     value=node.name,
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len(node.name),
                     pos_start=0,
@@ -1369,7 +1384,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         class Global(stmt):
             names: list[_Identifier]
         """
-        names: list[ast.NameSpec] = []
+        names: list[ast.NameAtom] = []
         for id in node.names:
             names.append(
                 ast.Name(
@@ -1377,13 +1392,14 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     name=Tok.NAME,
                     value=id,
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len(id),
                     pos_start=0,
                     pos_end=0,
                 )
             )
-        target = ast.SubNodeList[ast.NameSpec](items=names, delim=Tok.COMMA, kid=names)
+        target = ast.SubNodeList[ast.NameAtom](items=names, delim=Tok.COMMA, kid=names)
         return ast.GlobalStmt(target=target, kid=[target])
 
     def proc_if_exp(self, node: py_ast.IfExp) -> ast.IfElseExpr:
@@ -1439,6 +1455,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value="py",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=0,
             pos_start=0,
@@ -1468,6 +1485,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value="py",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=0,
             pos_start=0,
@@ -1482,6 +1500,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                         name=Tok.NAME,
                         value=i,
                         line=node.lineno,
+                        end_line=node.end_lineno if node.end_lineno else node.lineno,
                         col_start=0,
                         col_end=0,
                         pos_start=0,
@@ -1643,6 +1662,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name if node.name else "_",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=(
                 (node.col_offset + len(node.name))
@@ -1696,6 +1716,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                         name=Tok.NAME,
                         value=kwd_attrs,
                         line=node.lineno,
+                        end_line=node.end_lineno if node.end_lineno else node.lineno,
                         col_start=node.col_offset,
                         col_end=node.col_offset + len(kwd_attrs),
                         pos_start=0,
@@ -1720,7 +1741,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             kid.append(kw_patterns)
         else:
             kw_patterns = None
-        if isinstance(cls, (ast.NameSpec, ast.AtomTrailer)):
+        if isinstance(cls, (ast.NameAtom, ast.AtomTrailer)):
             return ast.MatchArch(
                 name=cls, arg_patterns=patterns_sub, kw_patterns=kw_patterns, kid=kid
             )
@@ -1738,7 +1759,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         values: list[ast.MatchKVPair | ast.MatchStar] = []
         keys = [self.convert(i) for i in node.keys]
         valid_keys = [
-            i for i in keys if isinstance(i, (ast.MatchPattern, ast.NameSpec))
+            i for i in keys if isinstance(i, (ast.MatchPattern, ast.NameAtom))
         ]
         patterns = [self.convert(i) for i in node.patterns]
         valid_patterns = [i for i in patterns if isinstance(i, ast.MatchPattern)]
@@ -1755,6 +1776,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value=node.rest,
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len(node.rest),
                 pos_start=0,
@@ -1799,6 +1821,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=type,
             value=str(node.value),
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(str(node.value)),
             pos_start=0,
@@ -1820,6 +1843,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name if node.name else "_",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name if node.name else "_"),
             pos_start=0,
@@ -1853,6 +1877,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.id if node.id != "root" else "root_",  # reserved word
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.id),
             pos_start=0,
@@ -1885,7 +1910,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
         class Nonlocal(stmt):
             names: list[_Identifier]
         """
-        names: list[ast.NameSpec] = []
+        names: list[ast.NameAtom] = []
         for name in node.names:
             names.append(
                 ast.Name(
@@ -1893,13 +1918,14 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                     name=Tok.NAME,
                     value=name if name != "root" else "root_",
                     line=node.lineno,
+                    end_line=node.end_lineno if node.end_lineno else node.lineno,
                     col_start=node.col_offset,
                     col_end=node.col_offset + len(name),
                     pos_start=0,
                     pos_end=0,
                 )
             )
-        target = ast.SubNodeList[ast.NameSpec](items=names, delim=Tok.COMMA, kid=names)
+        target = ast.SubNodeList[ast.NameAtom](items=names, delim=Tok.COMMA, kid=names)
         return ast.NonLocalStmt(target=target, kid=names)
 
     def proc_pass(self, node: py_ast.Pass) -> ast.Semi:
@@ -1909,6 +1935,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.SEMI,
             value=";",
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -2176,6 +2203,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.name,
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.name),
             pos_start=0,
@@ -2187,6 +2215,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value=node.asname,
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + len(node.asname),
                 pos_start=0,
@@ -2211,6 +2240,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.arg if node.arg != "root" else "root_",  # reserved word
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.arg),
             pos_start=0,
@@ -2224,6 +2254,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.NAME,
                 value="Any",
                 line=node.lineno,
+                end_line=node.end_lineno if node.end_lineno else node.lineno,
                 col_start=node.col_offset,
                 col_end=node.col_offset + 3,
                 pos_start=0,
@@ -2257,6 +2288,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.STAR_MUL,
                 value="*",
                 line=vararg.loc.first_line,
+                end_line=vararg.loc.last_line,
                 col_start=vararg.loc.col_start,
                 col_end=vararg.loc.col_end,
                 pos_start=0,
@@ -2282,6 +2314,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
                 name=Tok.STAR_POW,
                 value="**",
                 line=kwarg.loc.first_line,
+                end_line=kwarg.loc.last_line,
                 col_start=kwarg.loc.col_start,
                 col_end=kwarg.loc.col_end,
                 pos_start=0,
@@ -2327,6 +2360,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=tok,
             value=value,
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,
@@ -2491,6 +2525,7 @@ class PyastBuildPass(Pass[ast.PythonModuleAst]):
             name=Tok.NAME,
             value=node.arg if node.arg else "_",
             line=node.lineno,
+            end_line=node.end_lineno if node.end_lineno else node.lineno,
             col_start=node.col_offset,
             col_end=node.col_offset + len(node.arg if node.arg else "_"),
             pos_start=0,

jaclang/compiler/passes/main/pyjac_ast_link_pass.py

@@ -57,10 +57,13 @@ class PyJacAstLinkPass(Pass):
         decorators: Optional[SubNodeList[ExprType]],
         """
         for i in node.target.archs:
-            if i.sym_link:
-                self.link_jac_py_nodes(jac_node=i, py_nodes=i.sym_link.decl.gen.py_ast)
+            if i.name_spec.name_of.sym:
                 self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
+                    jac_node=i, py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast
+                )
+                self.link_jac_py_nodes(
+                    jac_node=i.name_spec,
+                    py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast,
                 )
 
     def exit_enum(self, node: ast.Enum) -> None:
@@ -85,10 +88,13 @@ class PyJacAstLinkPass(Pass):
         decorators: Optional[SubNodeList[ExprType]],
         """
         for i in node.target.archs:
-            if i.sym_link:
-                self.link_jac_py_nodes(jac_node=i, py_nodes=i.sym_link.decl.gen.py_ast)
+            if i.name_spec.name_of.sym:
+                self.link_jac_py_nodes(
+                    jac_node=i, py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast
+                )
                 self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
+                    jac_node=i.name_spec,
+                    py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast,
                 )
 
     def exit_ability(self, node: ast.Ability) -> None:
@@ -119,10 +125,13 @@ class PyJacAstLinkPass(Pass):
         decorators: Optional[SubNodeList[ExprType]],
         """
         for i in node.target.archs:
-            if i.sym_link:
-                self.link_jac_py_nodes(jac_node=i, py_nodes=i.sym_link.decl.gen.py_ast)
+            if i.name_spec.name_of.sym:
+                self.link_jac_py_nodes(
+                    jac_node=i, py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast
+                )
                 self.link_jac_py_nodes(
-                    jac_node=i.name_ref, py_nodes=i.sym_link.decl.gen.py_ast
+                    jac_node=i.name_spec,
+                    py_nodes=i.name_spec.name_of.sym.decl.gen.py_ast,
                 )
 
         if isinstance(node.parent, ast.Ability) and node.parent.signature:
@@ -219,5 +228,5 @@ class PyJacAstLinkPass(Pass):
         """
         if node.is_attr and isinstance(node.right, ast.AstSymbolNode):
             self.link_jac_py_nodes(
-                jac_node=node.right.sym_name_node, py_nodes=node.gen.py_ast
+                jac_node=node.right.name_spec, py_nodes=node.gen.py_ast
             )

jaclang/compiler/passes/main/registry_pass.py

@@ -12,7 +12,7 @@ import pickle
 import jaclang.compiler.absyntree as ast
 from jaclang.compiler.constant import Constants as Con
 from jaclang.compiler.passes import Pass
-from jaclang.core.registry import SemInfo, SemRegistry
+from jaclang.compiler.semtable import SemInfo, SemRegistry
 from jaclang.core.utils import get_sem_scope
 
 
@@ -48,7 +48,7 @@ class RegistryPass(Pass):
         seminfo = SemInfo(
             node.name.value,
             node.arch_type.value,
-            node.semstr.lit_value if node.semstr else None,
+            node.semstr.lit_value if node.semstr else "",
         )
         if (
             len(self.modules_visited)
@@ -61,7 +61,7 @@ class RegistryPass(Pass):
         """Save enum information."""
         scope = get_sem_scope(node)
         seminfo = SemInfo(
-            node.name.value, "Enum", node.semstr.lit_value if node.semstr else None
+            node.name.value, "Enum", node.semstr.lit_value if node.semstr else ""
         )
         if (
             len(self.modules_visited)
@@ -79,7 +79,7 @@ class RegistryPass(Pass):
         seminfo = SemInfo(
             node.name.value,
             extracted_type,
-            node.semstr.lit_value if node.semstr else None,
+            node.semstr.lit_value if node.semstr else "",
         )
         if len(self.modules_visited) and self.modules_visited[-1].registry:
             self.modules_visited[-1].registry.add(scope, seminfo)
@@ -100,7 +100,7 @@ class RegistryPass(Pass):
                 else ""
             ),
             extracted_type,
-            node.semstr.lit_value if node.semstr else None,
+            node.semstr.lit_value if node.semstr else "",
         )
         if len(self.modules_visited) and self.modules_visited[-1].registry:
             self.modules_visited[-1].registry.add(scope, seminfo)
@@ -113,7 +113,7 @@ class RegistryPass(Pass):
             and node.parent.parent.__class__.__name__ == "Enum"
         ):
             scope = get_sem_scope(node)
-            seminfo = SemInfo(node.value, None, None)
+            seminfo = SemInfo(node.value, None, "")
             if len(self.modules_visited) and self.modules_visited[-1].registry:
                 self.modules_visited[-1].registry.add(scope, seminfo)
 

jaclang/compiler/passes/main/sym_tab_build_pass.py

@@ -17,19 +17,6 @@ from jaclang.compiler.symtable import Symbol, SymbolAccess, SymbolTable
 class SymTabPass(Pass):
     """Jac Ast build pass."""
 
-    def before_pass(self) -> None:
-        """Before pass."""
-        self.unlinked: set[ast.AstSymbolNode] = set()  # Failed use lookups
-        self.linked: set[ast.AstSymbolNode] = set()  # Successful use lookups
-
-    def seen(self, node: ast.AstSymbolNode) -> bool:
-        """Check if seen."""
-        result = node in self.linked or node in self.unlinked
-        if node.sym_link and not result:
-            self.linked.add(node)
-            return True
-        return result
-
     def inherit_sym_tab(self, scope: SymbolTable, sym_tab: SymbolTable) -> None:
         """Inherit symbol table."""
         for i in sym_tab.tab.values():
@@ -44,21 +31,20 @@ class SymTabPass(Pass):
     ) -> Optional[Symbol]:
         """Insert into symbol table."""
         table = table_override if table_override else node.sym_tab
-        if self.seen(node) and node.sym_link and table == node.sym_link.parent_tab:
-            return node.sym_link
+        if node.sym and table == node.sym.parent_tab:
+            return node.sym
         if table:
             table.insert(
                 node=node, single=single_decl is not None, access_spec=access_spec
             )
         self.update_py_ctx_for_def(node)
-        self.handle_hit_outcome(node)
-        return node.sym_link
+        return node.sym
 
     def update_py_ctx_for_def(self, node: ast.AstSymbolNode) -> None:
         """Update python context for definition."""
-        node.py_ctx_func = ast3.Store
-        if isinstance(node.sym_name_node, ast.AstSymbolNode):
-            node.sym_name_node.py_ctx_func = ast3.Store
+        node.name_spec.py_ctx_func = ast3.Store
+        if isinstance(node.name_spec, ast.AstSymbolNode):
+            node.name_spec.py_ctx_func = ast3.Store
         if isinstance(node, (ast.TupleVal, ast.ListVal)) and node.values:
             # Handling of UnaryExpr case for item is only necessary for
             # the generation of Starred nodes in the AST for examples
@@ -66,11 +52,11 @@ class SymTabPass(Pass):
             def fix(item: ast.TupleVal | ast.ListVal | ast.UnaryExpr) -> None:
                 if isinstance(item, ast.UnaryExpr):
                     if isinstance(item.operand, ast.AstSymbolNode):
-                        item.operand.py_ctx_func = ast3.Store
+                        item.operand.name_spec.py_ctx_func = ast3.Store
                 elif isinstance(item, (ast.TupleVal, ast.ListVal)):
                     for i in item.values.items if item.values else []:
                         if isinstance(i, ast.AstSymbolNode):
-                            i.py_ctx_func = ast3.Store
+                            i.name_spec.py_ctx_func = ast3.Store
                         elif isinstance(i, ast.AtomTrailer):
                             self.chain_def_insert(self.unwind_atom_trailer(i))
                         if isinstance(i, (ast.TupleVal, ast.ListVal, ast.UnaryExpr)):
@@ -84,28 +70,23 @@ class SymTabPass(Pass):
         sym_table: Optional[SymbolTable] = None,
     ) -> Optional[Symbol]:
         """Link to symbol."""
-        if self.seen(node):
-            return node.sym_link
+        if node.sym:
+            return node.sym
         if not sym_table:
             sym_table = node.sym_tab
         if sym_table:
-            node.sym_link = (
-                sym_table.lookup(name=node.sym_name, deep=True) if sym_table else None
-            )
-            # If successful lookup mark linked, add to table uses, and link others
-            if node.sym_link:
-                sym_table.uses.append(node)
-        self.handle_hit_outcome(node)
-        return node.sym_link
+            lookup = sym_table.lookup(name=node.sym_name, deep=True)
+            lookup.add_use(node.name_spec) if lookup else None
+        return node.sym
 
     def chain_def_insert(self, node_list: Sequence[ast.AstSymbolNode]) -> None:
         """Link chain of containing names to symbol."""
         if not node_list:
             return
         cur_sym_tab = node_list[0].sym_tab
-        node_list[-1].py_ctx_func = ast3.Store
-        if isinstance(node_list[-1].sym_name_node, ast.AstSymbolNode):
-            node_list[-1].sym_name_node.py_ctx_func = ast3.Store
+        node_list[-1].name_spec.py_ctx_func = ast3.Store
+        if isinstance(node_list[-1].name_spec, ast.AstSymbolNode):
+            node_list[-1].name_spec.py_ctx_func = ast3.Store
 
         node_list = node_list[:-1]  # Just performs lookup mappings of pre assign chain
         for i in node_list:
@@ -165,25 +146,6 @@ class SymTabPass(Pass):
             trag_list.insert(0, left)
         return trag_list
 
-    def handle_hit_outcome(
-        self,
-        node: ast.AstSymbolNode,
-    ) -> None:
-        """Handle outcome of lookup or insert."""
-        # If successful lookup mark linked, add to table uses, and link others
-        if node.sym_link:
-            self.linked.add(node)
-            if isinstance(node.sym_name_node, ast.AstSymbolNode):
-                node.sym_name_node.sym_link = node.sym_link
-        if not node.sym_link:
-            # Mark nodes that were not successfully linked
-            self.unlinked.add(node)
-            if (
-                isinstance(node.sym_name_node, ast.AstSymbolNode)
-                and not node.sym_name_node.sym_link
-            ):
-                self.unlinked.add(node.sym_name_node)
-
     def already_declared_err(
         self,
         name: str,
@@ -238,7 +200,7 @@ class SymTabBuildPass(SymTabPass):
         mod_path: str,
         is_imported: bool,
         """
-        self.push_scope(node.name, node, fresh=True)
+        self.push_scope(node.name, node, fresh=(node == self.ir))
         self.sync_node_to_scope(node)
         for obj in dir(builtins):
             builtin = ast.Name(
@@ -246,6 +208,7 @@ class SymTabBuildPass(SymTabPass):
                 name=Tok.NAME,
                 value=str(obj),
                 line=0,
+                end_line=0,
                 col_start=0,
                 col_end=0,
                 pos_start=0,
@@ -253,6 +216,7 @@ class SymTabBuildPass(SymTabPass):
             )
             self.sync_node_to_scope(builtin)
             self.def_insert(builtin)
+        # self.def_insert(ast.Name.gen_stub_from_node(node.name, "root"))
 
     def exit_module(self, node: ast.Module) -> None:
         """Sub objects.
@@ -263,23 +227,7 @@ class SymTabBuildPass(SymTabPass):
         mod_path: str,
         is_imported: bool,
         """
-        s = self.pop_scope()
-        # If not the main module add all the other modules symbol table
-        # as a child to the current symbol table
-        if node != self.ir:
-            self.cur_scope().kid.append(s)
-            s.parent = self.cur_scope()
-
-        if (
-            isinstance(node.parent, ast.Module)
-            and node
-            in [
-                node.parent.impl_mod,
-                node.parent.test_mod,
-            ]
-            and node.sym_tab
-        ):
-            self.inherit_sym_tab(scope=self.cur_scope(), sym_tab=node.sym_tab)
+        self.pop_scope()
 
     def enter_global_vars(self, node: ast.GlobalVars) -> None:
         """Sub objects.
@@ -510,6 +458,9 @@ class SymTabBuildPass(SymTabPass):
         self.def_insert(node, access_spec=node, single_decl="ability")
         self.push_scope(node.sym_name, node)
         self.sync_node_to_scope(node)
+        if node.is_method:
+            self.def_insert(ast.Name.gen_stub_from_node(node, "self"))
+            self.def_insert(ast.Name.gen_stub_from_node(node, "super"))
 
     def exit_ability(self, node: ast.Ability) -> None:
         """Sub objects.
@@ -896,6 +847,13 @@ class SymTabBuildPass(SymTabPass):
         """
         self.sync_node_to_scope(node)
 
+    def enter_check_stmt(self, node: ast.CheckStmt) -> None:
+        """Sub objects.
+
+        target: Expr,
+        """
+        self.sync_node_to_scope(node)
+
     def enter_ctrl_stmt(self, node: ast.CtrlStmt) -> None:
         """Sub objects.