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

jaclang/compiler/absyntree.py

@@ -12,14 +12,13 @@ from jaclang.compiler import TOKEN_MAP
 from jaclang.compiler.codeloc import CodeGenTarget, CodeLocInfo
 from jaclang.compiler.constant import Constants as Con, EdgeDir
 from jaclang.compiler.constant import DELIM_MAP, Tokens as Tok
+from jaclang.compiler.semtable import SemRegistry
 from jaclang.compiler.symtable import (
     Symbol,
     SymbolAccess,
-    SymbolInfo,
     SymbolTable,
     SymbolType,
 )
-from jaclang.core.registry import SemRegistry
 from jaclang.utils.treeprinter import dotgen_ast_tree, print_ast_tree
 
 
@@ -58,6 +57,17 @@ class AstNode:
             self.loc.update_last_token(self.kid[-1].loc.last_tok)
         return self
 
+    def insert_kids_at_pos(
+        self, nodes: Sequence[AstNode], pos: int, pos_update: bool = True
+    ) -> AstNode:
+        """Insert kids at position."""
+        self.kid = [*self.kid[:pos], *nodes, *self.kid[pos:]]
+        if pos_update:
+            for i in nodes:
+                i.parent = self
+            self.loc.update_token_range(*self.resolve_tok_range())
+        return self
+
     def set_kids(self, nodes: Sequence[AstNode]) -> AstNode:
         """Set kids."""
         self.kid = [*nodes]
@@ -101,6 +111,7 @@ class AstNode:
             col_start=self.loc.col_start,
             col_end=0,
             line=self.loc.first_line,
+            end_line=self.loc.last_line,
             pos_start=0,
             pos_end=0,
         )
@@ -176,17 +187,56 @@ class AstSymbolNode(AstNode):
     """Nodes that have link to a symbol in symbol table."""
 
     def __init__(
-        self, sym_name: str, sym_name_node: AstNode, sym_type: SymbolType
+        self, sym_name: str, name_spec: NameAtom, sym_category: SymbolType
     ) -> None:
         """Initialize ast."""
-        self.sym_link: Optional[Symbol] = None
-        self.sym_name: str = sym_name
-        self.sym_name_node = sym_name_node
-        if isinstance(self.sym_name_node, NameSpec):
-            self.sym_name_node.name_of = self
-        self.sym_type: SymbolType = sym_type
-        self.sym_info: SymbolInfo = SymbolInfo()
-        self.py_ctx_func: Type[ast3.AST] = ast3.Load
+        self.name_spec = name_spec
+        self.name_spec.name_of = self
+        self.name_spec._sym_name = sym_name
+        self.name_spec._sym_category = sym_category
+
+    @property
+    def sym(self) -> Optional[Symbol]:
+        """Get symbol."""
+        return self.name_spec.sym
+
+    @property
+    def sym_name(self) -> str:
+        """Get symbol name."""
+        return self.name_spec.sym_name
+
+    @property
+    def sym_category(self) -> SymbolType:
+        """Get symbol category."""
+        return self.name_spec.sym_category
+
+    @property
+    def py_ctx_func(self) -> Type[ast3.AST]:
+        """Get python context function."""
+        return self.name_spec.py_ctx_func
+
+    @property
+    def sym_type(self) -> str:
+        """Get symbol type."""
+        return self.name_spec.sym_type
+
+    @property
+    def type_sym_tab(self) -> Optional[SymbolTable]:
+        """Get type symbol table."""
+        return self.name_spec.type_sym_tab
+
+
+class AstSymbolStubNode(AstSymbolNode):
+    """Nodes that have link to a symbol in symbol table."""
+
+    def __init__(self, sym_type: SymbolType) -> None:
+        """Initialize ast."""
+        AstSymbolNode.__init__(
+            self,
+            sym_name=f"[{self.__class__.__name__}]",
+            name_spec=Name.gen_stub_from_node(self, f"[{self.__class__.__name__}]"),
+            sym_category=sym_type,
+        )
 
 
 class AstAccessNode(AstNode):
@@ -261,7 +311,31 @@ class WalkerStmtOnlyNode(AstNode):
         self.from_walker: bool = False
 
 
-class AstImplOnlyNode(AstNode):
+class Expr(AstNode):
+    """Expr node type for Jac Ast."""
+
+
+class AtomExpr(Expr, AstSymbolStubNode):
+    """AtomExpr node type for Jac Ast."""
+
+
+class ElementStmt(AstDocNode):
+    """ElementStmt node type for Jac Ast."""
+
+
+class ArchBlockStmt(AstNode):
+    """ArchBlockStmt node type for Jac Ast."""
+
+
+class EnumBlockStmt(AstNode):
+    """EnumBlockStmt node type for Jac Ast."""
+
+
+class CodeBlockStmt(AstNode):
+    """CodeBlockStmt node type for Jac Ast."""
+
+
+class AstImplOnlyNode(CodeBlockStmt, ElementStmt, AstSymbolNode):
     """ImplOnly node type for Jac Ast."""
 
     def __init__(
@@ -271,6 +345,28 @@ class AstImplOnlyNode(AstNode):
         self.target = target
         self.body = body
         self.decl_link = decl_link
+        AstSymbolNode.__init__(
+            self,
+            sym_name=self.target.py_resolve_name(),
+            name_spec=self.create_impl_name_node(),
+            sym_category=SymbolType.IMPL,
+        )
+
+    def create_impl_name_node(self) -> Name:
+        """Create impl name."""
+        ret = Name(
+            file_path=self.target.archs[-1].loc.mod_path,
+            name=Tok.NAME.value,
+            value=self.target.py_resolve_name(),
+            col_start=self.target.archs[0].loc.col_start,
+            col_end=self.target.archs[-1].loc.col_end,
+            line=self.target.archs[0].loc.first_line,
+            end_line=self.target.archs[-1].loc.last_line,
+            pos_start=self.target.archs[0].loc.pos_start,
+            pos_end=self.target.archs[-1].loc.pos_end,
+        )
+        ret.name_of = self
+        return ret
 
 
 class AstImplNeedingNode(AstSymbolNode, Generic[T]):
@@ -286,36 +382,74 @@ class AstImplNeedingNode(AstSymbolNode, Generic[T]):
         return self.body is None
 
 
-class Expr(AstNode):
-    """Expr node type for Jac Ast."""
-
+class NameAtom(AtomExpr, EnumBlockStmt):
+    """NameSpec node type for Jac Ast."""
 
-class AtomExpr(Expr, AstSymbolNode):
-    """AtomExpr node type for Jac Ast."""
+    def __init__(self) -> None:
+        """Initialize name spec node."""
+        self.name_of: AstSymbolNode = self
+        self._sym: Optional[Symbol] = None
+        self._sym_name: str = ""
+        self._sym_category: SymbolType = SymbolType.UNKNOWN
+        self._py_ctx_func: Type[ast3.AST] = ast3.Load
+        self._sym_type: str = "NoType"
+        self._type_sym_tab: Optional[SymbolTable] = None
 
+    @property
+    def sym(self) -> Optional[Symbol]:
+        """Get symbol."""
+        return self._sym
 
-class ElementStmt(AstDocNode):
-    """ElementStmt node type for Jac Ast."""
+    @sym.setter
+    def sym(self, sym: Symbol) -> None:
+        """Set symbol."""
+        self._sym = sym
 
+    @property
+    def sym_name(self) -> str:
+        """Get symbol name."""
+        return self._sym_name
 
-class ArchBlockStmt(AstNode):
-    """ArchBlockStmt node type for Jac Ast."""
+    @property
+    def sym_category(self) -> SymbolType:
+        """Get symbol category."""
+        return self._sym_category
 
+    @property
+    def clean_type(self) -> str:
+        """Get clean type."""
+        ret_type = self.sym_type.replace("builtins.", "").replace("NoType", "")
+        return ret_type
 
-class EnumBlockStmt(AstNode):
-    """EnumBlockStmt node type for Jac Ast."""
+    @property
+    def py_ctx_func(self) -> Type[ast3.AST]:
+        """Get python context function."""
+        return self._py_ctx_func
 
+    @py_ctx_func.setter
+    def py_ctx_func(self, py_ctx_func: Type[ast3.AST]) -> None:
+        """Set python context function."""
+        self._py_ctx_func = py_ctx_func
 
-class CodeBlockStmt(AstNode):
-    """CodeBlockStmt node type for Jac Ast."""
+    @property
+    def sym_type(self) -> str:
+        """Get symbol type."""
+        return self._sym_type
 
+    @sym_type.setter
+    def sym_type(self, sym_type: str) -> None:
+        """Set symbol type."""
+        self._sym_type = sym_type
 
-class NameSpec(AtomExpr, EnumBlockStmt):
-    """NameSpec node type for Jac Ast."""
+    @property
+    def type_sym_tab(self) -> Optional[SymbolTable]:
+        """Get type symbol table."""
+        return self._type_sym_tab
 
-    def __init__(self) -> None:
-        """Initialize name spec node."""
-        self.name_of: AstSymbolNode = self
+    @type_sym_tab.setter
+    def type_sym_tab(self, type_sym_tab: SymbolTable) -> None:
+        """Set type symbol table."""
+        self._type_sym_tab = type_sym_tab
 
 
 class ArchSpec(ElementStmt, CodeBlockStmt, AstSymbolNode, AstDocNode, AstSemStrNode):
@@ -522,26 +656,31 @@ class Test(AstSymbolNode, ElementStmt):
             if isinstance(name, Name)
             else Name(
                 file_path=name.file_path,
-                name="NAME",
-                value=f"test_t{Test.TEST_COUNT}",
+                name=Tok.NAME.value,
+                value=f"_jac_gen_{Test.TEST_COUNT}",
                 col_start=name.loc.col_start,
                 col_end=name.loc.col_end,
                 line=name.loc.first_line,
+                end_line=name.loc.last_line,
                 pos_start=name.pos_start,
                 pos_end=name.pos_end,
             )
         )
         self.name.parent = self
-        # kid[0] = self.name  # Index is 0 since Doc string is inserted after init
+        self.name._sym_name = (
+            f"test_{self.name.value}"
+            if not self.name.value.startswith("test_")
+            else self.name.value
+        )
         self.body = body
         AstNode.__init__(self, kid=kid)
         if self.name not in self.kid:
-            self.add_kids_left([self.name], pos_update=False)
+            self.insert_kids_at_pos([self.name], pos=1, pos_update=False)
         AstSymbolNode.__init__(
             self,
             sym_name=self.name.sym_name,
-            sym_name_node=self.name,
-            sym_type=SymbolType.TEST,
+            name_spec=self.name,
+            sym_category=SymbolType.TEST,
         )
         AstDocNode.__init__(self, doc=doc)
 
@@ -690,12 +829,15 @@ class ModulePath(AstSymbolNode):
         self.alias = alias
         self.sub_module = sub_module
 
+        name_spec = alias if alias else path[0] if path else None
+        if not isinstance(name_spec, Name):
+            raise ValueError("ModulePath should have a name spec. Impossible.")
         AstNode.__init__(self, kid=kid)
         AstSymbolNode.__init__(
             self,
-            sym_name=alias.sym_name if alias else self.path_str,
-            sym_name_node=alias if alias else self,
-            sym_type=SymbolType.MODULE,
+            sym_name=name_spec.sym_name,
+            name_spec=name_spec,
+            sym_category=SymbolType.MODULE,
         )
 
     @property
@@ -748,8 +890,8 @@ class ModuleItem(AstSymbolNode):
         AstSymbolNode.__init__(
             self,
             sym_name=alias.sym_name if alias else name.sym_name,
-            sym_name_node=alias if alias else name,
-            sym_type=SymbolType.MOD_VAR,
+            name_spec=alias if alias else name,
+            sym_category=SymbolType.MOD_VAR,
         )
 
     def normalize(self, deep: bool = False) -> bool:
@@ -789,8 +931,8 @@ class Architype(ArchSpec, AstAccessNode, ArchBlockStmt, AstImplNeedingNode):
         AstSymbolNode.__init__(
             self,
             sym_name=name.value,
-            sym_name_node=name,
-            sym_type=(
+            name_spec=name,
+            sym_category=(
                 SymbolType.OBJECT_ARCH
                 if arch_type.name == Tok.KW_OBJECT
                 else (
@@ -865,7 +1007,7 @@ class Architype(ArchSpec, AstAccessNode, ArchBlockStmt, AstImplNeedingNode):
         return res
 
 
-class ArchDef(ArchSpec, AstImplOnlyNode):
+class ArchDef(AstImplOnlyNode):
     """ArchDef node type for Jac Ast."""
 
     def __init__(
@@ -879,14 +1021,7 @@ class ArchDef(ArchSpec, AstImplOnlyNode):
     ) -> None:
         """Initialize arch def node."""
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=target.py_resolve_name(),
-            sym_name_node=target,
-            sym_type=SymbolType.IMPL,
-        )
         AstDocNode.__init__(self, doc=doc)
-        ArchSpec.__init__(self, decorators=decorators)
         AstImplOnlyNode.__init__(self, target=target, body=body, decl_link=decl_link)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -896,7 +1031,6 @@ class ArchDef(ArchSpec, AstImplOnlyNode):
             res = self.target.normalize(deep)
             res = res and self.body.normalize(deep)
             res = res and self.doc.normalize(deep) if self.doc else res
-            res = res and self.decorators.normalize(deep) if self.decorators else res
         new_kid: list[AstNode] = []
         if self.doc:
             new_kid.append(self.doc)
@@ -927,8 +1061,8 @@ class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode, ArchBlockStmt):
         AstSymbolNode.__init__(
             self,
             sym_name=name.value,
-            sym_name_node=name,
-            sym_type=SymbolType.ENUM_ARCH,
+            name_spec=name,
+            sym_category=SymbolType.ENUM_ARCH,
         )
         AstImplNeedingNode.__init__(self, body=body)
         AstAccessNode.__init__(self, access=access)
@@ -975,7 +1109,7 @@ class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode, ArchBlockStmt):
         return res
 
 
-class EnumDef(ArchSpec, AstImplOnlyNode):
+class EnumDef(AstImplOnlyNode):
     """EnumDef node type for Jac Ast."""
 
     def __init__(
@@ -989,14 +1123,7 @@ class EnumDef(ArchSpec, AstImplOnlyNode):
     ) -> None:
         """Initialize arch def node."""
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=target.py_resolve_name(),
-            sym_name_node=target,
-            sym_type=SymbolType.IMPL,
-        )
         AstDocNode.__init__(self, doc=doc)
-        ArchSpec.__init__(self, decorators=decorators)
         AstImplOnlyNode.__init__(self, target=target, body=body, decl_link=decl_link)
 
     def normalize(self, deep: bool = False) -> bool:
@@ -1006,7 +1133,6 @@ class EnumDef(ArchSpec, AstImplOnlyNode):
             res = self.target.normalize(deep)
             res = res and self.body.normalize(deep)
             res = res and self.doc.normalize(deep) if self.doc else res
-            res = res and self.decorators.normalize(deep) if self.decorators else res
         new_kid: list[AstNode] = []
         if self.doc:
             new_kid.append(self.doc)
@@ -1031,7 +1157,7 @@ class Ability(
 
     def __init__(
         self,
-        name_ref: NameSpec,
+        name_ref: NameAtom,
         is_async: bool,
         is_override: bool,
         is_static: bool,
@@ -1057,17 +1183,17 @@ class Ability(
         AstSymbolNode.__init__(
             self,
             sym_name=self.py_resolve_name(),
-            sym_name_node=name_ref,
-            sym_type=SymbolType.ABILITY,
+            name_spec=name_ref,
+            sym_category=SymbolType.ABILITY,
         )
         AstAccessNode.__init__(self, access=access)
         AstDocNode.__init__(self, doc=doc)
         AstAsyncNode.__init__(self, is_async=is_async)
 
     @property
-    def is_func(self) -> bool:
+    def is_method(self) -> bool:
         """Check if is func."""
-        return isinstance(self.body, FuncSignature)
+        return self.signature.is_method
 
     @property
     def is_genai_ability(self) -> bool:
@@ -1132,7 +1258,7 @@ class Ability(
         return res
 
 
-class AbilityDef(AstSymbolNode, ElementStmt, AstImplOnlyNode, CodeBlockStmt):
+class AbilityDef(AstImplOnlyNode):
     """AbilityDef node type for Jac Ast."""
 
     def __init__(
@@ -1149,12 +1275,6 @@ class AbilityDef(AstSymbolNode, ElementStmt, AstImplOnlyNode, CodeBlockStmt):
         self.signature = signature
         self.decorators = decorators
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=target.py_resolve_name(),
-            sym_name_node=target,
-            sym_type=SymbolType.IMPL,
-        )
         AstDocNode.__init__(self, doc=doc)
         AstImplOnlyNode.__init__(self, target=target, body=body, decl_link=decl_link)
 
@@ -1192,6 +1312,7 @@ class FuncSignature(AstSemStrNode):
         """Initialize method signature node."""
         self.params = params
         self.return_type = return_type
+        self.is_method = False
         AstNode.__init__(self, kid=kid)
         AstSemStrNode.__init__(self, semstr=semstr)
 
@@ -1240,6 +1361,7 @@ class EventSignature(AstSemStrNode):
         self.event = event
         self.arch_tag_info = arch_tag_info
         self.return_type = return_type
+        self.is_method = False
         AstNode.__init__(self, kid=kid)
         AstSemStrNode.__init__(self, semstr=semstr)
 
@@ -1298,11 +1420,11 @@ class ArchRefChain(AstNode):
         def get_tag(x: ArchRef) -> str:
             return (
                 "en"
-                if x.arch.value == "enum"
-                else "cls" if x.arch.value == "class" else x.arch.value[1]
+                if x.arch_type.value == "enum"
+                else "cls" if x.arch_type.value == "class" else x.arch_type.value[1]
             )
 
-        return ".".join([f"({get_tag(x)}){x.py_resolve_name()}" for x in self.archs])
+        return ".".join([f"({get_tag(x)}){x.sym_name}" for x in self.archs])
 
     def flat_name(self) -> str:
         """Resolve name for python gen."""
@@ -1331,8 +1453,8 @@ class ParamVar(AstSymbolNode, AstTypedVarNode, AstSemStrNode):
         AstSymbolNode.__init__(
             self,
             sym_name=name.value,
-            sym_name_node=name,
-            sym_type=SymbolType.VAR,
+            name_spec=name,
+            sym_category=SymbolType.VAR,
         )
         AstTypedVarNode.__init__(self, type_tag=type_tag)
         AstSemStrNode.__init__(self, semstr=semstr)
@@ -1427,8 +1549,8 @@ class HasVar(AstSymbolNode, AstTypedVarNode, AstSemStrNode):
         AstSymbolNode.__init__(
             self,
             sym_name=name.value,
-            sym_name_node=name,
-            sym_type=SymbolType.HAS_VAR,
+            name_spec=name,
+            sym_category=SymbolType.HAS_VAR,
         )
         AstTypedVarNode.__init__(self, type_tag=type_tag)
         AstSemStrNode.__init__(self, semstr=semstr)
@@ -1943,6 +2065,32 @@ class AssertStmt(CodeBlockStmt):
         return res
 
 
+class CheckStmt(CodeBlockStmt):
+    """DeleteStmt node type for Jac Ast."""
+
+    def __init__(
+        self,
+        target: Expr,
+        kid: Sequence[AstNode],
+    ) -> None:
+        """Initialize delete statement node."""
+        self.target = target
+        AstNode.__init__(self, kid=kid)
+
+    def normalize(self, deep: bool = False) -> bool:
+        """Normalize delete statement node."""
+        res = True
+        if deep:
+            res = self.target.normalize(deep)
+        new_kid: list[AstNode] = [
+            self.gen_token(Tok.KW_CHECK),
+            self.target,
+            self.gen_token(Tok.SEMI),
+        ]
+        self.set_kids(nodes=new_kid)
+        return res
+
+
 class CtrlStmt(CodeBlockStmt):
     """CtrlStmt node type for Jac Ast."""
 
@@ -2192,7 +2340,7 @@ class GlobalStmt(CodeBlockStmt):
 
     def __init__(
         self,
-        target: SubNodeList[NameSpec],
+        target: SubNodeList[NameAtom],
         kid: Sequence[AstNode],
     ) -> None:
         """Initialize global statement node."""
@@ -2485,12 +2633,7 @@ class MultiString(AtomExpr):
         """Initialize multi string expression node."""
         self.strings = strings
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.STRING,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.STRING)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2516,12 +2659,7 @@ class FString(AtomExpr):
         """Initialize fstring expression node."""
         self.parts = parts
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.STRING,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.STRING)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2551,12 +2689,7 @@ class ListVal(AtomExpr):
         """Initialize value node."""
         self.values = values
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2584,12 +2717,7 @@ class SetVal(AtomExpr):
         """Initialize value node."""
         self.values = values
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2617,12 +2745,7 @@ class TupleVal(AtomExpr):
         """Initialize tuple value node."""
         self.values = values
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2665,12 +2788,7 @@ class DictVal(AtomExpr):
         """Initialize dict expression node."""
         self.kv_pairs = kv_pairs
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2726,7 +2844,7 @@ class KWPair(AstNode):
 
     def __init__(
         self,
-        key: Optional[NameSpec],  # is **value if blank
+        key: Optional[NameAtom],  # is **value if blank
         value: Expr,
         kid: Sequence[AstNode],
     ) -> None:
@@ -2803,12 +2921,7 @@ class ListCompr(AtomExpr):
         self.out_expr = out_expr
         self.compr = compr
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -2883,12 +2996,7 @@ class DictCompr(AtomExpr):
         self.kv_pair = kv_pair
         self.compr = compr
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -3047,12 +3155,7 @@ class IndexSlice(AtomExpr):
         self.step = step
         self.is_range = is_range
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_type=SymbolType.SEQUENCE,
-            sym_name_node=self,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = True) -> bool:
         """Normalize ast node."""
@@ -3081,91 +3184,35 @@ class IndexSlice(AtomExpr):
         return res
 
 
-class ArchRef(NameSpec):
+class ArchRef(AtomExpr):
     """ArchRef node type for Jac Ast."""
 
     def __init__(
         self,
-        name_ref: NameSpec,
-        arch: Token,
+        arch_name: NameAtom,
+        arch_type: Token,
         kid: Sequence[AstNode],
     ) -> None:
         """Initialize architype reference expression node."""
-        self.name_ref = name_ref
-        self.arch = arch
-        AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=self.py_resolve_name(),
-            sym_name_node=name_ref,
-            sym_type=SymbolType.TYPE,
-        )
-        NameSpec.__init__(self)
-
-    def normalize(self, deep: bool = False) -> bool:
-        """Normalize ast node."""
-        res = True
-        if deep:
-            res = self.name_ref.normalize(deep)
-        new_kid: list[AstNode] = [self.arch, self.name_ref]
-        self.set_kids(nodes=new_kid)
-        return res
-
-    def py_resolve_name(self) -> str:
-        """Resolve name."""
-        if isinstance(self.name_ref, Name):
-            return self.name_ref.value
-        elif isinstance(self.name_ref, SpecialVarRef):
-            return self.name_ref.py_resolve_name()
-        else:
-            raise NotImplementedError
-
-
-class SpecialVarRef(NameSpec):
-    """HereRef node type for Jac Ast."""
-
-    def __init__(
-        self,
-        var: Token,
-        kid: Sequence[AstNode],
-    ) -> None:
-        """Initialize special var reference expression node."""
-        self.var = var
+        self.arch_name = arch_name
+        self.arch_type = arch_type
         AstNode.__init__(self, kid=kid)
         AstSymbolNode.__init__(
             self,
-            sym_name=self.py_resolve_name(),
-            sym_name_node=var,
-            sym_type=SymbolType.VAR,
+            sym_name=arch_name.sym_name,
+            name_spec=arch_name,
+            sym_category=SymbolType.TYPE,
         )
-        NameSpec.__init__(self)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
         res = True
         if deep:
-            res = self.var.normalize(deep)
-        new_kid: list[AstNode] = [self.var]
+            res = self.arch_name.normalize(deep)
+        new_kid: list[AstNode] = [self.arch_type, self.arch_name]
         self.set_kids(nodes=new_kid)
         return res
 
-    def py_resolve_name(self) -> str:
-        """Resolve name."""
-        if self.var.name == Tok.KW_SELF:
-            return "self"
-        elif self.var.name == Tok.KW_SUPER:
-            return "super()"
-        elif self.var.name == Tok.KW_ROOT:
-            return Con.ROOT.value
-        elif self.var.name == Tok.KW_HERE:
-            return Con.HERE.value
-        elif self.var.name == Tok.KW_INIT:
-            return "__init__"
-        elif self.var.name == Tok.KW_POST_INIT:
-            return "__post_init__"
-        else:
-            raise NotImplementedError("ICE: Special var reference not implemented")
-
 
 class EdgeRefTrailer(Expr):
     """EdgeRefTrailer node type for Jac Ast."""
@@ -3210,12 +3257,7 @@ class EdgeOpRef(WalkerStmtOnlyNode, AtomExpr):
         self.edge_dir = edge_dir
         AstNode.__init__(self, kid=kid)
         WalkerStmtOnlyNode.__init__(self)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -3344,12 +3386,7 @@ class FilterCompr(AtomExpr):
         self.f_type = f_type
         self.compares = compares
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -3386,12 +3423,7 @@ class AssignCompr(AtomExpr):
         """Initialize assign compr expression node."""
         self.assigns = assigns
         AstNode.__init__(self, kid=kid)
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=SymbolType.SEQUENCE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=SymbolType.SEQUENCE)
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize ast node."""
@@ -3515,7 +3547,7 @@ class MatchAs(MatchPattern):
 
     def __init__(
         self,
-        name: NameSpec,
+        name: NameAtom,
         pattern: Optional[MatchPattern],
         kid: Sequence[AstNode],
     ) -> None:
@@ -3554,6 +3586,7 @@ class MatchWild(MatchPattern):
                     col_start=self.loc.col_start,
                     col_end=self.loc.col_end,
                     line=self.loc.first_line,
+                    end_line=self.loc.last_line,
                     pos_start=self.loc.pos_start,
                     pos_end=self.loc.pos_end,
                 )
@@ -3663,7 +3696,7 @@ class MatchKVPair(MatchPattern):
 
     def __init__(
         self,
-        key: MatchPattern | NameSpec,
+        key: MatchPattern | NameAtom,
         value: MatchPattern,
         kid: Sequence[AstNode],
     ) -> None:
@@ -3691,7 +3724,7 @@ class MatchStar(MatchPattern):
 
     def __init__(
         self,
-        name: NameSpec,
+        name: NameAtom,
         is_list: bool,
         kid: Sequence[AstNode],
     ) -> None:
@@ -3718,7 +3751,7 @@ class MatchArch(MatchPattern):
 
     def __init__(
         self,
-        name: AtomTrailer | NameSpec,
+        name: AtomTrailer | NameAtom,
         arg_patterns: Optional[SubNodeList[MatchPattern]],
         kw_patterns: Optional[SubNodeList[MatchKVPair]],
         kid: Sequence[AstNode],
@@ -3761,6 +3794,7 @@ class Token(AstNode):
         name: str,
         value: str,
         line: int,
+        end_line: int,
         col_start: int,
         col_end: int,
         pos_start: int,
@@ -3771,6 +3805,7 @@ class Token(AstNode):
         self.name = name
         self.value = value
         self.line_no = line
+        self.end_line = end_line
         self.c_start = col_start
         self.c_end = col_end
         self.pos_start = pos_start
@@ -3786,7 +3821,7 @@ class Token(AstNode):
         return self.value
 
 
-class Name(Token, NameSpec):
+class Name(Token, NameAtom):
     """Name node type for Jac Ast."""
 
     def __init__(
@@ -3795,6 +3830,7 @@ class Name(Token, NameSpec):
         name: str,
         value: str,
         line: int,
+        end_line: int,
         col_start: int,
         col_end: int,
         pos_start: int,
@@ -3811,18 +3847,19 @@ class Name(Token, NameSpec):
             name=name,
             value=value,
             line=line,
+            end_line=end_line,
             col_start=col_start,
             col_end=col_end,
             pos_start=pos_start,
             pos_end=pos_end,
         )
+        NameAtom.__init__(self)
         AstSymbolNode.__init__(
             self,
             sym_name=value,
-            sym_name_node=self,
-            sym_type=SymbolType.VAR,
+            name_spec=self,
+            sym_category=SymbolType.VAR,
         )
-        NameSpec.__init__(self)
 
     def unparse(self) -> str:
         """Unparse name."""
@@ -3831,6 +3868,71 @@ class Name(Token, NameSpec):
             ",\n" if self.is_enum_singleton else ""
         )
 
+    @staticmethod
+    def gen_stub_from_node(node: AstSymbolNode, name_str: str) -> Name:
+        """Generate name from node."""
+        ret = Name(
+            file_path=node.loc.mod_path,
+            name=Tok.NAME.value,
+            value=name_str,
+            col_start=node.loc.col_start,
+            col_end=node.loc.col_end,
+            line=node.loc.first_line,
+            end_line=node.loc.last_line,
+            pos_start=node.loc.pos_start,
+            pos_end=node.loc.pos_end,
+        )
+        ret.name_of = node
+        ret.sym_tab = node.sym_tab
+        return ret
+
+
+class SpecialVarRef(Name):
+    """HereRef node type for Jac Ast."""
+
+    def __init__(
+        self,
+        var: Name,
+    ) -> None:
+        """Initialize special var reference expression node."""
+        self.orig = var
+        Name.__init__(
+            self,
+            file_path=var.file_path,
+            name=var.name,
+            value=self.py_resolve_name(),  # TODO: This shouldnt be necessary
+            line=var.line_no,
+            end_line=var.end_line,
+            col_start=var.c_start,
+            col_end=var.c_end,
+            pos_start=var.pos_start,
+            pos_end=var.pos_end,
+        )
+        NameAtom.__init__(self)
+        AstSymbolNode.__init__(
+            self,
+            sym_name=self.py_resolve_name(),
+            name_spec=self,
+            sym_category=SymbolType.VAR,
+        )
+
+    def py_resolve_name(self) -> str:
+        """Resolve name."""
+        if self.orig.name == Tok.KW_SELF:
+            return "self"
+        elif self.orig.name == Tok.KW_SUPER:
+            return "super"
+        elif self.orig.name == Tok.KW_ROOT:
+            return Con.ROOT.value
+        elif self.orig.name == Tok.KW_HERE:
+            return Con.HERE.value
+        elif self.orig.name == Tok.KW_INIT:
+            return "__init__"
+        elif self.orig.name == Tok.KW_POST_INIT:
+            return "__post_init__"
+        else:
+            raise NotImplementedError("ICE: Special var reference not implemented")
+
 
 class Literal(Token, AtomExpr):
     """Literal node type for Jac Ast."""
@@ -3856,6 +3958,7 @@ class Literal(Token, AtomExpr):
         name: str,
         value: str,
         line: int,
+        end_line: int,
         col_start: int,
         col_end: int,
         pos_start: int,
@@ -3868,17 +3971,13 @@ class Literal(Token, AtomExpr):
             name=name,
             value=value,
             line=line,
+            end_line=end_line,
             col_start=col_start,
             col_end=col_end,
             pos_start=pos_start,
             pos_end=pos_end,
         )
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=self.SYMBOL_TYPE,
-        )
+        AstSymbolStubNode.__init__(self, sym_type=self.SYMBOL_TYPE)
 
     @property
     def lit_value(
@@ -3888,43 +3987,7 @@ class Literal(Token, AtomExpr):
         raise NotImplementedError
 
 
-class TokenSymbol(Token, AstSymbolNode):
-    """TokenSymbol node type for Jac Ast."""
-
-    SYMBOL_TYPE = SymbolType.VAR
-
-    def __init__(
-        self,
-        file_path: str,
-        name: str,
-        value: str,
-        line: int,
-        col_start: int,
-        col_end: int,
-        pos_start: int,
-        pos_end: int,
-    ) -> None:
-        """Initialize token."""
-        Token.__init__(
-            self,
-            file_path=file_path,
-            name=name,
-            value=value,
-            line=line,
-            col_start=col_start,
-            col_end=col_end,
-            pos_start=pos_start,
-            pos_end=pos_end,
-        )
-        AstSymbolNode.__init__(
-            self,
-            sym_name=f"[{self.__class__.__name__}]",
-            sym_name_node=self,
-            sym_type=self.SYMBOL_TYPE,
-        )
-
-
-class BuiltinType(Name, Literal, NameSpec):
+class BuiltinType(Name, Literal, NameAtom):
     """Type node type for Jac Ast."""
 
     SYMBOL_TYPE = SymbolType.VAR
@@ -4037,6 +4100,7 @@ class EmptyToken(Token):
             file_path="",
             value="",
             line=0,
+            end_line=0,
             col_start=0,
             col_end=0,
             pos_start=0,