jaclang 0.7.34__py3-none-any.whl → 0.8.1__py3-none-any.whl

jaclang/compiler/parser.py

@@ -5,47 +5,48 @@ from __future__ import annotations
 import keyword
 import logging
 import os
-from typing import Callable, TypeAlias, TypeVar
+from typing import Callable, Sequence, TYPE_CHECKING, TypeAlias, TypeVar, cast
 
-import jaclang.compiler.absyntree as ast
-from jaclang.compiler import jac_lark as jl  # type: ignore
+import jaclang.compiler.unitree as uni
+from jaclang.compiler import jac_lark as jl
 from jaclang.compiler.constant import EdgeDir, Tokens as Tok
-from jaclang.compiler.passes.ir_pass import Pass
+from jaclang.compiler.passes.main import Transform
 from jaclang.vendor.lark import Lark, Transformer, Tree, logger
 
+if TYPE_CHECKING:
+    from jaclang.compiler.program import JacProgram
 
-T = TypeVar("T", bound=ast.AstNode)
+T = TypeVar("T", bound=uni.UniNode)
+TL = TypeVar("TL", bound=(uni.UniNode | list))
 
 
-class JacParser(Pass):
+class JacParser(Transform[uni.Source, uni.Module]):
     """Jac Parser."""
 
     dev_mode = False
 
-    def __init__(self, input_ir: ast.JacSource) -> None:
+    def __init__(self, root_ir: uni.Source, prog: JacProgram) -> None:
         """Initialize parser."""
-        self.source = input_ir
-        self.mod_path = input_ir.loc.mod_path
-        self.node_list: list[ast.AstNode] = []
+        self.mod_path = root_ir.loc.mod_path
+        self.node_list: list[uni.UniNode] = []
         if JacParser.dev_mode:
             JacParser.make_dev()
-        Pass.__init__(self, input_ir=input_ir, prior=None)
+        Transform.__init__(self, ir_in=root_ir, prog=prog)
 
-    def transform(self, ir: ast.AstNode) -> ast.Module:
+    def transform(self, ir_in: uni.Source) -> uni.Module:
         """Transform input IR."""
         try:
-            tree, comments = JacParser.parse(
-                self.source.value, on_error=self.error_callback
-            )
+            tree, comments = JacParser.parse(ir_in.value, on_error=self.error_callback)
             mod = JacParser.TreeToAST(parser=self).transform(tree)
-            self.source.comments = [self.proc_comment(i, mod) for i in comments]
-            if isinstance(mod, ast.Module):
+            ir_in.comments = [self.proc_comment(i, mod) for i in comments]
+            if isinstance(mod, uni.Module):
+                self.ir_out = mod
                 return mod
             else:
                 raise self.ice()
         except jl.UnexpectedInput as e:
-            catch_error = ast.EmptyToken()
-            catch_error.orig_src = self.source
+            catch_error = uni.EmptyToken()
+            catch_error.orig_src = ir_in
             catch_error.line_no = e.line
             catch_error.end_line = e.line
             catch_error.c_start = e.column
@@ -56,25 +57,17 @@ class JacParser(Pass):
             error_msg = "Syntax Error"
             if len(e.args) >= 1 and isinstance(e.args[0], str):
                 error_msg += e.args[0]
-            self.error(error_msg, node_override=catch_error)
+            self.log_error(error_msg, node_override=catch_error)
 
         except Exception as e:
-            self.error(f"Internal Error: {e}")
-
-        return ast.Module(
-            name="",
-            source=self.source,
-            doc=None,
-            body=[],
-            terminals=[],
-            is_imported=False,
-            kid=[ast.EmptyToken()],
-        )
+            raise e
+
+        return uni.Module.make_stub(inject_src=ir_in)
 
     @staticmethod
-    def proc_comment(token: jl.Token, mod: ast.AstNode) -> ast.CommentToken:
+    def proc_comment(token: jl.Token, mod: uni.UniNode) -> uni.CommentToken:
         """Process comment."""
-        return ast.CommentToken(
+        return uni.CommentToken(
             orig_src=mod.loc.orig_src,
             name=token.type,
             value=token.value,
@@ -116,13 +109,13 @@ class JacParser(Pass):
             debug=True,
             lexer_callbacks={"COMMENT": JacParser._comment_callback},
         )
-        JacParser.JacTransformer = Transformer[Tree[str], ast.AstNode]  # type: ignore
+        JacParser.JacTransformer = Transformer[Tree[str], uni.UniNode]  # type: ignore
         logger.setLevel(logging.DEBUG)
 
     comment_cache: list[jl.Token] = []
 
     parser = jl.Lark_StandAlone(lexer_callbacks={"COMMENT": _comment_callback})  # type: ignore
-    JacTransformer: TypeAlias = jl.Transformer[jl.Tree[str], ast.AstNode]
+    JacTransformer: TypeAlias = jl.Transformer[jl.Tree[str], uni.UniNode]
 
     class TreeToAST(JacTransformer):
         """Transform parse tree to AST."""
@@ -131,15 +124,15 @@ class JacParser(Pass):
             """Initialize transformer."""
             super().__init__(*args, **kwargs)
             self.parse_ref = parser
-            self.terminals: list[ast.Token] = []
+            self.terminals: list[uni.Token] = []
             # TODO: Once the kid is removed from the ast, we can get rid of this
             # node_idx and directly pop(0) kid as we process the nodes.
             self.node_idx = 0
-            self.cur_nodes: list[ast.AstNode] = []
+            self.cur_nodes: list[uni.UniNode] = []
 
         def ice(self) -> Exception:
             """Raise internal compiler error."""
-            self.parse_ref.error("Internal Compiler Error, Invalid Parse Tree!")
+            self.parse_ref.log_error("Internal Compiler Error, Invalid Parse Tree!")
             return RuntimeError(
                 f"{self.parse_ref.__class__.__name__} - Internal Compiler Error, Invalid Parse Tree!"
             )
@@ -151,8 +144,8 @@ class JacParser(Pass):
             return node
 
         def _call_userfunc(
-            self, tree: jl.Tree, new_children: None | list[ast.AstNode] = None
-        ) -> ast.AstNode:
+            self, tree: jl.Tree, new_children: None | list[uni.UniNode] = None
+        ) -> uni.UniNode:
             self.cur_nodes = new_children or tree.children  # type: ignore[assignment]
             try:
                 return self._node_update(super()._call_userfunc(tree, new_children))
@@ -160,21 +153,21 @@ class JacParser(Pass):
                 self.cur_nodes = []
                 self.node_idx = 0
 
-        def _call_userfunc_token(self, token: jl.Token) -> ast.AstNode:
+        def _call_userfunc_token(self, token: jl.Token) -> uni.UniNode:
             return self._node_update(super()._call_userfunc_token(token))
 
-        def _binary_expr_unwind(self, kid: list[ast.AstNode]) -> ast.Expr:
+        def _binary_expr_unwind(self, kid: list[uni.UniNode]) -> uni.Expr:
             """Binary expression helper."""
             if len(kid) > 1:
                 if (
-                    isinstance(kid[0], ast.Expr)
+                    isinstance(kid[0], uni.Expr)
                     and isinstance(
                         kid[1],
-                        (ast.Token, ast.DisconnectOp, ast.ConnectOp),
+                        (uni.Token, uni.DisconnectOp, uni.ConnectOp),
                     )
-                    and isinstance(kid[2], ast.Expr)
+                    and isinstance(kid[2], uni.Expr)
                 ):
-                    return ast.BinaryExpr(
+                    return uni.BinaryExpr(
                         left=kid[0],
                         op=kid[1],
                         right=kid[2],
@@ -182,7 +175,7 @@ class JacParser(Pass):
                     )
                 else:
                     raise self.ice()
-            elif isinstance(kid[0], ast.Expr):
+            elif isinstance(kid[0], uni.Expr):
                 return kid[0]
             else:
                 raise self.ice()
@@ -191,7 +184,13 @@ class JacParser(Pass):
         # Parser Helper functions.                                            #
         # ******************************************************************* #
 
-        def match(self, ty: type[T]) -> T | None:
+        def extract_from_list(
+            self, nd_list: list[uni.UniNode], ty: type[T] | tuple[type[T], ...]
+        ) -> list[T]:
+            """Extract a list of nodes of type 'ty' from the current nodes."""
+            return cast(list[T], [node for node in nd_list if isinstance(node, ty)])
+
+        def match(self, ty: type[TL]) -> TL | None:
             """Return a node matching type 'ty' if possible from the current nodes."""
             if (self.node_idx < len(self.cur_nodes)) and isinstance(
                 self.cur_nodes[self.node_idx], ty
@@ -200,15 +199,15 @@ class JacParser(Pass):
                 return self.cur_nodes[self.node_idx - 1]  # type: ignore[return-value]
             return None
 
-        def consume(self, ty: type[T]) -> T:
+        def consume(self, ty: type[TL]) -> TL:
             """Consume and return the specified type, if it's not exists, will be an internal compiler error."""
             if node := self.match(ty):
                 return node
             raise self.ice()
 
-        def match_token(self, tok: Tok) -> ast.Token | None:
+        def match_token(self, tok: Tok) -> uni.Token | None:
             """Match a token with the given type and return it."""
-            if token := self.match(ast.Token):
+            if token := self.match(uni.Token):
                 if token.name == tok.name:
                     return token
                 self.node_idx -= (
@@ -216,7 +215,7 @@ class JacParser(Pass):
                 )
             return None
 
-        def consume_token(self, tok: Tok) -> ast.Token:
+        def consume_token(self, tok: Tok) -> uni.Token:
             """Consume a token with the given type and return it."""
             if token := self.match_token(tok):
                 return token
@@ -224,191 +223,198 @@ class JacParser(Pass):
 
         def match_many(self, ty: type[T]) -> list[T]:
             """Match 0 or more of the given type and return the list."""
-            nodes: list[ast.AstNode] = []
+            nodes: list[uni.UniNode] = []
             while node := self.match(ty):
                 nodes.append(node)
             return nodes  # type: ignore[return-value]
 
         def consume_many(self, ty: type[T]) -> list[T]:
             """Match 1 or more of the given type and return the list."""
-            nodes: list[ast.AstNode] = [self.consume(ty)]
+            nodes: list[uni.UniNode] = [self.consume(ty)]
             while node := self.match(ty):
                 nodes.append(node)
             return nodes  # type: ignore[return-value]
 
+        @property
+        def flat_cur_nodes(self) -> list[uni.UniNode]:
+            """Flatten the current nodes."""
+            flat_nodes: list[uni.UniNode] = []
+            for node in self.cur_nodes:
+                if isinstance(node, list):
+                    flat_nodes.extend(node)
+                else:
+                    flat_nodes.append(node)
+            return flat_nodes
+
         # ******************************************************************* #
         # Parsing Rules                                                       #
         # ******************************************************************* #
 
-        def start(self, _: None) -> ast.Module:
+        def start(self, _: None) -> uni.Module:
             """Grammar rule.
 
             start: module
             """
-            module = self.consume(ast.Module)
+            module = self.consume(uni.Module)
             module._in_mod_nodes = self.parse_ref.node_list
             return module
 
-        def module(self, _: None) -> ast.Module:
+        def module(self, _: None) -> uni.Module:
             """Grammar rule.
 
             module: (toplevel_stmt (tl_stmt_with_doc | toplevel_stmt)*)?
                 | STRING (tl_stmt_with_doc | toplevel_stmt)*
             """
-            doc = self.match(ast.String)
-            body = self.match_many(ast.ElementStmt)
-            mod = ast.Module(
+            doc = self.match(uni.String)
+            body = self.match_many(uni.ElementStmt)
+            mod = uni.Module(
                 name=self.parse_ref.mod_path.split(os.path.sep)[-1].rstrip(".jac"),
-                source=self.parse_ref.source,
+                source=self.parse_ref.ir_in,
                 doc=doc,
                 body=body,
-                is_imported=False,
                 terminals=self.terminals,
                 kid=(
                     self.cur_nodes
-                    or [ast.EmptyToken(ast.JacSource("", self.parse_ref.mod_path))]
+                    or [uni.EmptyToken(uni.Source("", self.parse_ref.mod_path))]
                 ),
             )
             return mod
 
-        def tl_stmt_with_doc(self, _: None) -> ast.ElementStmt:
+        def tl_stmt_with_doc(self, _: None) -> uni.ElementStmt:
             """Grammar rule.
 
-            tl_stmt_with_doc: doc_tag toplevel_stmt
+            tl_stmt_with_doc: STRING toplevel_stmt
             """
-            doc = self.consume(ast.String)
-            element = self.consume(ast.ElementStmt)
+            doc = self.consume(uni.String)
+            element = self.consume(uni.ElementStmt)
             element.doc = doc
             element.add_kids_left([doc])
             return element
 
-        def toplevel_stmt(self, _: None) -> ast.ElementStmt:
+        def toplevel_stmt(self, _: None) -> uni.ElementStmt:
             """Grammar rule.
 
-            element: py_code_block
-                | import_stmt
+            toplevel_stmt: import_stmt
+                | archetype
                 | ability
-                | architype
+                | global_var
                 | free_code
+                | py_code_block
                 | test
-                | global_var
             """
-            return self.consume(ast.ElementStmt)
+            return self.consume(uni.ElementStmt)
 
-        def global_var(self, _: None) -> ast.GlobalVars:
+        def global_var(self, _: None) -> uni.GlobalVars:
             """Grammar rule.
 
             global_var: (KW_LET | KW_GLOBAL) access_tag? assignment_list SEMI
             """
-            is_frozen = self.consume(ast.Token).name == Tok.KW_LET
-            access_tag = self.match(ast.SubTag)
-            assignments = self.consume(ast.SubNodeList)
-            return ast.GlobalVars(
+            is_frozen = self.consume(uni.Token).name == Tok.KW_LET
+            access_tag = self.match(uni.SubTag)
+            assignments_list = self.consume(list)
+            return uni.GlobalVars(
                 access=access_tag,
-                assignments=assignments,
+                assignments=self.extract_from_list(assignments_list, uni.Assignment),
                 is_frozen=is_frozen,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def access_tag(self, _: None) -> ast.SubTag[ast.Token]:
+        def access_tag(self, _: None) -> uni.SubTag[uni.Token]:
             """Grammar rule.
 
             access_tag: COLON ( KW_PROT | KW_PUB | KW_PRIV )
             """
             self.consume_token(Tok.COLON)
-            access = self.consume(ast.Token)
-            return ast.SubTag[ast.Token](tag=access, kid=self.cur_nodes)
+            access = self.consume(uni.Token)
+            return uni.SubTag[uni.Token](tag=access, kid=self.cur_nodes)
 
-        def test(self, _: None) -> ast.Test:
+        def test(self, _: None) -> uni.Test:
             """Grammar rule.
 
             test: KW_TEST NAME? code_block
             """
             # Q(thakee): Why the name should be KW_TEST if no name present?
             test_tok = self.consume_token(Tok.KW_TEST)
-            name = self.match(ast.Name) or test_tok
-            codeblock = self.consume(ast.SubNodeList)
-            return ast.Test(
+            name = self.match(uni.Name) or test_tok
+            codeblock = self.consume(list)
+            return uni.Test(
                 name=name,
-                body=codeblock,
-                kid=self.cur_nodes,
+                body=self.extract_from_list(codeblock, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def free_code(self, _: None) -> ast.ModuleCode:
+        def free_code(self, _: None) -> uni.ModuleCode:
             """Grammar rule.
 
-            free_code: KW_WITH KW_ENTRY sub_name? code_block
+            free_code: KW_WITH KW_ENTRY (COLON NAME)? code_block
             """
             self.consume_token(Tok.KW_WITH)
             self.consume_token(Tok.KW_ENTRY)
-            name = self.match(ast.SubTag)
-            codeblock = self.consume(ast.SubNodeList)
-            return ast.ModuleCode(
+            name = None
+            if self.match_token(Tok.COLON):
+                name = self.consume(uni.Name)
+            codeblock = self.consume(list)
+            return uni.ModuleCode(
                 name=name,
-                body=codeblock,
-                kid=self.cur_nodes,
+                body=self.extract_from_list(codeblock, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def py_code_block(self, _: None) -> ast.PyInlineCode:
+        def py_code_block(self, _: None) -> uni.PyInlineCode:
             """Grammar rule.
 
             py_code_block: PYNLINE
             """
             pyinline = self.consume_token(Tok.PYNLINE)
-            return ast.PyInlineCode(
+            return uni.PyInlineCode(
                 code=pyinline,
                 kid=self.cur_nodes,
             )
 
-        def import_stmt(self, _: None) -> ast.Import:
+        def import_stmt(self, _: None) -> uni.Import:
             """Grammar rule.
 
-            import_stmt: KW_IMPORT sub_name? KW_FROM from_path LBRACE import_items RBRACE
-                       | KW_IMPORT sub_name? KW_FROM from_path COMMA import_items SEMI  //Deprecated
-                       | KW_IMPORT sub_name? import_path (COMMA import_path)* SEMI
-                       | include_stmt
+            import_stmt: KW_IMPORT KW_FROM from_path LBRACE import_items RBRACE
+                    | KW_IMPORT import_path (COMMA import_path)* SEMI
+                    | KW_INCLUDE import_path SEMI
             """
-            if import_stmt := self.match(ast.Import):  # Include Statement.
-                return import_stmt
-
-            # TODO: kid will be removed so let's keep as it is for now.
-            kid = self.cur_nodes
+            if self.match_token(Tok.KW_INCLUDE):
+                # Handle include statement
+                import_path_obj = self.consume(uni.ModulePath)
+                return uni.Import(
+                    from_loc=None,
+                    items=[import_path_obj],
+                    is_absorb=True,
+                    kid=self.cur_nodes,
+                )
 
-            from_path: ast.ModulePath | None = None
+            from_path: uni.ModulePath | None = None
             self.consume_token(Tok.KW_IMPORT)
-            lang = self.match(ast.SubTag)
 
             if self.match_token(Tok.KW_FROM):
-                from_path = self.consume(ast.ModulePath)
-                self.consume(ast.Token)  # LBRACE or COMMA
-                items = self.consume(ast.SubNodeList)
-                if self.consume(ast.Token).name == Tok.SEMI:  # RBRACE or SEMI
-                    self.parse_ref.warning(
-                        "Deprecated syntax, use braces for multiple imports (e.g, import from mymod {a, b, c})",
-                    )
+                from_path = self.consume(uni.ModulePath)
+                self.consume(uni.Token)  # LBRACE or COMMA
+                items = self.extract_from_list(self.consume(list), uni.ModuleItem)
+                self.consume(uni.Token)
+                return uni.Import(
+                    from_loc=from_path,
+                    items=items,
+                    is_absorb=False,
+                    kid=self.flat_cur_nodes,
+                )
             else:
-                paths = [self.consume(ast.ModulePath)]
+                paths = [self.consume(uni.ModulePath)]
                 while self.match_token(Tok.COMMA):
-                    paths.append(self.consume(ast.ModulePath))
+                    paths.append(self.consume(uni.ModulePath))
                 self.consume_token(Tok.SEMI)
-                items = ast.SubNodeList[ast.ModulePath](
+                return uni.Import(
+                    from_loc=from_path,
                     items=paths,
-                    delim=Tok.COMMA,
-                    # TODO: kid will be removed so let's keep as it is for now.
-                    kid=self.cur_nodes[2 if lang else 1 : -1],
+                    is_absorb=False,
+                    kid=self.flat_cur_nodes,
                 )
-                kid = (kid[:2] if lang else kid[:1]) + [items] + kid[-1:]
 
-            is_absorb = False
-            return ast.Import(
-                hint=lang,
-                from_loc=from_path,
-                items=items,
-                is_absorb=is_absorb,
-                kid=kid,
-            )
-
-        def from_path(self, _: None) -> ast.ModulePath:
+        def from_path(self, _: None) -> uni.ModulePath:
             """Grammar rule.
 
             from_path: (DOT | ELLIPSIS)* import_path
@@ -422,212 +428,211 @@ class JacParser(Pass):
                     level += 3
                 else:
                     break
-            if import_path := self.match(ast.ModulePath):
-                kids = [i for i in self.cur_nodes if isinstance(i, ast.Token)]
+            if import_path := self.match(uni.ModulePath):
+                kids = [i for i in self.cur_nodes if isinstance(i, uni.Token)]
                 import_path.level = level
                 import_path.add_kids_left(kids)
                 return import_path
 
-            return ast.ModulePath(
+            return uni.ModulePath(
                 path=None,
                 level=level,
                 alias=None,
                 kid=self.cur_nodes,
             )
 
-        def include_stmt(self, _: None) -> ast.Import:
+        def import_path(self, _: None) -> uni.ModulePath:
             """Grammar rule.
 
-            include_stmt: KW_INCLUDE sub_name? import_path SEMI
+            import_path: dotted_name (KW_AS NAME)?
             """
-            kid = self.cur_nodes  # TODO: Will be removed.
-            self.consume_token(Tok.KW_INCLUDE)
-            lang = self.match(ast.SubTag)
-            from_path = self.consume(ast.ModulePath)
-            items = ast.SubNodeList[ast.ModulePath](
-                items=[from_path], delim=Tok.COMMA, kid=[from_path]
-            )
-            kid = (
-                (kid[:2] if lang else kid[:1]) + [items] + kid[-1:]
-            )  # TODO: Will be removed.
-            is_absorb = True
-            return ast.Import(
-                hint=lang,
-                from_loc=None,
-                items=items,
-                is_absorb=is_absorb,
-                kid=kid,
+            valid_path = self.extract_from_list(self.consume(list), uni.Name)
+            alias = self.consume(uni.Name) if self.match_token(Tok.KW_AS) else None
+            return uni.ModulePath(
+                path=valid_path,
+                level=0,
+                alias=alias,
+                kid=self.flat_cur_nodes,
             )
 
-        def import_path(self, _: None) -> ast.ModulePath:
+        def dotted_name(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
-            import_path: named_ref (DOT named_ref)* (KW_AS NAME)?
+            dotted_name: named_ref (DOT named_ref)*
             """
-            valid_path = [self.consume(ast.Name)]
-            while self.match_token(Tok.DOT):
-                valid_path.append(self.consume(ast.Name))
-            alias = self.consume(ast.Name) if self.match_token(Tok.KW_AS) else None
-            return ast.ModulePath(
-                path=valid_path,
-                level=0,
-                alias=alias,
-                kid=self.cur_nodes,
-            )
+            return self.cur_nodes
 
-        def import_items(self, _: None) -> ast.SubNodeList[ast.ModuleItem]:
+        def import_items(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             import_items: (import_item COMMA)* import_item COMMA?
             """
-            items = [self.consume(ast.ModuleItem)]
-            while self.match_token(Tok.COMMA):
-                if module_item := self.match(ast.ModuleItem):
-                    items.append(module_item)
-            ret = ast.SubNodeList[ast.ModuleItem](
-                items=items,
-                delim=Tok.COMMA,
-                kid=self.cur_nodes,
-            )
-            return ret
+            return self.flat_cur_nodes
 
-        def import_item(self, _: None) -> ast.ModuleItem:
+        def import_item(self, _: None) -> uni.ModuleItem:
             """Grammar rule.
 
             import_item: named_ref (KW_AS NAME)?
             """
-            name = self.consume(ast.Name)
-            alias = self.consume(ast.Name) if self.match_token(Tok.KW_AS) else None
-            return ast.ModuleItem(
+            name = self.consume(uni.Name)
+            alias = self.consume(uni.Name) if self.match_token(Tok.KW_AS) else None
+            return uni.ModuleItem(
                 name=name,
                 alias=alias,
                 kid=self.cur_nodes,
             )
 
-        def architype(
-            self, _: None
-        ) -> ast.ArchSpec | ast.ArchDef | ast.Enum | ast.EnumDef:
+        def archetype(self, _: None) -> uni.ArchSpec | uni.Enum:
             """Grammar rule.
 
-            architype: decorators? architype_decl
-                    | architype_def
+            archetype: decorators? archetype_decl
+                    | archetype_def
                     | enum
             """
-            archspec: ast.ArchSpec | ast.ArchDef | ast.Enum | ast.EnumDef | None = None
+            archspec: uni.ArchSpec | uni.Enum | None = None
 
-            decorators = self.match(ast.SubNodeList)
-            if decorators is not None:
-                archspec = self.consume(ast.ArchSpec)
+            decorators_node = self.match(list)
+            is_async = self.match_token(Tok.KW_ASYNC)
+            if decorators_node is not None:
+                archspec = self.consume(uni.ArchSpec)
+                decorators = self.extract_from_list(decorators_node, uni.Expr)
                 archspec.decorators = decorators
-                archspec.add_kids_left([decorators])
+                archspec.add_kids_left(decorators_node)
             else:
-                archspec = (
-                    self.match(ast.ArchSpec)
-                    or self.match(ast.ArchDef)
-                    or self.match(ast.Enum)
-                    or self.consume(ast.EnumDef)
-                )
+                archspec = self.match(uni.ArchSpec) or self.consume(uni.Enum)
+            if is_async and isinstance(archspec, uni.ArchSpec):
+                archspec.is_async = True
+                archspec.add_kids_left([is_async])
+                assert isinstance(archspec, uni.Archetype)
+                if archspec.arch_type.name != Tok.KW_WALKER:
+                    self.parse_ref.log_error(
+                        f"Expected async archetype to be walker, but got {archspec.arch_type.value}"
+                    )
             return archspec
 
-        def architype_decl(self, _: None) -> ast.ArchSpec:
+        def impl_def(self, _: None) -> uni.ImplDef:
             """Grammar rule.
 
-            architype_decl: arch_type access_tag? STRING? NAME inherited_archs? (member_block | SEMI)
+            impl_def: decorators? KW_IMPL dotted_name impl_spec? impl_tail
             """
-            arch_type = self.consume(ast.Token)
-            access = self.match(ast.SubTag)
-            semstr = self.match(ast.String)
-            name = self.consume(ast.Name)
-            sub_list1 = self.match(ast.SubNodeList)
-            sub_list2 = self.match(ast.SubNodeList)
-            if self.match_token(Tok.SEMI):
-                inh, body = sub_list1, None
-            else:
-                body = (
-                    sub_list2 or sub_list1
-                )  # if sub_list2 is None then body is sub_list1
-                inh = sub_list2 and sub_list1  # if sub_list2 is None then inh is None.
-            return ast.Architype(
-                arch_type=arch_type,
-                name=name,
-                semstr=semstr,
-                access=access,
-                base_classes=inh,
-                body=body,
-                kid=self.cur_nodes,
+            decorators_node = self.match(list)
+            self.consume_token(Tok.KW_IMPL)
+            target = self.extract_from_list(self.consume(list), uni.NameAtom)
+            spec = (
+                self.match(list)
+                or self.match(uni.FuncSignature)
+                or self.match(uni.EventSignature)
             )
+            tail = self.match(list) or self.match(uni.FuncCall)
+            valid_tail = spec if tail is None else tail
+            valid_spec = None if tail is None else spec
+            impl = uni.ImplDef(
+                body=(
+                    self.extract_from_list(
+                        valid_tail,
+                        (uni.EnumBlockStmt, uni.CodeBlockStmt),  # type: ignore[arg-type]
+                    )
+                    if isinstance(valid_tail, list)
+                    else valid_tail
+                ),
+                target=target,
+                decorators=(
+                    self.extract_from_list(decorators_node, uni.Expr)
+                    if decorators_node
+                    else None
+                ),
+                spec=valid_spec,
+                kid=self.flat_cur_nodes,
+            )
+            return impl
 
-        def architype_def(self, _: None) -> ast.ArchDef:
+        def impl_spec(
+            self, _: None
+        ) -> Sequence[uni.Expr] | uni.FuncSignature | uni.EventSignature:
             """Grammar rule.
 
-            architype_def: abil_to_arch_chain member_block
+            impl_spec: inherited_archs | func_decl | event_clause
             """
-            archref = self.consume(ast.ArchRefChain)
-            subnodelist = self.consume(ast.SubNodeList)
-            return ast.ArchDef(
-                target=archref,
-                body=subnodelist,
-                kid=self.cur_nodes,
+            spec = (
+                self.match(list)  # inherited_archs
+                or self.match(uni.FuncSignature)  # func_decl
+                or self.consume(uni.EventSignature)  # event_clause
             )
+            return spec
 
-        def arch_type(self, _: None) -> ast.Token:
+        def impl_tail(
+            self, _: None
+        ) -> Sequence[uni.EnumBlockStmt] | list[uni.CodeBlockStmt] | uni.FuncCall:
             """Grammar rule.
 
-            arch_type: KW_WALKER
-                    | KW_OBJECT
-                    | KW_EDGE
-                    | KW_NODE
+            impl_tail: enum_block | block_tail
             """
-            return self.consume(ast.Token)
+            tail = self.match(list) or self.consume(  # enum_block or code_block
+                uni.FuncCall
+            )  # block_tail (KW_BY atomic_call)
+            return tail
 
-        def decorators(self, _: None) -> ast.SubNodeList[ast.Expr]:
+        def archetype_decl(self, _: None) -> uni.ArchSpec:
             """Grammar rule.
 
-            decorators: (DECOR_OP atomic_chain)+
+            archetype_decl: arch_type access_tag? NAME inherited_archs? (member_block | SEMI)
             """
-            self.consume_token(Tok.DECOR_OP)
-            return ast.SubNodeList[ast.Expr](
-                items=self.consume_many(ast.Expr),
-                delim=Tok.DECOR_OP,
-                kid=self.cur_nodes,
+            arch_type = self.consume(uni.Token)
+            access = self.match(uni.SubTag)
+            name = self.consume(uni.Name)
+            inh_sn = self.match(list)
+            body_list = self.match(list)
+            body: list[uni.ArchBlockStmt] | None
+            if body_list is None and self.match_token(Tok.SEMI):
+                body = None
+            elif body_list is None:
+                body = self.extract_from_list(inh_sn or [], uni.ArchBlockStmt)
+                inh_sn = None
+            else:
+                body = self.extract_from_list(body_list or [], uni.ArchBlockStmt)
+            return uni.Archetype(
+                arch_type=arch_type,
+                name=name,
+                access=access,
+                base_classes=self.extract_from_list(inh_sn or [], uni.Expr) or [],
+                body=body,
+                kid=self.flat_cur_nodes,
             )
 
-        def inherited_archs(self, kid: list[ast.AstNode]) -> ast.SubNodeList[ast.Expr]:
+        def arch_type(self, _: None) -> uni.Token:
+            """Grammar rule.
+
+            arch_type: KW_WALKER
+                    | KW_OBJECT
+                    | KW_EDGE
+                    | KW_NODE
+            """
+            return self.consume(uni.Token)
+
+        def decorators(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
-            inherited_archs: LT (atomic_chain COMMA)* atomic_chain GT
-                           | COLON (atomic_chain COMMA)* atomic_chain COLON
+            decorators: (DECOR_OP atomic_chain)+
             """
-            self.match_token(Tok.LT) or self.consume_token(Tok.COLON)
-            items: list = []
-            while inherited_arch := self.match(ast.Expr):
-                items.append(inherited_arch)
-                self.match_token(Tok.COMMA)
-            self.match_token(Tok.LT) or self.consume_token(Tok.COLON)
-            return ast.SubNodeList[ast.Expr](items=items, delim=Tok.COMMA, kid=kid)
+            return self.cur_nodes
 
-        def sub_name(self, _: None) -> ast.SubTag[ast.Name]:
+        def inherited_archs(self, kid: list[uni.UniNode]) -> list[uni.UniNode]:
             """Grammar rule.
 
-            sub_name: COLON NAME
+            inherited_archs: LPAREN (atomic_chain COMMA)* atomic_chain RPAREN
             """
-            self.consume_token(Tok.COLON)
-            target = self.consume(ast.Name)
-            return ast.SubTag(
-                tag=target,
-                kid=self.cur_nodes,
-            )
+            return self.flat_cur_nodes
 
-        def named_ref(self, _: None) -> ast.NameAtom:
+        def named_ref(self, _: None) -> uni.NameAtom:
             """Grammar rule.
 
             named_ref: special_ref
                     | KWESC_NAME
                     | NAME
             """
-            return self.consume(ast.NameAtom)
+            return self.consume(uni.NameAtom)
 
-        def special_ref(self, _: None) -> ast.SpecialVarRef:
+        def special_ref(self, _: None) -> uni.SpecialVarRef:
             """Grammar rule.
 
             special_ref: KW_INIT
@@ -636,327 +641,235 @@ class JacParser(Pass):
                         | KW_SUPER
                         | KW_SELF
                         | KW_HERE
+                        | KW_VISITOR
             """
-            return ast.SpecialVarRef(var=self.consume(ast.Name))
+            return uni.SpecialVarRef(var=self.consume(uni.Name))
 
-        def enum(self, _: None) -> ast.Enum | ast.EnumDef:
+        def enum(self, _: None) -> uni.Enum:
             """Grammar rule.
 
             enum: decorators? enum_decl
                 | enum_def
             """
-            if decorator := self.match(ast.SubNodeList):
-                enum_decl = self.consume(ast.Enum)
-                enum_decl.decorators = decorator
-                enum_decl.add_kids_left([decorator])
+            if decorator := self.match(list):
+                enum_decl = self.consume(uni.Enum)
+                enum_decl.decorators = self.extract_from_list(decorator, uni.Expr)
+                enum_decl.add_kids_left(decorator)
                 return enum_decl
-            return self.match(ast.Enum) or self.consume(ast.EnumDef)
+            return self.consume(uni.Enum)
 
-        def enum_decl(self, _: None) -> ast.Enum:
+        def enum_decl(self, _: None) -> uni.Enum:
             """Grammar rule.
 
             enum_decl: KW_ENUM access_tag? STRING? NAME inherited_archs? (enum_block | SEMI)
             """
             self.consume_token(Tok.KW_ENUM)
-            access = self.match(ast.SubTag)
-            semstr = self.match(ast.String)
-            name = self.consume(ast.Name)
-            sub_list1 = self.match(ast.SubNodeList)
-            sub_list2 = self.match(ast.SubNodeList)
-            if self.match_token(Tok.SEMI):
+            access = self.match(uni.SubTag)
+            name = self.consume(uni.Name)
+            sub_list1 = self.match(list)
+            enum_body = self.match(list)
+            body: list[uni.UniNode] | None = None
+            if enum_body is None and self.match_token(Tok.SEMI):
                 inh, body = sub_list1, None
+            elif enum_body is None:
+                body = self.extract_from_list(sub_list1 or [], uni.EnumBlockStmt)
+                inh = None
             else:
-                body = sub_list2 or sub_list1
-                inh = sub_list2 and sub_list1
-            return ast.Enum(
-                semstr=semstr,
+                body = enum_body
+                inh = sub_list1
+            return uni.Enum(
                 name=name,
                 access=access,
-                base_classes=inh,
-                body=body,
-                kid=self.cur_nodes,
-            )
-
-        def enum_def(self, _: None) -> ast.EnumDef:
-            """Grammar rule.
-
-            enum_def: arch_to_enum_chain enum_block
-            """
-            enum_def = self.consume(ast.ArchRefChain)
-            enum_block = self.consume(ast.SubNodeList)
-            return ast.EnumDef(
-                target=enum_def,
-                body=enum_block,
-                kid=self.cur_nodes,
+                base_classes=self.extract_from_list(inh or [], uni.Expr) or [],
+                body=self.extract_from_list(body, uni.EnumBlockStmt) if body else None,
+                kid=self.flat_cur_nodes,
             )
 
-        def enum_block(self, _: None) -> ast.SubNodeList[ast.EnumBlockStmt]:
+        def enum_block(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
-            enum_block: LBRACE ((enum_stmt COMMA)* enum_stmt COMMA?)? RBRACE
+            enum_block: LBRACE assignment_list COMMA? (py_code_block | free_code)* RBRACE
             """
-            self.consume_token(Tok.LBRACE)
-            enum_statements: list = []
-            while enum_stmt := self.match(ast.EnumBlockStmt):
-                enum_statements.append(enum_stmt)
-                self.match_token(Tok.COMMA)
-            self.consume_token(Tok.RBRACE)
-            return ast.SubNodeList[ast.EnumBlockStmt](
-                items=enum_statements,
-                delim=Tok.COMMA,
-                kid=self.cur_nodes,
-            )
+            left_enc = self.consume_token(Tok.LBRACE)
+            assignments = self.consume(list)
+            self.match_token(Tok.COMMA)
+            while item := self.match(uni.EnumBlockStmt):
+                item.is_enum_stmt = True
+                assignments.append(item)
+            right_enc = self.consume_token(Tok.RBRACE)
+            for i in assignments:
+                if isinstance(i, uni.Assignment):
+                    i.is_enum_stmt = True
+            return [left_enc, *assignments, right_enc]
 
-        def enum_stmt(self, _: None) -> ast.EnumBlockStmt:
+        def ability(self, _: None) -> uni.Ability | uni.FuncCall:
             """Grammar rule.
 
-            enum_stmt: NAME (COLON STRING)? EQ expression
-                    | NAME (COLON STRING)?
-                    | py_code_block
-                    | free_code
-                    | abstract_ability
-                    | ability
+            ability: decorators? KW_ASYNC? (ability_decl | function_decl)
             """
-            if stmt := (
-                self.match(ast.PyInlineCode)
-                or self.match(ast.ModuleCode)
-                or self.match(ast.Ability)
-            ):
-                return stmt
-            name = self.consume(ast.Name)
-            semstr = self.consume(ast.String) if self.match_token(Tok.COLON) else None
-            expr = self.consume(ast.Expr) if self.match_token(Tok.EQ) else None
-            targ = ast.SubNodeList[ast.Expr](items=[name], delim=Tok.COMMA, kid=[name])
-            self.cur_nodes[0] = targ
-            return ast.Assignment(
-                target=targ,
-                value=expr,
-                type_tag=None,
-                kid=self.cur_nodes,
-                semstr=semstr,
-                is_enum_stmt=True,
-            )
-
-        def ability(self, _: None) -> ast.Ability | ast.AbilityDef | ast.FuncCall:
-            """Grammer rule.
-
-            ability: decorators? KW_ASYNC? ability_decl
-                    | decorators? genai_ability
-                    | ability_def
-            """
-            ability: ast.Ability | ast.AbilityDef | None = None
-            decorators = self.match(ast.SubNodeList)
+            decorators_node = self.match(list)
             is_async = self.match_token(Tok.KW_ASYNC)
-            ability = self.match(ast.Ability)
-            if is_async and ability:
+
+            # Try to match ability_decl or function_decl
+            ability = self.consume(uni.Ability)
+            if is_async and ability and isinstance(ability, uni.Ability):
                 ability.is_async = True
                 ability.add_kids_left([is_async])
-            if ability is None:
-                ability = self.consume(ast.AbilityDef)
-            if decorators:
-                for dec in decorators.items:
+
+            if decorators_node:
+                decorators = self.extract_from_list(decorators_node, uni.Expr)
+                for dec in decorators[:]:
                     if (
-                        isinstance(dec, ast.NameAtom)
+                        isinstance(dec, uni.NameAtom)
                         and dec.sym_name == "staticmethod"
-                        and isinstance(ability, (ast.Ability))
+                        and isinstance(ability, (uni.Ability))
                     ):
-                        ability.is_static = True
-                        decorators.items.remove(dec)  # noqa: B038
+                        static_kw = ability.gen_token(Tok.KW_STATIC)
+                        static_kw.line_no = dec.loc.first_line
+                        static_kw.c_start = dec.loc.col_start
+                        static_kw.c_end = static_kw.c_start + len(static_kw.name)
+                        decorators.remove(dec)  # noqa: B038
+                        if not ability.is_static:
+                            ability.is_static = True
+                            if not ability.is_override:
+                                ability.add_kids_left([static_kw])
+                            else:
+                                ability.insert_kids_at_pos([static_kw], 1)
                         break
-                if decorators.items:
+                if decorators:
                     ability.decorators = decorators
-                    ability.add_kids_left([decorators])
-                return ability
+                    ability.add_kids_left(decorators_node)
+
             return ability
 
-        def ability_decl(self, _: None) -> ast.Ability:
+        def ability_decl(self, _: None) -> uni.Ability:
             """Grammar rule.
 
-            ability_decl: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? STRING?
-                named_ref (func_decl | event_clause) (code_block | SEMI)
+            ability_decl: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? named_ref
+                event_clause (block_tail | KW_ABSTRACT? SEMI)
             """
-            signature: ast.FuncSignature | ast.EventSignature | None = None
-            body: ast.SubNodeList | None = None
             is_override = self.match_token(Tok.KW_OVERRIDE) is not None
             is_static = self.match_token(Tok.KW_STATIC) is not None
             self.consume_token(Tok.KW_CAN)
-            access = self.match(ast.SubTag)
-            semstr = self.match(ast.String)
-            name = self.consume(ast.NameAtom)
-            signature = self.match(ast.FuncSignature) or self.consume(
-                ast.EventSignature
-            )
-            if (body := self.match(ast.SubNodeList)) is None:
+            access = self.match(uni.SubTag)
+            name = self.consume(uni.NameAtom)
+            signature = self.consume(uni.EventSignature)
+
+            # Handle block_tail
+            body_sn_or_call = self.match(list) or self.match(uni.FuncCall)
+            if body_sn_or_call is None:
+                is_abstract = self.match_token(Tok.KW_ABSTRACT) is not None
                 self.consume_token(Tok.SEMI)
-            return ast.Ability(
+                body = None
+            else:
+                is_abstract = False
+                body = (
+                    self.extract_from_list(body_sn_or_call, uni.CodeBlockStmt)
+                    if isinstance(body_sn_or_call, list)
+                    else body_sn_or_call
+                )
+
+            return uni.Ability(
                 name_ref=name,
                 is_async=False,
                 is_override=is_override,
                 is_static=is_static,
-                is_abstract=False,
+                is_abstract=is_abstract,
                 access=access,
-                semstr=semstr,
-                signature=signature,
-                body=body,
-                kid=self.cur_nodes,
-            )
-
-        def ability_def(self, kid: list[ast.AstNode]) -> ast.AbilityDef:
-            """Grammar rule.
-
-            ability_def: arch_to_abil_chain (func_decl | event_clause) code_block
-            """
-            target = self.consume(ast.ArchRefChain)
-            signature = self.match(ast.FuncSignature) or self.consume(
-                ast.EventSignature
-            )
-            body = self.consume(ast.SubNodeList)
-
-            return ast.AbilityDef(
-                target=target,
                 signature=signature,
                 body=body,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        # We need separate production rule for abstract_ability because we don't
-        # want to allow regular abilities outside of classed to be abstract.
-        def abstract_ability(self, _: None) -> ast.Ability:
+        def function_decl(self, _: None) -> uni.Ability:
             """Grammar rule.
 
-            abstract_ability: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? STRING?
-                named_ref (func_decl | event_clause) KW_ABSTRACT SEMI
+            function_decl: KW_OVERRIDE? KW_STATIC? KW_DEF access_tag? named_ref
+                func_decl? (block_tail | KW_ABSTRACT? SEMI)
             """
-            signature: ast.FuncSignature | ast.EventSignature | None = None
+            # Save original kids to track tokens
             is_override = self.match_token(Tok.KW_OVERRIDE) is not None
             is_static = self.match_token(Tok.KW_STATIC) is not None
-            self.consume_token(Tok.KW_CAN)
-            access = self.match(ast.SubTag)
-            semstr = self.match(ast.String)
-            name = self.consume(ast.NameAtom)
-            signature = self.match(ast.FuncSignature) or self.consume(
-                ast.EventSignature
-            )
-            self.consume_token(Tok.KW_ABSTRACT)
-            self.consume_token(Tok.SEMI)
-            return ast.Ability(
-                name_ref=name,
-                is_async=False,
-                is_override=is_override,
-                is_static=is_static,
-                is_abstract=True,
-                access=access,
-                semstr=semstr,
-                signature=signature,
-                body=None,
-                kid=self.cur_nodes,
-            )
-
-        def genai_ability(self, _: None) -> ast.Ability:
-            """Grammar rule.
+            self.consume_token(Tok.KW_DEF)
+            access = self.match(uni.SubTag)
+            name = self.consume(uni.NameAtom)
+            signature = self.match(uni.FuncSignature)
+
+            # Handle block_tail
+            body_sn_or_call = self.match(list) or self.match(uni.FuncCall)
+            if body_sn_or_call is None:
+                is_abstract = self.match_token(Tok.KW_ABSTRACT) is not None
+                self.consume_token(Tok.SEMI)
+                body = None
+            else:
+                is_abstract = False
+                body = (
+                    self.extract_from_list(body_sn_or_call, uni.CodeBlockStmt)
+                    if isinstance(body_sn_or_call, list)
+                    else body_sn_or_call
+                )
 
-            genai_ability: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? STRING?
-            named_ref (func_decl) KW_BY atomic_call SEMI
-            """
-            is_override = self.match_token(Tok.KW_OVERRIDE) is not None
-            is_static = self.match_token(Tok.KW_STATIC) is not None
-            self.consume_token(Tok.KW_CAN)
-            access = self.match(ast.SubTag)
-            semstr = self.match(ast.String)
-            name = self.consume(ast.NameAtom)
-            signature = self.match(ast.FuncSignature) or self.consume(
-                ast.EventSignature
-            )
-            self.consume_token(Tok.KW_BY)
-            body = self.consume(ast.FuncCall)
-            self.consume_token(Tok.SEMI)
-            return ast.Ability(
+            return uni.Ability(
                 name_ref=name,
                 is_async=False,
                 is_override=is_override,
                 is_static=is_static,
-                is_abstract=False,
+                is_abstract=is_abstract,
                 access=access,
-                semstr=semstr,
                 signature=signature,
                 body=body,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def event_clause(self, _: None) -> ast.EventSignature:
+        def func_decl(self, _: None) -> uni.FuncSignature:
             """Grammar rule.
 
-            event_clause: KW_WITH expression? (KW_EXIT | KW_ENTRY) (STRING? RETURN_HINT expression)?
+            func_decl: (LPAREN func_decl_params? RPAREN) (RETURN_HINT expression)?
+                    | (RETURN_HINT expression)
             """
-            return_spec: ast.Expr | None = None
-            semstr: ast.String | None = None
-            self.consume_token(Tok.KW_WITH)
-            type_specs = self.match(ast.Expr)
-            event = self.match_token(Tok.KW_EXIT) or self.consume_token(Tok.KW_ENTRY)
-            if semstr := self.match(ast.String):
-                self.consume_token(Tok.RETURN_HINT)
-                return_spec = self.consume(ast.Expr)
-            return ast.EventSignature(
-                semstr=semstr,
-                event=event,
-                arch_tag_info=type_specs,
-                return_type=return_spec,
-                kid=self.cur_nodes,
-            )
-
-        def func_decl(self, _: None) -> ast.FuncSignature:
-            """Grammar rule.
+            params: list[uni.UniNode] | None = None
+            return_spec: uni.Expr | None = None
 
-            func_decl: (LPAREN func_decl_params? RPAREN)? (RETURN_HINT (STRING COLON)? expression)?
-            """
-            params: ast.SubNodeList | None = None
-            return_spec: ast.Expr | None = None
-            semstr: ast.String | None = None
-            if self.match_token(Tok.LPAREN):
-                params = self.match(ast.SubNodeList)
-                self.consume_token(Tok.RPAREN)
+            # Check if starting with RETURN_HINT
             if self.match_token(Tok.RETURN_HINT):
-                if semstr := self.match(ast.String):
-                    self.consume_token(Tok.COLON)
-                return_spec = self.match(ast.Expr)
-            return ast.FuncSignature(
-                semstr=semstr,
-                params=params,
-                return_type=return_spec,
-                kid=(
-                    self.cur_nodes
-                    if len(self.cur_nodes)
-                    else [ast.EmptyToken(ast.JacSource("", self.parse_ref.mod_path))]
-                ),
-            )
+                return_spec = self.consume(uni.Expr)
+                return uni.FuncSignature(
+                    params=[],
+                    return_type=return_spec,
+                    kid=self.flat_cur_nodes,
+                )
+            # Otherwise, parse the traditional parameter list form
+            else:
+                self.consume_token(Tok.LPAREN)
+                params = self.match(list)
+                self.consume_token(Tok.RPAREN)
+                if self.match_token(Tok.RETURN_HINT):
+                    return_spec = self.consume(uni.Expr)
+                return uni.FuncSignature(
+                    params=(
+                        self.extract_from_list(params, uni.ParamVar) if params else []
+                    ),
+                    return_type=return_spec,
+                    kid=self.flat_cur_nodes,
+                )
 
-        def func_decl_params(self, _: None) -> ast.SubNodeList[ast.ParamVar]:
+        def func_decl_params(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             func_decl_params: (param_var COMMA)* param_var COMMA?
             """
-            paramvar: list = []
-            while param_stmt := self.match(ast.ParamVar):
-                paramvar.append(param_stmt)
-                self.match_token(Tok.COMMA)
-            return ast.SubNodeList[ast.ParamVar](
-                items=paramvar,
-                delim=Tok.COMMA,
-                kid=self.cur_nodes,
-            )
+            return self.cur_nodes
 
-        def param_var(self, _: None) -> ast.ParamVar:
+        def param_var(self, _: None) -> uni.ParamVar:
             """Grammar rule.
 
-            param_var: (STAR_POW | STAR_MUL)? NAME (COLON STRING)? type_tag (EQ expression)?
+            param_var: (STAR_POW | STAR_MUL)? NAME type_tag (EQ expression)?
             """
             star = self.match_token(Tok.STAR_POW) or self.match_token(Tok.STAR_MUL)
-            name = self.consume(ast.Name)
-            semstr = self.match(ast.String) if self.match_token(Tok.COLON) else None
-            type_tag = self.consume(ast.SubTag)
-            value = self.consume(ast.Expr) if self.match_token(Tok.EQ) else None
-            return ast.ParamVar(
-                semstr=semstr,
+            name = self.consume(uni.Name)
+            type_tag = self.consume(uni.SubTag)
+            value = self.consume(uni.Expr) if self.match_token(Tok.EQ) else None
+            return uni.ParamVar(
                 name=name,
                 type_tag=type_tag,
                 value=value,
@@ -964,104 +877,73 @@ class JacParser(Pass):
                 kid=self.cur_nodes,
             )
 
-        def member_block(self, _: None) -> ast.SubNodeList[ast.ArchBlockStmt]:
+        def member_block(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             member_block: LBRACE member_stmt* RBRACE
             """
-            left_enc = self.consume_token(Tok.LBRACE)
-            items = self.match_many(ast.ArchBlockStmt)
-            right_enc = self.consume_token(Tok.RBRACE)
-            ret = ast.SubNodeList[ast.ArchBlockStmt](
-                items=items,
-                delim=Tok.WS,
-                kid=self.cur_nodes,
-            )
-            ret.left_enc = left_enc
-            ret.right_enc = right_enc
-            return ret
+            return self.cur_nodes
 
-        def member_stmt(self, _: None) -> ast.ArchBlockStmt:
+        def member_stmt(self, _: None) -> uni.ArchBlockStmt:
             """Grammar rule.
 
-            member_stmt: doc_tag? py_code_block
-                        | doc_tag? abstract_ability
-                        | doc_tag? ability
-                        | doc_tag? architype
-                        | doc_tag? has_stmt
+            member_stmt: STRING? (py_code_block | ability | archetype | impl_def | has_stmt | free_code)
             """
-            doc = self.match(ast.String)
-            ret = self.consume(ast.ArchBlockStmt)
-            if doc and isinstance(ret, ast.AstDocNode):
+            doc = self.match(uni.String)
+            ret = self.consume(uni.ArchBlockStmt)
+            if doc and isinstance(ret, uni.AstDocNode):
                 ret.doc = doc
                 ret.add_kids_left([doc])
-            if isinstance(ret, ast.Ability):
-                ret.signature.is_method = True
             return ret
 
-        def has_stmt(self, kid: list[ast.AstNode]) -> ast.ArchHas:
+        def has_stmt(self, kid: list[uni.UniNode]) -> uni.ArchHas:
             """Grammar rule.
 
             has_stmt: KW_STATIC? (KW_LET | KW_HAS) access_tag? has_assign_list SEMI
             """
             chomp = [*kid]
             is_static = (
-                isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_STATIC
+                isinstance(chomp[0], uni.Token) and chomp[0].name == Tok.KW_STATIC
             )
             chomp = chomp[1:] if is_static else chomp
-            is_freeze = isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_LET
+            is_freeze = isinstance(chomp[0], uni.Token) and chomp[0].name == Tok.KW_LET
             chomp = chomp[1:]
-            access = chomp[0] if isinstance(chomp[0], ast.SubTag) else None
+            access = chomp[0] if isinstance(chomp[0], uni.SubTag) else None
             chomp = chomp[1:] if access else chomp
             assign = chomp[0]
-            if isinstance(assign, ast.SubNodeList):
-                return ast.ArchHas(
-                    vars=assign,
+            if isinstance(assign, list):
+                assigns = self.extract_from_list(assign, uni.HasVar)
+                return uni.ArchHas(
+                    vars=assigns,
                     is_static=is_static,
                     is_frozen=is_freeze,
                     access=access,
-                    kid=kid,
+                    kid=self.flat_cur_nodes,
                 )
             else:
                 raise self.ice()
 
-        def has_assign_list(self, _: None) -> ast.SubNodeList[ast.HasVar]:
+        def has_assign_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             has_assign_list: (has_assign_list COMMA)? typed_has_clause
             """
-            if consume := self.match(ast.SubNodeList):
-                comma = self.consume_token(Tok.COMMA)
-                assign = self.consume(ast.HasVar)
-                new_kid = [*consume.kid, comma, assign]
-            else:
-                assign = self.consume(ast.HasVar)
-                new_kid = [assign]
-            valid_kid = [i for i in new_kid if isinstance(i, ast.HasVar)]
-            return ast.SubNodeList[ast.HasVar](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=new_kid,
-            )
+            return self.flat_cur_nodes
 
-        def typed_has_clause(self, _: None) -> ast.HasVar:
+        def typed_has_clause(self, _: None) -> uni.HasVar:
             """Grammar rule.
 
-            typed_has_clause: named_ref (COLON STRING)? type_tag (EQ expression | KW_BY KW_POST_INIT)?
+            typed_has_clause: named_ref type_tag (EQ expression | KW_BY KW_POST_INIT)?
             """
-            semstr: ast.String | None = None
-            value: ast.Expr | None = None
+            value: uni.Expr | None = None
             defer: bool = False
-            name = self.consume(ast.Name)
-            if self.match_token(Tok.COLON):
-                semstr = self.consume(ast.String)
-            type_tag = self.consume(ast.SubTag)
+            name = self.consume(uni.Name)
+            type_tag = self.consume(uni.SubTag)
             if self.match_token(Tok.EQ):
-                value = self.consume(ast.Expr)
+                value = self.consume(uni.Expr)
             elif self.match_token(Tok.KW_BY):
                 defer = bool(self.consume_token(Tok.KW_POST_INIT))
-            return ast.HasVar(
-                semstr=semstr,
+            return uni.HasVar(
                 name=name,
                 type_tag=type_tag,
                 defer=defer,
@@ -1069,16 +951,16 @@ class JacParser(Pass):
                 kid=self.cur_nodes,
             )
 
-        def type_tag(self, _: None) -> ast.SubTag[ast.Expr]:
+        def type_tag(self, _: None) -> uni.SubTag[uni.Expr]:
             """Grammar rule.
 
             type_tag: COLON expression
             """
             self.consume_token(Tok.COLON)
-            tag = self.consume(ast.Expr)
-            return ast.SubTag[ast.Expr](tag=tag, kid=self.cur_nodes)
+            tag = self.consume(uni.Expr)
+            return uni.SubTag[uni.Expr](tag=tag, kid=self.cur_nodes)
 
-        def builtin_type(self, _: None) -> ast.Token:
+        def builtin_type(self, _: None) -> uni.Token:
             """Grammar rule.
 
             builtin_type: TYP_TYPE
@@ -1093,10 +975,10 @@ class JacParser(Pass):
                         | TYP_BYTES
                         | TYP_STRING
             """
-            token = self.consume(ast.Token)
-            return ast.BuiltinType(
+            token = self.consume(uni.Token)
+            return uni.BuiltinType(
                 name=token.name,
-                orig_src=self.parse_ref.source,
+                orig_src=self.parse_ref.ir_in,
                 value=token.value,
                 line=token.loc.first_line,
                 end_line=token.loc.last_line,
@@ -1106,33 +988,19 @@ class JacParser(Pass):
                 pos_end=token.pos_end,
             )
 
-        def code_block(
-            self, kid: list[ast.AstNode]
-        ) -> ast.SubNodeList[ast.CodeBlockStmt]:
+        def code_block(self, kid: list[uni.UniNode]) -> list[uni.UniNode]:
             """Grammar rule.
 
             code_block: LBRACE statement* RBRACE
             """
-            left_enc = kid[0] if isinstance(kid[0], ast.Token) else None
-            right_enc = kid[-1] if isinstance(kid[-1], ast.Token) else None
-            valid_stmt = [i for i in kid if isinstance(i, ast.CodeBlockStmt)]
-            if len(valid_stmt) == len(kid) - 2:
-                return ast.SubNodeList[ast.CodeBlockStmt](
-                    items=valid_stmt,
-                    delim=Tok.WS,
-                    left_enc=left_enc,
-                    right_enc=right_enc,
-                    kid=kid,
-                )
-            else:
-                raise self.ice()
+            return self.flat_cur_nodes
 
-        def statement(self, kid: list[ast.AstNode]) -> ast.CodeBlockStmt:
+        def statement(self, kid: list[uni.UniNode]) -> uni.CodeBlockStmt:
             """Grammar rule.
 
             statement: import_stmt
                     | ability
-                    | architype
+                    | archetype
                     | if_stmt
                     | while_stmt
                     | for_stmt
@@ -1153,17 +1021,17 @@ class JacParser(Pass):
                     | expression SEMI
                     | ctrl_stmt SEMI
                     | py_code_block
-                    | walker_stmt
+                    | spatial_stmt
                     | SEMI
             """
-            if (code_block := self.match(ast.CodeBlockStmt)) and len(
+            if (code_block := self.match(uni.CodeBlockStmt)) and len(
                 self.cur_nodes
             ) < 2:
                 return code_block
-            elif (token := self.match(ast.Token)) and token.name == Tok.KW_YIELD:
-                return ast.ExprStmt(
+            elif (token := self.match(uni.Token)) and token.name == Tok.KW_YIELD:
+                return uni.ExprStmt(
                     expr=(
-                        expr := ast.YieldExpr(
+                        expr := uni.YieldExpr(
                             expr=None,
                             with_from=False,
                             kid=self.cur_nodes,
@@ -1172,281 +1040,270 @@ class JacParser(Pass):
                     in_fstring=False,
                     kid=[expr],
                 )
-            elif isinstance(kid[0], ast.Expr):
-                return ast.ExprStmt(
+            elif isinstance(kid[0], uni.Expr):
+                return uni.ExprStmt(
                     expr=kid[0],
                     in_fstring=False,
                     kid=self.cur_nodes,
                 )
-            elif isinstance(kid[0], ast.CodeBlockStmt):
+            elif isinstance(kid[0], uni.CodeBlockStmt):
                 kid[0].add_kids_right([kid[1]])
                 return kid[0]
             else:
                 raise self.ice()
 
-        def typed_ctx_block(self, _: None) -> ast.TypedCtxBlock:
+        def typed_ctx_block(self, _: None) -> uni.TypedCtxBlock:
             """Grammar rule.
 
             typed_ctx_block: RETURN_HINT expression code_block
             """
             self.consume_token(Tok.RETURN_HINT)
-            ctx = self.consume(ast.Expr)
-            body = self.consume(ast.SubNodeList)
-            return ast.TypedCtxBlock(
+            ctx = self.consume(uni.Expr)
+            body = self.consume(list)
+            return uni.TypedCtxBlock(
                 type_ctx=ctx,
-                body=body,
-                kid=self.cur_nodes,
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def if_stmt(self, _: None) -> ast.IfStmt:
+        def if_stmt(self, _: None) -> uni.IfStmt:
             """Grammar rule.
 
             if_stmt: KW_IF expression code_block (elif_stmt | else_stmt)?
             """
             self.consume_token(Tok.KW_IF)
-            condition = self.consume(ast.Expr)
-            body = self.consume(ast.SubNodeList)
-            else_body = self.match(ast.ElseStmt) or self.match(ast.ElseIf)
-            return ast.IfStmt(
+            condition = self.consume(uni.Expr)
+            body = self.consume(list)
+            else_body = self.match(uni.ElseStmt) or self.match(uni.ElseIf)
+            return uni.IfStmt(
                 condition=condition,
-                body=body,
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
                 else_body=else_body,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def elif_stmt(self, _: None) -> ast.ElseIf:
+        def elif_stmt(self, _: None) -> uni.ElseIf:
             """Grammar rule.
 
             elif_stmt: KW_ELIF expression code_block (elif_stmt | else_stmt)?
             """
             self.consume_token(Tok.KW_ELIF)
-            condition = self.consume(ast.Expr)
-            body = self.consume(ast.SubNodeList)
-            else_body = self.match(ast.ElseStmt) or self.match(ast.ElseIf)
-            return ast.ElseIf(
+            condition = self.consume(uni.Expr)
+            body = self.consume(list)
+            else_body = self.match(uni.ElseStmt) or self.match(uni.ElseIf)
+            return uni.ElseIf(
                 condition=condition,
-                body=body,
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
                 else_body=else_body,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def else_stmt(self, _: None) -> ast.ElseStmt:
+        def else_stmt(self, _: None) -> uni.ElseStmt:
             """Grammar rule.
 
             else_stmt: KW_ELSE code_block
             """
             self.consume_token(Tok.KW_ELSE)
-            body = self.consume(ast.SubNodeList)
-            return ast.ElseStmt(
-                body=body,
-                kid=self.cur_nodes,
+            body = self.consume(list)
+            return uni.ElseStmt(
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def try_stmt(self, _: None) -> ast.TryStmt:
+        def try_stmt(self, _: None) -> uni.TryStmt:
             """Grammar rule.
 
             try_stmt: KW_TRY code_block except_list? else_stmt? finally_stmt?
             """
             self.consume_token(Tok.KW_TRY)
-            block = self.consume(ast.SubNodeList)
-            except_list = self.match(ast.SubNodeList)
-            else_stmt = self.match(ast.ElseStmt)
-            finally_stmt = self.match(ast.FinallyStmt)
-            return ast.TryStmt(
-                body=block,
-                excepts=except_list,
+            block = self.consume(list)
+            except_list = self.match(list)
+            else_stmt = self.match(uni.ElseStmt)
+            finally_stmt = self.match(uni.FinallyStmt)
+            return uni.TryStmt(
+                body=self.extract_from_list(block, uni.CodeBlockStmt),
+                excepts=(
+                    self.extract_from_list(except_list, uni.Except)
+                    if except_list
+                    else []
+                ),
                 else_body=else_stmt,
                 finally_body=finally_stmt,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def except_list(self, _: None) -> ast.SubNodeList[ast.Except]:
+        def except_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             except_list: except_def+
             """
-            items = [self.consume(ast.Except)]
-            while expt := self.match(ast.Except):
-                items.append(expt)
-            return ast.SubNodeList[ast.Except](
-                items=items,
-                delim=Tok.WS,
-                kid=self.cur_nodes,
-            )
+            return self.flat_cur_nodes
 
-        def except_def(self, _: None) -> ast.Except:
+        def except_def(self, _: None) -> uni.Except:
             """Grammar rule.
 
             except_def: KW_EXCEPT expression (KW_AS NAME)? code_block
             """
-            name: ast.Name | None = None
+            name: uni.Name | None = None
             self.consume_token(Tok.KW_EXCEPT)
-            ex_type = self.consume(ast.Expr)
+            ex_type = self.consume(uni.Expr)
             if self.match_token(Tok.KW_AS):
-                name = self.consume(ast.Name)
-            body = self.consume(ast.SubNodeList)
-            return ast.Except(
+                name = self.consume(uni.Name)
+            body_node = self.consume(list)
+            return uni.Except(
                 ex_type=ex_type,
                 name=name,
-                body=body,
-                kid=self.cur_nodes,
+                body=self.extract_from_list(body_node, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def finally_stmt(self, _: None) -> ast.FinallyStmt:
+        def finally_stmt(self, _: None) -> uni.FinallyStmt:
             """Grammar rule.
 
             finally_stmt: KW_FINALLY code_block
             """
             self.consume_token(Tok.KW_FINALLY)
-            body = self.consume(ast.SubNodeList)
-            return ast.FinallyStmt(
-                body=body,
-                kid=self.cur_nodes,
+            body = self.consume(list)
+            return uni.FinallyStmt(
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def for_stmt(self, _: None) -> ast.IterForStmt | ast.InForStmt:
+        def for_stmt(self, _: None) -> uni.IterForStmt | uni.InForStmt:
             """Grammar rule.
 
-            for_stmt: KW_ASYNC? KW_FOR assignment KW_TO expression KW_BY
-                        expression code_block else_stmt?
-                    | KW_ASYNC? KW_FOR expression KW_IN expression code_block else_stmt?
+            for_stmt: KW_ASYNC? KW_FOR assignment KW_TO expression KW_BY assignment code_block else_stmt?
+                    | KW_ASYNC? KW_FOR atomic_chain KW_IN expression code_block else_stmt?
             """
             is_async = bool(self.match_token(Tok.KW_ASYNC))
             self.consume_token(Tok.KW_FOR)
-            if iter := self.match(ast.Assignment):
+            if iter := self.match(uni.Assignment):
                 self.consume_token(Tok.KW_TO)
-                condition = self.consume(ast.Expr)
+                condition = self.consume(uni.Expr)
                 self.consume_token(Tok.KW_BY)
-                count_by = self.consume(ast.Assignment)
-                body = self.consume(ast.SubNodeList)
-                else_body = self.match(ast.ElseStmt)
-                return ast.IterForStmt(
+                count_by = self.consume(uni.Assignment)
+                body = self.consume(list)
+                else_body = self.match(uni.ElseStmt)
+                return uni.IterForStmt(
                     is_async=is_async,
                     iter=iter,
                     condition=condition,
                     count_by=count_by,
-                    body=body,
+                    body=self.extract_from_list(body, uni.CodeBlockStmt),
                     else_body=else_body,
-                    kid=self.cur_nodes,
+                    kid=self.flat_cur_nodes,
                 )
-            target = self.consume(ast.Expr)
+            target = self.consume(uni.Expr)
             self.consume_token(Tok.KW_IN)
-            collection = self.consume(ast.Expr)
-            body = self.consume(ast.SubNodeList)
-            else_body = self.match(ast.ElseStmt)
-            return ast.InForStmt(
+            collection = self.consume(uni.Expr)
+            body = self.consume(list)
+            else_body = self.match(uni.ElseStmt)
+            return uni.InForStmt(
                 is_async=is_async,
                 target=target,
                 collection=collection,
-                body=body,
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
                 else_body=else_body,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def while_stmt(self, _: None) -> ast.WhileStmt:
+        def while_stmt(self, _: None) -> uni.WhileStmt:
             """Grammar rule.
 
             while_stmt: KW_WHILE expression code_block
             """
             self.consume_token(Tok.KW_WHILE)
-            condition = self.consume(ast.Expr)
-            body = self.consume(ast.SubNodeList)
-            return ast.WhileStmt(
+            condition = self.consume(uni.Expr)
+            body = self.consume(list)
+            return uni.WhileStmt(
                 condition=condition,
-                body=body,
-                kid=self.cur_nodes,
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def with_stmt(self, _: None) -> ast.WithStmt:
+        def with_stmt(self, _: None) -> uni.WithStmt:
             """Grammar rule.
 
             with_stmt: KW_ASYNC? KW_WITH expr_as_list code_block
             """
             is_async = bool(self.match_token(Tok.KW_ASYNC))
             self.consume_token(Tok.KW_WITH)
-            exprs = self.consume(ast.SubNodeList)
-            body = self.consume(ast.SubNodeList)
-            return ast.WithStmt(
+            exprs_node = self.extract_from_list(self.consume(list), uni.ExprAsItem)
+            body = self.consume(list)
+            return uni.WithStmt(
                 is_async=is_async,
-                exprs=exprs,
-                body=body,
-                kid=self.cur_nodes,
+                exprs=exprs_node,
+                body=self.extract_from_list(body, uni.CodeBlockStmt),
+                kid=self.flat_cur_nodes,
             )
 
-        def expr_as_list(self, _: None) -> ast.SubNodeList[ast.ExprAsItem]:
+        def expr_as_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             expr_as_list: (expr_as COMMA)* expr_as
             """
-            items = [self.consume(ast.ExprAsItem)]
-            while self.match_token(Tok.COMMA):
-                items.append(self.consume(ast.ExprAsItem))
-            return ast.SubNodeList[ast.ExprAsItem](
-                items=items,
-                delim=Tok.COMMA,
-                kid=self.cur_nodes,
-            )
+            return self.cur_nodes
 
-        def expr_as(self, _: None) -> ast.ExprAsItem:
+        def expr_as(self, _: None) -> uni.ExprAsItem:
             """Grammar rule.
 
             expr_as: expression (KW_AS expression)?
             """
-            expr = self.consume(ast.Expr)
-            alias = self.consume(ast.Expr) if self.match_token(Tok.KW_AS) else None
-            return ast.ExprAsItem(
+            expr = self.consume(uni.Expr)
+            alias = self.consume(uni.Expr) if self.match_token(Tok.KW_AS) else None
+            return uni.ExprAsItem(
                 expr=expr,
                 alias=alias,
                 kid=self.cur_nodes,
             )
 
-        def raise_stmt(self, _: None) -> ast.RaiseStmt:
+        def raise_stmt(self, _: None) -> uni.RaiseStmt:
             """Grammar rule.
 
             raise_stmt: KW_RAISE (expression (KW_FROM expression)?)?
             """
-            e_type: ast.Expr | None = None
-            from_target: ast.Expr | None = None
+            e_type: uni.Expr | None = None
+            from_target: uni.Expr | None = None
             self.consume_token(Tok.KW_RAISE)
-            if e_type := self.match(ast.Expr):
+            if e_type := self.match(uni.Expr):
                 from_target = (
-                    self.consume(ast.Expr) if self.match_token(Tok.KW_FROM) else None
+                    self.consume(uni.Expr) if self.match_token(Tok.KW_FROM) else None
                 )
-            return ast.RaiseStmt(
+            return uni.RaiseStmt(
                 cause=e_type,
                 from_target=from_target,
                 kid=self.cur_nodes,
             )
 
-        def assert_stmt(self, _: None) -> ast.AssertStmt:
+        def assert_stmt(self, _: None) -> uni.AssertStmt:
             """Grammar rule.
 
             assert_stmt: KW_ASSERT expression (COMMA expression)?
             """
-            error_msg: ast.Expr | None = None
+            error_msg: uni.Expr | None = None
             self.consume_token(Tok.KW_ASSERT)
-            condition = self.consume(ast.Expr)
+            condition = self.consume(uni.Expr)
             if self.match_token(Tok.COMMA):
-                error_msg = self.consume(ast.Expr)
-            return ast.AssertStmt(
+                error_msg = self.consume(uni.Expr)
+            return uni.AssertStmt(
                 condition=condition,
                 error_msg=error_msg,
                 kid=self.cur_nodes,
             )
 
-        def check_stmt(self, _: None) -> ast.CheckStmt:
+        def check_stmt(self, _: None) -> uni.CheckStmt:
             """Grammar rule.
 
             check_stmt: KW_CHECK expression
             """
             self.consume_token(Tok.KW_CHECK)
-            target = self.consume(ast.Expr)
-            return ast.CheckStmt(
+            target = self.consume(uni.Expr)
+            return uni.CheckStmt(
                 target=target,
                 kid=self.cur_nodes,
             )
 
-        def ctrl_stmt(self, _: None) -> ast.CtrlStmt:
+        def ctrl_stmt(self, _: None) -> uni.CtrlStmt | uni.DisengageStmt:
             """Grammar rule.
 
             ctrl_stmt: KW_SKIP | KW_BREAK | KW_CONTINUE
@@ -1456,156 +1313,143 @@ class JacParser(Pass):
                 or self.match_token(Tok.KW_BREAK)
                 or self.consume_token(Tok.KW_CONTINUE)
             )
-            return ast.CtrlStmt(
+            return uni.CtrlStmt(
                 ctrl=tok,
                 kid=self.cur_nodes,
             )
 
-        def delete_stmt(self, _: None) -> ast.DeleteStmt:
+        def delete_stmt(self, _: None) -> uni.DeleteStmt:
             """Grammar rule.
 
             delete_stmt: KW_DELETE expression
             """
             self.consume_token(Tok.KW_DELETE)
-            target = self.consume(ast.Expr)
-            return ast.DeleteStmt(
+            target = self.consume(uni.Expr)
+            return uni.DeleteStmt(
                 target=target,
                 kid=self.cur_nodes,
             )
 
-        def report_stmt(self, _: None) -> ast.ReportStmt:
+        def report_stmt(self, _: None) -> uni.ReportStmt:
             """Grammar rule.
 
             report_stmt: KW_REPORT expression
             """
             self.consume_token(Tok.KW_REPORT)
-            target = self.consume(ast.Expr)
-            return ast.ReportStmt(
+            target = self.consume(uni.Expr)
+            return uni.ReportStmt(
                 expr=target,
                 kid=self.cur_nodes,
             )
 
-        def return_stmt(self, _: None) -> ast.ReturnStmt:
+        def return_stmt(self, _: None) -> uni.ReturnStmt:
             """Grammar rule.
 
             return_stmt: KW_RETURN expression?
             """
             self.consume_token(Tok.KW_RETURN)
-            expr = self.match(ast.Expr)
-            return ast.ReturnStmt(
+            expr = self.match(uni.Expr)
+            return uni.ReturnStmt(
                 expr=expr,
                 kid=self.cur_nodes,
             )
 
-        def walker_stmt(self, _: None) -> ast.CodeBlockStmt:
+        def spatial_stmt(self, _: None) -> uni.CodeBlockStmt:
             """Grammar rule.
 
-            walker_stmt: disengage_stmt | revisit_stmt | visit_stmt | ignore_stmt
+            spatial_stmt: visit_stmt | ignore_stmt
             """
-            return self.consume(ast.CodeBlockStmt)
+            return self.consume(uni.CodeBlockStmt)
 
-        def ignore_stmt(self, _: None) -> ast.IgnoreStmt:
+        def ignore_stmt(self, _: None) -> uni.IgnoreStmt:
             """Grammar rule.
 
             ignore_stmt: KW_IGNORE expression SEMI
             """
             self.consume_token(Tok.KW_IGNORE)
-            target = self.consume(ast.Expr)
+            target = self.consume(uni.Expr)
             self.consume_token(Tok.SEMI)
-            return ast.IgnoreStmt(
+            return uni.IgnoreStmt(
                 target=target,
                 kid=self.cur_nodes,
             )
 
-        def visit_stmt(self, _: None) -> ast.VisitStmt:
+        def disenage_stmt(self, _: None) -> uni.DisengageStmt:
             """Grammar rule.
 
-            visit_stmt: KW_VISIT (inherited_archs)? expression (else_stmt | SEMI)
+            disenage_stmt: KW_DISENGAGE SEMI
             """
-            self.consume_token(Tok.KW_VISIT)
-            sub_name = self.match(ast.SubNodeList)
-            target = self.consume(ast.Expr)
-            else_body = self.match(ast.ElseStmt)
-            if else_body is None:
-                self.consume_token(Tok.SEMI)
-            return ast.VisitStmt(
-                vis_type=sub_name,
-                target=target,
-                else_body=else_body,
+            self.consume_token(Tok.KW_DISENGAGE)
+            self.consume_token(Tok.SEMI)
+            return uni.DisengageStmt(
                 kid=self.cur_nodes,
             )
 
-        def revisit_stmt(self, _: None) -> ast.RevisitStmt:
+        def visit_stmt(self, _: None) -> uni.VisitStmt:
             """Grammar rule.
 
-            revisit_stmt: KW_REVISIT expression? (else_stmt | SEMI)
+            visit_stmt: KW_VISIT (COLON expression COLON)?
+                expression (else_stmt | SEMI)
             """
-            self.consume_token(Tok.KW_REVISIT)
-            target = self.match(ast.Expr)
-            else_body = self.match(ast.ElseStmt)
+            self.consume_token(Tok.KW_VISIT)
+            insert_loc = None
+            if self.match_token(Tok.COLON):
+                insert_loc = self.consume(uni.Expr)
+                self.consume_token(Tok.COLON)
+            target = self.consume(uni.Expr)
+            else_body = self.match(uni.ElseStmt)
             if else_body is None:
                 self.consume_token(Tok.SEMI)
-            return ast.RevisitStmt(
-                hops=target,
+            return uni.VisitStmt(
+                insert_loc=insert_loc,
+                target=target,
                 else_body=else_body,
                 kid=self.cur_nodes,
             )
 
-        def disengage_stmt(self, _: None) -> ast.DisengageStmt:
-            """Grammar rule.
-
-            disengage_stmt: KW_DISENGAGE SEMI
-            """
-            kw = self.consume_token(Tok.KW_DISENGAGE)
-            semi = self.consume_token(Tok.SEMI)
-            return ast.DisengageStmt(
-                kid=[kw, semi],
-            )
-
-        def global_ref(self, _: None) -> ast.GlobalStmt:
+        def global_ref(self, _: None) -> uni.GlobalStmt:
             """Grammar rule.
 
             global_ref: GLOBAL_OP name_list
             """
             self.consume_token(Tok.GLOBAL_OP)
-            target = self.consume(ast.SubNodeList)
-            return ast.GlobalStmt(
-                target=target,
-                kid=self.cur_nodes,
+            target = self.consume(list)
+            return uni.GlobalStmt(
+                target=self.extract_from_list(target, uni.Name),
+                kid=self.flat_cur_nodes,
             )
 
-        def nonlocal_ref(self, _: None) -> ast.NonLocalStmt:
+        def nonlocal_ref(self, _: None) -> uni.NonLocalStmt:
             """Grammar rule.
 
             nonlocal_ref: NONLOCAL_OP name_list
             """
             self.consume_token(Tok.NONLOCAL_OP)
-            target = self.consume(ast.SubNodeList)
-            return ast.NonLocalStmt(
-                target=target,
-                kid=self.cur_nodes,
+            target = self.consume(list)
+            return uni.NonLocalStmt(
+                target=self.extract_from_list(target, uni.Name),
+                kid=self.flat_cur_nodes,
             )
 
-        def assignment(self, _: None) -> ast.Assignment:
+        def assignment(self, _: None) -> uni.Assignment:
             """Grammar rule.
 
             assignment: KW_LET? (atomic_chain EQ)+ (yield_expr | expression)
-                    | atomic_chain (COLON STRING)? type_tag (EQ (yield_expr | expression))?
-                    | atomic_chain aug_op (yield_expr | expression)
+                      | atomic_chain type_tag (EQ (yield_expr | expression))?
+                      | atomic_chain aug_op (yield_expr | expression)
             """
             assignees: list = []
-            type_tag: ast.SubTag | None = None
-            is_aug: ast.Token | None = None
-            semstr: ast.String | None = None
+            type_tag: uni.SubTag | None = None
+            is_aug: uni.Token | None = None
 
             is_frozen = bool(self.match_token(Tok.KW_LET))
-            if first_expr := self.match(ast.Expr):
+            if first_expr := self.match(uni.Expr):
                 assignees.append(first_expr)
 
-            token = self.match(ast.Token)
+            token = self.match(uni.Token)
             if token and (token.name == Tok.EQ):
                 assignees.append(token)
-                while expr := self.match(ast.Expr):
+                while expr := self.match(uni.Expr):
                     eq = self.match_token(Tok.EQ)
                     assignees.append(expr)
                     if eq:
@@ -1613,55 +1457,41 @@ class JacParser(Pass):
                 value = assignees.pop()
             elif token and (token.name not in {Tok.COLON, Tok.EQ}):
                 is_aug = token
-                value = self.consume(ast.Expr)
+                value = self.consume(uni.Expr)
             else:
-                semstr = (
-                    self.match(ast.String)
-                    if (token and (token.name == Tok.COLON))
-                    else None
-                )
-                type_tag = self.consume(ast.SubTag)
-                value = self.consume(ast.Expr) if self.match_token(Tok.EQ) else None
+                type_tag = self.consume(uni.SubTag)
+                value = self.consume(uni.Expr) if self.match_token(Tok.EQ) else None
 
-            valid_assignees = [i for i in assignees if isinstance(i, (ast.Expr))]
-            new_targ = ast.SubNodeList[ast.Expr](
-                items=valid_assignees,
-                delim=Tok.EQ,
-                kid=assignees,
-            )
-            kid = [x for x in self.cur_nodes if x not in assignees]
-            kid.insert(1, new_targ) if is_frozen else kid.insert(0, new_targ)
+            valid_assignees = [i for i in assignees if isinstance(i, (uni.Expr))]
             if is_aug:
-                return ast.Assignment(
-                    target=new_targ,
+                return uni.Assignment(
+                    target=valid_assignees,
                     type_tag=type_tag,
                     value=value,
                     mutable=is_frozen,
                     aug_op=is_aug,
-                    kid=kid,
+                    kid=self.flat_cur_nodes,
                 )
-            return ast.Assignment(
-                target=new_targ,
+            return uni.Assignment(
+                target=valid_assignees,
                 type_tag=type_tag,
                 value=value,
                 mutable=is_frozen,
-                kid=kid,
-                semstr=semstr,
+                kid=self.flat_cur_nodes,
             )
 
-        def expression(self, _: None) -> ast.Expr:
+        def expression(self, _: None) -> uni.Expr:
             """Grammar rule.
 
-            expression: walrus_assign
-                    | pipe (KW_IF expression KW_ELSE expression)?
-                    | lambda_expr
+            expression: walrus_assign (KW_IF expression KW_ELSE expression)?
+                      | lambda_expr
             """
-            value = self.consume(ast.Expr)
+            value = self.consume(uni.Expr)
             if self.match_token(Tok.KW_IF):
-                condition = self.consume(ast.Expr)
+                condition = self.consume(uni.Expr)
                 self.consume_token(Tok.KW_ELSE)
-                else_value = self.consume(ast.Expr)
-                return ast.IfElseExpr(
+                else_value = self.consume(uni.Expr)
+                return uni.IfElseExpr(
                     value=value,
                     condition=condition,
                     else_value=else_value,
@@ -1669,33 +1499,52 @@ class JacParser(Pass):
                 )
             return value
 
-        def walrus_assign(self, _: None) -> ast.Expr:
+        def concurrent_expr(self, _: None) -> uni.ConcurrentExpr | uni.Expr:
             """Grammar rule.
 
-            walrus_assign: (walrus_assign WALRUS_EQ)? pipe
+            concurrent: (KW_FLOW | KW_WAIT)
+            """
+            if (tok := self.match_token(Tok.KW_FLOW)) or (
+                tok := self.match_token(Tok.KW_WAIT)
+            ):
+                target = self.consume(uni.Expr)
+                return uni.ConcurrentExpr(
+                    tok=tok,
+                    target=target,
+                    kid=self.cur_nodes,
+                )
+            else:
+                return self.consume(uni.Expr)
+
+        def walrus_assign(self, _: None) -> uni.Expr:
+            """Grammar rule.
+
+            walrus_assign: (named_ref WALRUS_EQ)? pipe
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def lambda_expr(self, _: None) -> ast.LambdaExpr:
+        def lambda_expr(self, _: None) -> uni.LambdaExpr:
             """Grammar rule.
 
-            lamda_expr: KW_WITH func_decl_params? (RETURN_HINT expression)? KW_CAN expression
+            lambda_expr: KW_LAMBDA func_decl_params? (RETURN_HINT expression)? COLON expression
             """
-            return_type: ast.Expr | None = None
-            sig_kid: list[ast.AstNode] = []
-            self.consume_token(Tok.KW_WITH)
-            params = self.match(ast.SubNodeList)
+            return_type: uni.Expr | None = None
+            sig_kid: list[uni.UniNode] = []
+            self.consume_token(Tok.KW_LAMBDA)
+            params = self.match(list)
             if self.match_token(Tok.RETURN_HINT):
-                return_type = self.consume(ast.Expr)
-            self.consume_token(Tok.KW_CAN)
-            body = self.consume(ast.Expr)
+                return_type = self.consume(uni.Expr)
+            self.consume_token(Tok.COLON)
+            body = self.consume(uni.Expr)
             if params:
-                sig_kid.append(params)
+                sig_kid.extend(params)
             if return_type:
                 sig_kid.append(return_type)
             signature = (
-                ast.FuncSignature(
-                    params=params,
+                uni.FuncSignature(
+                    params=(
+                        self.extract_from_list(params, uni.ParamVar) if params else []
+                    ),
                     return_type=return_type,
                     kid=sig_kid,
                 )
@@ -1704,132 +1553,127 @@ class JacParser(Pass):
             )
             new_kid = [i for i in self.cur_nodes if i != params and i != return_type]
             new_kid.insert(1, signature) if signature else None
-            return ast.LambdaExpr(
+            return uni.LambdaExpr(
                 signature=signature,
                 body=body,
                 kid=new_kid,
             )
 
-        def pipe(self, _: None) -> ast.Expr:
+        def pipe(self, _: None) -> uni.Expr:
             """Grammar rule.
 
-            pipe: pipe_back PIPE_FWD pipe
-                | pipe_back
+            pipe: (pipe PIPE_FWD)? pipe_back
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def pipe_back(self, _: None) -> ast.Expr:
+        def pipe_back(self, _: None) -> uni.Expr:
             """Grammar rule.
 
-            pipe_back: bitwise_or PIPE_BKWD pipe_back
-                     | bitwise_or
+            pipe_back: (pipe_back PIPE_BKWD)? bitwise_or
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def bitwise_or(self, _: None) -> ast.Expr:
+        def bitwise_or(self, _: None) -> uni.Expr:
             """Grammar rule.
 
-            bitwise_or: bitwise_xor BW_OR bitwise_or
-                      | bitwise_xor
+            bitwise_or: (bitwise_or BW_OR)? bitwise_xor
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def bitwise_xor(self, _: None) -> ast.Expr:
+        def bitwise_xor(self, _: None) -> uni.Expr:
             """Grammar rule.
 
-            bitwise_xor: bitwise_and BW_XOR bitwise_xor
-                       | bitwise_and
+            bitwise_xor: (bitwise_xor BW_XOR)? bitwise_and
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def bitwise_and(self, _: None) -> ast.Expr:
+        def bitwise_and(self, _: None) -> uni.Expr:
             """Grammar rule.
 
-            bitwise_and: shift BW_AND bitwise_and
-                       | shift
+            bitwise_and: (bitwise_and BW_AND)? shift
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def shift(self, _: None) -> ast.Expr:
+        def shift(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             shift: (shift (RSHIFT | LSHIFT))? logical_or
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def logical_or(self, _: None) -> ast.Expr:
+        def logical_or(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             logical_or: logical_and (KW_OR logical_and)*
             """
-            value = self.consume(ast.Expr)
+            value = self.consume(uni.Expr)
             if not (ops := self.match_token(Tok.KW_OR)):
                 return value
             values: list = [value]
-            while value := self.consume(ast.Expr):
+            while value := self.consume(uni.Expr):
                 values.append(value)
                 if not self.match_token(Tok.KW_OR):
                     break
-            return ast.BoolExpr(
+            return uni.BoolExpr(
                 op=ops,
                 values=values,
                 kid=self.cur_nodes,
             )
 
-        def logical_and(self, _: None) -> ast.Expr:
+        def logical_and(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             logical_and: logical_not (KW_AND logical_not)*
             """
-            value = self.consume(ast.Expr)
+            value = self.consume(uni.Expr)
             if not (ops := self.match_token(Tok.KW_AND)):
                 return value
             values: list = [value]
-            while value := self.consume(ast.Expr):
+            while value := self.consume(uni.Expr):
                 values.append(value)
                 if not self.match_token(Tok.KW_AND):
                     break
-            return ast.BoolExpr(
+            return uni.BoolExpr(
                 op=ops,
                 values=values,
                 kid=self.cur_nodes,
             )
 
-        def logical_not(self, _: None) -> ast.Expr:
+        def logical_not(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             logical_not: NOT logical_not | compare
             """
             if op := self.match_token(Tok.NOT):
-                operand = self.consume(ast.Expr)
-                return ast.UnaryExpr(
+                operand = self.consume(uni.Expr)
+                return uni.UnaryExpr(
                     op=op,
                     operand=operand,
                     kid=self.cur_nodes,
                 )
-            return self.consume(ast.Expr)
+            return self.consume(uni.Expr)
 
-        def compare(self, _: None) -> ast.Expr:
+        def compare(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             compare: (arithmetic cmp_op)* arithmetic
             """
             ops: list = []
             rights: list = []
-            left = self.consume(ast.Expr)
-            while op := self.match(ast.Token):
+            left = self.consume(uni.Expr)
+            while op := self.match(uni.Token):
                 ops.append(op)
-                rights.append(self.consume(ast.Expr))
+                rights.append(self.consume(uni.Expr))
             if not ops:
                 return left
-            return ast.CompareExpr(
+            return uni.CompareExpr(
                 left=left,
                 ops=ops,
                 rights=rights,
                 kid=self.cur_nodes,
             )
 
-        def cmp_op(self, _: None) -> ast.Token:
+        def cmp_op(self, _: None) -> uni.Token:
             """Grammar rule.
 
             cmp_op: KW_ISN
@@ -1843,23 +1687,23 @@ class JacParser(Pass):
                   | LT
                   | EE
             """
-            return self.consume(ast.Token)
+            return self.consume(uni.Token)
 
-        def arithmetic(self, _: None) -> ast.Expr:
+        def arithmetic(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             arithmetic: (arithmetic (MINUS | PLUS))? term
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def term(self, _: None) -> ast.Expr:
+        def term(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             term: (term (MOD | DIV | FLOOR_DIV | STAR_MUL | DECOR_OP))? power
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def factor(self, _: None) -> ast.Expr:
+        def factor(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             factor: (BW_NOT | MINUS | PLUS) factor | connect
@@ -1869,123 +1713,120 @@ class JacParser(Pass):
                 or self.match_token(Tok.MINUS)
                 or self.match_token(Tok.PLUS)
             ):
-                operand = self.consume(ast.Expr)
-                return ast.UnaryExpr(
+                operand = self.consume(uni.Expr)
+                return uni.UnaryExpr(
                     op=op,
                     operand=operand,
                     kid=self.cur_nodes,
                 )
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def power(self, _: None) -> ast.Expr:
+        def power(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             power: (power STAR_POW)? factor
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def connect(self, _: None) -> ast.Expr:
+        def connect(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             connect: (connect (connect_op | disconnect_op))? atomic_pipe
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def atomic_pipe(self, _: None) -> ast.Expr:
+        def atomic_pipe(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             atomic_pipe: (atomic_pipe A_PIPE_FWD)? atomic_pipe_back
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def atomic_pipe_back(self, _: None) -> ast.Expr:
+        def atomic_pipe_back(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             atomic_pipe_back: (atomic_pipe_back A_PIPE_BKWD)? ds_spawn
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def ds_spawn(self, _: None) -> ast.Expr:
+        def ds_spawn(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             ds_spawn: (ds_spawn KW_SPAWN)? unpack
             """
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def unpack(self, _: None) -> ast.Expr:
+        def unpack(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             unpack: STAR_MUL? ref
             """
             if op := self.match_token(Tok.STAR_MUL):
-                operand = self.consume(ast.Expr)
-                return ast.UnaryExpr(
+                operand = self.consume(uni.Expr)
+                return uni.UnaryExpr(
                     op=op,
                     operand=operand,
                     kid=self.cur_nodes,
                 )
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def ref(self, _: None) -> ast.Expr:
+        def ref(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             ref: walrus_assign
                | BW_AND walrus_assign
             """
             if op := self.match_token(Tok.BW_AND):
-                operand = self.consume(ast.Expr)
-                return ast.UnaryExpr(
+                operand = self.consume(uni.Expr)
+                return uni.UnaryExpr(
                     op=op,
                     operand=operand,
                     kid=self.cur_nodes,
                 )
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def pipe_call(self, _: None) -> ast.Expr:
+        def pipe_call(self, _: None) -> uni.Expr:
             """Grammar rule.
 
-            pipe_call: atomic_chain
-                | PIPE_FWD atomic_chain
-                | A_PIPE_FWD atomic_chain
-                | KW_SPAWN atomic_chain
-                | KW_AWAIT atomic_chain
+            pipe_call: (PIPE_FWD | A_PIPE_FWD | KW_SPAWN | KW_AWAIT)? atomic_chain
             """
             if len(self.cur_nodes) == 2:
                 if self.match_token(Tok.KW_AWAIT):
-                    target = self.consume(ast.Expr)
-                    return ast.AwaitExpr(
+                    target = self.consume(uni.Expr)
+                    return uni.AwaitExpr(
                         target=target,
                         kid=self.cur_nodes,
                     )
-                elif op := self.match(ast.Token):
-                    operand = self.consume(ast.Expr)
-                    return ast.UnaryExpr(
+                elif op := self.match(uni.Token):
+                    operand = self.consume(uni.Expr)
+                    return uni.UnaryExpr(
                         op=op,
                         operand=operand,
                         kid=self.cur_nodes,
                     )
             return self._binary_expr_unwind(self.cur_nodes)
 
-        def aug_op(self, _: None) -> ast.Token:
+        def aug_op(self, _: None) -> uni.Token:
             """Grammar rule.
 
             aug_op: RSHIFT_EQ
-                     | LSHIFT_EQ
-                     | BW_NOT_EQ
-                     | BW_XOR_EQ
-                     | BW_OR_EQ
-                     | BW_AND_EQ
-                     | MOD_EQ
-                     | DIV_EQ
-                     | FLOOR_DIV_EQ
-                     | MUL_EQ
-                     | SUB_EQ
-                     | ADD_EQ
-                     | WALRUS_EQ
+                   | LSHIFT_EQ
+                   | BW_NOT_EQ
+                   | BW_XOR_EQ
+                   | BW_OR_EQ
+                   | BW_AND_EQ
+                   | MOD_EQ
+                   | DIV_EQ
+                   | FLOOR_DIV_EQ
+                   | MUL_EQ
+                   | SUB_EQ
+                   | ADD_EQ
+                   | MATMUL_EQ
+                   | STAR_POW_EQ
             """
-            return self.consume(ast.Token)
+            return self.consume(uni.Token)
 
-        def atomic_chain(self, _: None) -> ast.Expr:
+        def atomic_chain(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             atomic_chain: atomic_chain NULL_OK? (filter_compr | assign_compr | index_slice)
@@ -1993,11 +1834,11 @@ class JacParser(Pass):
                         | (atomic_call | atom | edge_ref_chain)
             """
             if len(self.cur_nodes) == 1:
-                return self.consume(ast.Expr)
-            target = self.consume(ast.Expr)
+                return self.consume(uni.Expr)
+            target = self.consume(uni.Expr)
             is_null_ok = bool(self.match_token(Tok.NULL_OK))
-            if right := self.match(ast.AtomExpr):
-                return ast.AtomTrailer(
+            if right := self.match(uni.AtomExpr):
+                return uni.AtomTrailer(
                     target=target,
                     right=right,
                     is_null_ok=is_null_ok,
@@ -2009,8 +1850,8 @@ class JacParser(Pass):
                 or self.match_token(Tok.DOT_FWD)
                 or self.consume_token(Tok.DOT)
             )
-            name = self.match(ast.AtomExpr) or self.consume(ast.AtomTrailer)
-            return ast.AtomTrailer(
+            name = self.match(uni.AtomExpr) or self.consume(uni.AtomTrailer)
+            return uni.AtomTrailer(
                 target=(target if token.name != Tok.DOT_BKWD else name),
                 right=(name if token.name != Tok.DOT_BKWD else target),
                 is_null_ok=is_null_ok,
@@ -2018,26 +1859,30 @@ class JacParser(Pass):
                 kid=self.cur_nodes,
             )
 
-        def atomic_call(self, _: None) -> ast.FuncCall:
+        def atomic_call(self, _: None) -> uni.FuncCall:
             """Grammar rule.
 
             atomic_call: atomic_chain LPAREN param_list? (KW_BY atomic_call)? RPAREN
             """
-            genai_call: ast.FuncCall | None = None
-            target = self.consume(ast.Expr)
+            genai_call: uni.FuncCall | None = None
+            target = self.consume(uni.Expr)
             self.consume_token(Tok.LPAREN)
-            params = self.match(ast.SubNodeList)
+            params_sn = self.match(list)
             if self.match_token(Tok.KW_BY):
-                genai_call = self.consume(ast.FuncCall)
+                genai_call = self.consume(uni.FuncCall)
             self.consume_token(Tok.RPAREN)
-            return ast.FuncCall(
+            return uni.FuncCall(
                 target=target,
-                params=params,
+                params=(
+                    self.extract_from_list(params_sn, (uni.Expr, uni.KWPair))  # type: ignore[arg-type]
+                    if params_sn
+                    else []
+                ),
                 genai_call=genai_call,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def index_slice(self, _: None) -> ast.IndexSlice:
+        def index_slice(self, _: None) -> uni.IndexSlice:
             """Grammar rule.
 
             index_slice: LSQUARE                                                        \
@@ -2047,44 +1892,39 @@ class JacParser(Pass):
                         | list_val
             """
             if len(self.cur_nodes) == 1:
-                index = self.consume(ast.ListVal)
-                if not index.values:
-                    raise self.ice()
-                if len(index.values.items) == 1:
-                    expr = index.values.items[0] if index.values else None
+                index = self.consume(uni.ListVal)
+                if len(index.values) == 1:
+                    expr = index.values[0]
                     kid = self.cur_nodes
                 else:
-                    sublist = ast.SubNodeList[ast.Expr | ast.KWPair](
-                        items=[*index.values.items], delim=Tok.COMMA, kid=index.kid
-                    )
-                    expr = ast.TupleVal(values=sublist, kid=[sublist])
+                    expr = uni.TupleVal(values=index.values, kid=index.kid)
                     kid = [expr]
-                return ast.IndexSlice(
-                    slices=[ast.IndexSlice.Slice(start=expr, stop=None, step=None)],
+                return uni.IndexSlice(
+                    slices=[uni.IndexSlice.Slice(start=expr, stop=None, step=None)],
                     is_range=False,
                     kid=kid,
                 )
             else:
                 self.consume_token(Tok.LSQUARE)
-                slices: list[ast.IndexSlice.Slice] = []
+                slices: list[uni.IndexSlice.Slice] = []
                 while not self.match_token(Tok.RSQUARE):
-                    expr1 = self.match(ast.Expr)
+                    expr1 = self.match(uni.Expr)
                     self.consume_token(Tok.COLON)
-                    expr2 = self.match(ast.Expr)
+                    expr2 = self.match(uni.Expr)
                     expr3 = (
-                        self.match(ast.Expr) if self.match_token(Tok.COLON) else None
+                        self.match(uni.Expr) if self.match_token(Tok.COLON) else None
                     )
                     self.match_token(Tok.COMMA)
                     slices.append(
-                        ast.IndexSlice.Slice(start=expr1, stop=expr2, step=expr3)
+                        uni.IndexSlice.Slice(start=expr1, stop=expr2, step=expr3)
                     )
-                return ast.IndexSlice(
+                return uni.IndexSlice(
                     slices=slices,
                     is_range=True,
                     kid=self.cur_nodes,
                 )
 
-        def atom(self, _: None) -> ast.Expr:
+        def atom(self, _: None) -> uni.Expr:
             """Grammar rule.
 
             atom: named_ref
@@ -2094,41 +1934,42 @@ class JacParser(Pass):
                  | type_ref
             """
             if self.match_token(Tok.LPAREN):
-                value = self.match(ast.Expr) or self.consume(ast.YieldExpr)
+                value = self.match(uni.Expr) or self.consume(uni.YieldExpr)
                 self.consume_token(Tok.RPAREN)
-                return ast.AtomUnit(value=value, kid=self.cur_nodes)
-            return self.consume(ast.AtomExpr)
+                return uni.AtomUnit(value=value, kid=self.cur_nodes)
+            return self.consume(uni.AtomExpr)
 
-        def yield_expr(self, _: None) -> ast.YieldExpr:
+        def yield_expr(self, _: None) -> uni.YieldExpr:
             """Grammar rule.
 
             yield_expr: KW_YIELD KW_FROM? expression
             """
             self.consume_token(Tok.KW_YIELD)
             is_with_from = bool(self.match_token(Tok.KW_FROM))
-            expr = self.consume(ast.Expr)
-            return ast.YieldExpr(
+            expr = self.consume(uni.Expr)
+            return uni.YieldExpr(
                 expr=expr,
                 with_from=is_with_from,
                 kid=self.cur_nodes,
             )
 
-        def atom_literal(self, _: None) -> ast.AtomExpr:
+        def atom_literal(self, _: None) -> uni.AtomExpr:
             """Grammar rule.
 
             atom_literal: builtin_type
                         | NULL
                         | BOOL
                         | multistring
+                        | ELLIPSIS
                         | FLOAT
                         | OCT
                         | BIN
                         | HEX
                         | INT
             """
-            return self.consume(ast.AtomExpr)
+            return self.consume(uni.AtomExpr)
 
-        def atom_collection(self, kid: list[ast.AstNode]) -> ast.AtomExpr:
+        def atom_collection(self, kid: list[uni.UniNode]) -> uni.AtomExpr:
             """Grammar rule.
 
             atom_collection: dict_compr
@@ -2140,316 +1981,274 @@ class JacParser(Pass):
                            | tuple_val
                            | list_val
             """
-            return self.consume(ast.AtomExpr)
+            return self.consume(uni.AtomExpr)
 
-        def multistring(self, _: None) -> ast.AtomExpr:
+        def multistring(self, _: None) -> uni.AtomExpr:
             """Grammar rule.
 
             multistring: (fstring | STRING)+
             """
-            valid_strs = [self.match(ast.String) or self.consume(ast.FString)]
-            while node := (self.match(ast.String) or self.match(ast.FString)):
+            valid_strs = [self.match(uni.String) or self.consume(uni.FString)]
+            while node := (self.match(uni.String) or self.match(uni.FString)):
                 valid_strs.append(node)
-            return ast.MultiString(
+            return uni.MultiString(
                 strings=valid_strs,
                 kid=self.cur_nodes,
             )
 
-        def fstring(self, _: None) -> ast.FString:
+        def fstring(self, _: None) -> uni.FString:
             """Grammar rule.
 
             fstring: FSTR_START fstr_parts FSTR_END
                 | FSTR_SQ_START fstr_sq_parts FSTR_SQ_END
             """
             self.match_token(Tok.FSTR_START) or self.consume_token(Tok.FSTR_SQ_START)
-            target = self.match(ast.SubNodeList)
+            target = self.match(list)
             self.match_token(Tok.FSTR_END) or self.consume_token(Tok.FSTR_SQ_END)
-            return ast.FString(
-                parts=target,
-                kid=self.cur_nodes,
+            return uni.FString(
+                parts=(
+                    self.extract_from_list(target, (uni.String, uni.ExprStmt))
+                    if target
+                    else []
+                ),
+                kid=self.flat_cur_nodes,
             )
 
-        def fstr_parts(self, _: None) -> ast.SubNodeList[ast.String | ast.ExprStmt]:
+        def fstr_parts(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             fstr_parts: (FSTR_PIECE | FSTR_BESC | LBRACE expression RBRACE )*
             """
-            valid_parts: list[ast.String | ast.ExprStmt] = [
+            valid_parts: list[uni.UniNode] = [
                 (
                     i
-                    if isinstance(i, ast.String)
-                    else ast.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                    if isinstance(i, uni.String)
+                    else (
+                        uni.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                        if isinstance(i, uni.Expr)
+                        else i
+                    )
                 )
                 for i in self.cur_nodes
-                if isinstance(i, ast.Expr)
             ]
-            return ast.SubNodeList[ast.String | ast.ExprStmt](
-                items=valid_parts,
-                delim=None,
-                kid=valid_parts,
-            )
+            return valid_parts
 
-        def fstr_sq_parts(self, _: None) -> ast.SubNodeList[ast.String | ast.ExprStmt]:
+        def fstr_sq_parts(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             fstr_sq_parts: (FSTR_SQ_PIECE | FSTR_BESC | LBRACE expression RBRACE )*
             """
-            valid_parts: list[ast.String | ast.ExprStmt] = [
+            valid_parts: list[uni.UniNode] = [
                 (
                     i
-                    if isinstance(i, ast.String)
-                    else ast.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                    if isinstance(i, uni.String)
+                    else (
+                        uni.ExprStmt(expr=i, in_fstring=True, kid=[i])
+                        if isinstance(i, uni.Expr)
+                        else i
+                    )
                 )
                 for i in self.cur_nodes
-                if isinstance(i, ast.Expr)
             ]
-            return ast.SubNodeList[ast.String | ast.ExprStmt](
-                items=valid_parts,
-                delim=None,
-                kid=valid_parts,
-            )
+            return valid_parts
 
-        def list_val(self, _: None) -> ast.ListVal:
+        def list_val(self, _: None) -> uni.ListVal:
             """Grammar rule.
 
             list_val: LSQUARE (expr_list COMMA?)? RSQUARE
             """
             self.consume_token(Tok.LSQUARE)
-            values = self.match(ast.SubNodeList)
+            values_node = self.match(list)
             self.match_token(Tok.COMMA)
             self.consume_token(Tok.RSQUARE)
-            return ast.ListVal(
+            values = (
+                self.extract_from_list(values_node, uni.Expr) if values_node else []
+            )
+            return uni.ListVal(
                 values=values,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def tuple_val(self, _: None) -> ast.TupleVal:
+        def tuple_val(self, _: None) -> uni.TupleVal:
             """Grammar rule.
 
             tuple_val: LPAREN tuple_list? RPAREN
             """
             self.consume_token(Tok.LPAREN)
-            target = self.match(ast.SubNodeList)
+            target = self.match(list)
             self.consume_token(Tok.RPAREN)
-            return ast.TupleVal(
-                values=target,
-                kid=self.cur_nodes,
+            return uni.TupleVal(
+                values=(
+                    self.extract_from_list(target, (uni.Expr, uni.KWPair))
+                    if target
+                    else []
+                ),
+                kid=self.flat_cur_nodes,
             )
 
-        def set_val(self, _: None) -> ast.SetVal:
+        def set_val(self, _: None) -> uni.SetVal:
             """Grammar rule.
 
             set_val: LBRACE expr_list COMMA? RBRACE
             """
             self.match_token(Tok.LBRACE)
-            expr_list = self.match(ast.SubNodeList)
+            expr_list = self.match(list)
             self.match_token(Tok.COMMA)
             self.match_token(Tok.RBRACE)
-            return ast.SetVal(
-                values=expr_list,
-                kid=self.cur_nodes,
+            values = self.extract_from_list(expr_list, uni.Expr) if expr_list else []
+            return uni.SetVal(
+                values=values,
+                kid=self.flat_cur_nodes,
             )
 
-        def expr_list(self, kid: list[ast.AstNode]) -> ast.SubNodeList[ast.Expr]:
+        def expr_list(self, kid: list[uni.UniNode]) -> list[uni.UniNode]:
             """Grammar rule.
 
             expr_list: (expr_list COMMA)? expression
             """
-            new_kid: list = []
-            if consume := self.match(ast.SubNodeList):
-                comma = self.consume_token(Tok.COMMA)
-                new_kid.extend([*consume.kid, comma])
-            expr = self.consume(ast.Expr)
-            new_kid.extend([expr])
-            valid_kid = [i for i in new_kid if isinstance(i, ast.Expr)]
-            return ast.SubNodeList[ast.Expr](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=new_kid,
-            )
+            return self.flat_cur_nodes
 
-        def kw_expr_list(self, kid: list[ast.AstNode]) -> ast.SubNodeList[ast.KWPair]:
+        def kw_expr_list(self, kid: list[uni.UniNode]) -> list[uni.UniNode]:
             """Grammar rule.
 
             kw_expr_list: (kw_expr_list COMMA)? kw_expr
             """
-            if consume := self.match(ast.SubNodeList):
-                comma = self.consume_token(Tok.COMMA)
-                expr = self.consume(ast.KWPair)
-                new_kid = [*consume.kid, comma, expr]
-            else:
-                expr = self.consume(ast.KWPair)
-                new_kid = [expr]
-            valid_kid = [i for i in new_kid if isinstance(i, ast.KWPair)]
-            return ast.SubNodeList[ast.KWPair](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=new_kid,
-            )
+            return self.flat_cur_nodes
 
-        def kw_expr(self, _: None) -> ast.KWPair:
+        def kw_expr(self, _: None) -> uni.KWPair:
             """Grammar rule.
 
             kw_expr: named_ref EQ expression | STAR_POW expression
             """
             if self.match_token(Tok.STAR_POW):
-                value = self.consume(ast.Expr)
+                value = self.consume(uni.Expr)
                 key = None
             else:
-                key = self.consume(ast.Name)
+                key = self.consume(uni.Name)
                 self.consume_token(Tok.EQ)
-                value = self.consume(ast.Expr)
-            return ast.KWPair(
+                value = self.consume(uni.Expr)
+            return uni.KWPair(
                 key=key,
                 value=value,
                 kid=self.cur_nodes,
             )
 
-        def name_list(self, _: None) -> ast.SubNodeList[ast.Name]:
+        def name_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             name_list: (named_ref COMMA)* named_ref
             """
-            valid_kid = [self.consume(ast.Name)]
-            while self.match_token(Tok.COMMA):
-                valid_kid.append(self.consume(ast.Name))
-            return ast.SubNodeList[ast.Name](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=self.cur_nodes,
-            )
+            return self.flat_cur_nodes
 
-        def tuple_list(self, _: None) -> ast.SubNodeList[ast.Expr | ast.KWPair]:
+        def tuple_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
-            tuple_list: expression COMMA expr_list    COMMA kw_expr_list COMMA?
+            tuple_list: expression COMMA expr_list COMMA kw_expr_list COMMA?
                       | expression COMMA kw_expr_list COMMA?
-                      | expression COMMA expr_list    COMMA?
+                      | expression COMMA expr_list COMMA?
                       | expression COMMA
                       | kw_expr_list COMMA?
             """
-            if first_expr := self.match(ast.SubNodeList):
-                comma = self.match_token(Tok.COMMA)
-                if comma:
-                    first_expr.kid.append(comma)
-                return first_expr
-            expr = self.consume(ast.Expr)
-            self.consume_token(Tok.COMMA)
-            second_expr = self.match(ast.SubNodeList)
-            self.match_token(Tok.COMMA)
-            kw_expr_list = self.match(ast.SubNodeList)
-            self.match_token(Tok.COMMA)
-            expr_list: list = []
-            if second_expr:
-                expr_list = second_expr.kid
-                if kw_expr_list:
-                    expr_list = [*expr_list, *kw_expr_list.kid]
-            expr_list = [expr, *expr_list]
-            valid_kid = [i for i in expr_list if isinstance(i, (ast.Expr, ast.KWPair))]
-            return ast.SubNodeList[ast.Expr | ast.KWPair](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=self.cur_nodes,
-            )
+            return self.flat_cur_nodes
 
-        def dict_val(self, _: None) -> ast.DictVal:
+        def dict_val(self, _: None) -> uni.DictVal:
             """Grammar rule.
 
             dict_val: LBRACE ((kv_pair COMMA)* kv_pair COMMA?)? RBRACE
             """
             self.consume_token(Tok.LBRACE)
             kv_pairs: list = []
-            while item := self.match(ast.KVPair):
+            while item := self.match(uni.KVPair):
                 kv_pairs.append(item)
                 self.match_token(Tok.COMMA)
             self.consume_token(Tok.RBRACE)
-            return ast.DictVal(
+            return uni.DictVal(
                 kv_pairs=kv_pairs,
                 kid=self.cur_nodes,
             )
 
-        def kv_pair(self, _: None) -> ast.KVPair:
+        def kv_pair(self, _: None) -> uni.KVPair:
             """Grammar rule.
 
             kv_pair: expression COLON expression | STAR_POW expression
             """
             if self.match_token(Tok.STAR_POW):
-                value = self.consume(ast.Expr)
-                return ast.KVPair(
+                value = self.consume(uni.Expr)
+                return uni.KVPair(
                     key=None,
                     value=value,
                     kid=self.cur_nodes,
                 )
-            key = self.consume(ast.Expr)
+            key = self.consume(uni.Expr)
             self.consume_token(Tok.COLON)
-            value = self.consume(ast.Expr)
-            return ast.KVPair(
+            value = self.consume(uni.Expr)
+            return uni.KVPair(
                 key=key,
                 value=value,
                 kid=self.cur_nodes,
             )
 
-        def list_compr(self, _: None) -> ast.ListCompr:
+        def list_compr(self, _: None) -> uni.ListCompr:
             """Grammar rule.
 
             list_compr: LSQUARE expression inner_compr+ RSQUARE
             """
             self.consume_token(Tok.LSQUARE)
-            out_expr = self.consume(ast.Expr)
-            comprs = self.consume_many(ast.InnerCompr)
+            out_expr = self.consume(uni.Expr)
+            comprs = self.consume_many(uni.InnerCompr)
             self.consume_token(Tok.RSQUARE)
-            return ast.ListCompr(
+            return uni.ListCompr(
                 out_expr=out_expr,
                 compr=comprs,
                 kid=self.cur_nodes,
             )
 
-        def gen_compr(self, _: None) -> ast.GenCompr:
+        def gen_compr(self, _: None) -> uni.GenCompr:
             """Grammar rule.
 
             gen_compr: LPAREN expression inner_compr+ RPAREN
             """
             self.consume_token(Tok.LPAREN)
-            out_expr = self.consume(ast.Expr)
-            comprs = self.consume_many(ast.InnerCompr)
+            out_expr = self.consume(uni.Expr)
+            comprs = self.consume_many(uni.InnerCompr)
             self.consume_token(Tok.RPAREN)
-            return ast.GenCompr(
+            return uni.GenCompr(
                 out_expr=out_expr,
                 compr=comprs,
                 kid=self.cur_nodes,
             )
 
-        def set_compr(self, _: None) -> ast.SetCompr:
+        def set_compr(self, _: None) -> uni.SetCompr:
             """Grammar rule.
 
             set_compr: LBRACE expression inner_compr+ RBRACE
             """
             self.consume_token(Tok.LBRACE)
-            out_expr = self.consume(ast.Expr)
-            comprs = self.consume_many(ast.InnerCompr)
+            out_expr = self.consume(uni.Expr)
+            comprs = self.consume_many(uni.InnerCompr)
             self.consume_token(Tok.RBRACE)
-            return ast.SetCompr(
+            return uni.SetCompr(
                 out_expr=out_expr,
                 compr=comprs,
                 kid=self.cur_nodes,
             )
 
-        def dict_compr(self, _: None) -> ast.DictCompr:
+        def dict_compr(self, _: None) -> uni.DictCompr:
             """Grammar rule.
 
             dict_compr: LBRACE kv_pair inner_compr+ RBRACE
             """
             self.consume_token(Tok.LBRACE)
-            kv_pair = self.consume(ast.KVPair)
-            comprs = self.consume_many(ast.InnerCompr)
+            kv_pair = self.consume(uni.KVPair)
+            comprs = self.consume_many(uni.InnerCompr)
             self.consume_token(Tok.RBRACE)
-            return ast.DictCompr(
+            return uni.DictCompr(
                 kv_pair=kv_pair,
                 compr=comprs,
                 kid=self.cur_nodes,
             )
 
-        def inner_compr(self, _: None) -> ast.InnerCompr:
+        def inner_compr(self, _: None) -> uni.InnerCompr:
             """Grammar rule.
 
             inner_compr: KW_ASYNC? KW_FOR atomic_chain KW_IN pipe_call (KW_IF walrus_assign)*
@@ -2457,12 +2256,12 @@ class JacParser(Pass):
             conditional: list = []
             is_async = bool(self.match_token(Tok.KW_ASYNC))
             self.consume_token(Tok.KW_FOR)
-            target = self.consume(ast.Expr)
+            target = self.consume(uni.Expr)
             self.consume_token(Tok.KW_IN)
-            collection = self.consume(ast.Expr)
+            collection = self.consume(uni.Expr)
             while self.match_token(Tok.KW_IF):
-                conditional.append(self.consume(ast.Expr))
-            return ast.InnerCompr(
+                conditional.append(self.consume(uni.Expr))
+            return uni.InnerCompr(
                 is_async=is_async,
                 target=target,
                 collection=collection,
@@ -2470,293 +2269,106 @@ class JacParser(Pass):
                 kid=self.cur_nodes,
             )
 
-        def param_list(self, _: None) -> ast.SubNodeList[ast.Expr | ast.KWPair]:
+        def param_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             param_list: expr_list    COMMA kw_expr_list COMMA?
                       | kw_expr_list COMMA?
                       | expr_list    COMMA?
             """
-            kw_expr_list: ast.SubNodeList | None = None
-            expr_list = self.consume(ast.SubNodeList)
-            if len(self.cur_nodes) > 2:
-                self.consume_token(Tok.COMMA)
-                kw_expr_list = self.consume(ast.SubNodeList)
-            ends_comma = self.match_token(Tok.COMMA)
-            if kw_expr_list:
-                valid_kid = [
-                    i
-                    for i in [*expr_list.items, *kw_expr_list.items]
-                    if isinstance(i, (ast.Expr, ast.KWPair))
-                ]
-                return ast.SubNodeList[ast.Expr | ast.KWPair](
-                    items=valid_kid,
-                    delim=Tok.COMMA,
-                    kid=self.cur_nodes,
-                )
-            else:
-                if ends_comma:
-                    expr_list.kid.append(ends_comma)
-                return expr_list
-
-        def assignment_list(self, _: None) -> ast.SubNodeList[ast.Assignment]:
-            """Grammar rule.
-
-            assignment_list: assignment_list COMMA assignment | assignment
-            """
-            if consume := self.match(ast.SubNodeList):
-                comma = self.consume_token(Tok.COMMA)
-                assign = self.consume(ast.Assignment)
-                new_kid = [*consume.kid, comma, assign]
-            else:
-                assign = self.consume(ast.Assignment)
-                new_kid = [assign]
-            valid_kid = [i for i in new_kid if isinstance(i, ast.Assignment)]
-            return ast.SubNodeList[ast.Assignment](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=new_kid,
-            )
-
-        def arch_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
-            """Grammar rule.
-
-            arch_ref: object_ref
-                    | walker_ref
-                    | edge_ref
-                    | node_ref
-                    | type_ref
-            """
-            return self.consume(ast.ArchRef)
-
-        def node_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
-            """Grammar rule.
-
-            node_ref: NODE_OP NAME
-            """
-            arch_type = self.consume(ast.Token)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
-                kid=self.cur_nodes,
-            )
-
-        def edge_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
-            """Grammar rule.
-
-            edge_ref: EDGE_OP NAME
-            """
-            arch_type = self.consume(ast.Token)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
-                kid=self.cur_nodes,
-            )
+            return self.flat_cur_nodes
 
-        def walker_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
+        def assignment_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
-            walker_ref: WALKER_OP NAME
+            assignment_list: (assignment_list COMMA)? (assignment | NAME)
             """
-            arch_type = self.consume(ast.Token)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
-                kid=self.cur_nodes,
-            )
 
-        def class_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
-            """Grammar rule.
-
-            class_ref: CLASS_OP name_ref
-            """
-            arch_type = self.consume(ast.Token)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
-                kid=self.cur_nodes,
-            )
-
-        def object_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
-            """Grammar rule.
+            def name_to_assign(name_consume: uni.NameAtom) -> uni.Assignment:
+                return uni.Assignment(
+                    target=[name_consume], value=None, type_tag=None, kid=[name_consume]
+                )
 
-            object_ref: OBJECT_OP name_ref
-            """
-            arch_type = self.consume(ast.Token)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
-                kid=self.cur_nodes,
-            )
+            if self.match(list):
+                self.consume_token(Tok.COMMA)
+            if self.match(uni.Assignment):
+                pass
+            elif name_consume := self.match(uni.NameAtom):
+                self.cur_nodes[self.node_idx - 1] = name_to_assign(name_consume)
+            else:
+                assign = self.consume(uni.Assignment)
+                self.cur_nodes[self.node_idx - 1] = assign
+            return self.flat_cur_nodes
 
-        def type_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
+        def type_ref(self, kid: list[uni.UniNode]) -> uni.TypeRef:
             """Grammar rule.
 
             type_ref: TYPE_OP (named_ref | builtin_type)
             """
-            arch_type = self.consume(ast.Token)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
-                kid=self.cur_nodes,
-            )
-
-        def enum_ref(self, kid: list[ast.AstNode]) -> ast.ArchRef:
-            """Grammar rule.
-
-            enum_ref: ENUM_OP NAME
-            """
-            arch_type = self.consume(ast.Token)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
-                kid=self.cur_nodes,
-            )
-
-        def ability_ref(self, _: None) -> ast.ArchRef:
-            """Grammar rule.
-
-            ability_ref: ABILITY_OP (special_ref | name_ref)
-            """
-            arch_type = self.consume_token(Tok.ABILITY_OP)
-            arch_name = self.consume(ast.NameAtom)
-            return ast.ArchRef(
-                arch_type=arch_type,
-                arch_name=arch_name,
+            self.consume(uni.Token)
+            arch_name = self.consume(uni.NameAtom)
+            return uni.TypeRef(
+                target=arch_name,
                 kid=self.cur_nodes,
             )
 
-        def arch_or_ability_chain(self, kid: list[ast.AstNode]) -> ast.ArchRefChain:
-            """Grammar rule.
-
-            arch_or_ability_chain: arch_or_ability_chain? (ability_ref | arch_ref)
-            """
-            consume = self.match(ast.ArchRefChain)
-            name = self.consume(ast.ArchRef)
-            new_kid = [*consume.kid, name] if consume else [name]
-            valid_kid = [i for i in new_kid if isinstance(i, ast.ArchRef)]
-            return ast.ArchRefChain(
-                archs=valid_kid,
-                kid=new_kid,
-            )
-
-        def abil_to_arch_chain(self, _: None) -> ast.ArchRefChain:
-            """Grammar rule.
-
-            abil_to_arch_chain: arch_or_ability_chain? arch_ref
-            """
-            arch_chain = self.match(ast.ArchRefChain)
-            arch_ref = self.consume(ast.ArchRef)
-            if arch_chain:
-                return ast.ArchRefChain(
-                    archs=[*arch_chain.archs, arch_ref],
-                    kid=[*arch_chain.kid, arch_ref],
-                )
-            return ast.ArchRefChain(
-                archs=[arch_ref],
-                kid=[arch_ref],
-            )
-
-        def arch_to_abil_chain(self, _: None) -> ast.ArchRefChain:
+        def edge_ref_chain(self, _: None) -> uni.EdgeRefTrailer:
             """Grammar rule.
 
-            arch_to_abil_chain: arch_or_ability_chain? ability_ref
+            LSQUARE (KW_NODE| KW_EDGE)? expression? (edge_op_ref (filter_compr | expression)?)+ RSQUARE
             """
-            arch_chain = self.match(ast.ArchRefChain)
-            abil_ref = self.consume(ast.ArchRef)
-            if arch_chain:
-                return ast.ArchRefChain(
-                    archs=[*arch_chain.archs, abil_ref],
-                    kid=[*arch_chain.kid, abil_ref],
-                )
-            return ast.ArchRefChain(
-                archs=[abil_ref],
-                kid=[abil_ref],
-            )
-
-        def arch_to_enum_chain(self, _: None) -> ast.ArchRefChain:
-            """Grammar rule.
-
-            arch_to_enum_chain: arch_or_ability_chain? enum_ref
-            """
-            arch_chain = self.match(ast.ArchRefChain)
-            enum_ref = self.consume(ast.ArchRef)
-            if arch_chain:
-                return ast.ArchRefChain(
-                    archs=[*arch_chain.archs, enum_ref],
-                    kid=[*arch_chain.kid, enum_ref],
-                )
-            return ast.ArchRefChain(
-                archs=[enum_ref],
-                kid=[enum_ref],
-            )
-
-        def edge_ref_chain(self, _: None) -> ast.EdgeRefTrailer:
-            """Grammar rule.
-
-            (EDGE_OP|NODE_OP)? LSQUARE expression? (edge_op_ref (filter_compr | expression)?)+ RSQUARE
-            """
-            edges_only = bool(self.match_token(Tok.EDGE_OP))
-            self.match_token(Tok.NODE_OP)
             self.consume_token(Tok.LSQUARE)
+            edges_only = bool(self.match_token(Tok.KW_EDGE))
+            self.match_token(Tok.KW_NODE)
             valid_chain = []
-            if expr := self.match(ast.Expr):
+            if expr := self.match(uni.Expr):
                 valid_chain.append(expr)
-            valid_chain.extend(self.match_many(ast.Expr))
+            valid_chain.extend(self.match_many(uni.Expr))
             self.consume_token(Tok.RSQUARE)
-            return ast.EdgeRefTrailer(
+            return uni.EdgeRefTrailer(
                 chain=valid_chain,
                 edges_only=edges_only,
                 kid=self.cur_nodes,
             )
 
-        def edge_op_ref(self, kid: list[ast.AstNode]) -> ast.EdgeOpRef:
+        def edge_op_ref(self, kid: list[uni.UniNode]) -> uni.EdgeOpRef:
             """Grammar rule.
 
             edge_op_ref: (edge_any | edge_from | edge_to)
             """
-            return self.consume(ast.EdgeOpRef)
+            return self.consume(uni.EdgeOpRef)
 
-        def edge_to(self, _: None) -> ast.EdgeOpRef:
+        def edge_to(self, _: None) -> uni.EdgeOpRef:
             """Grammar rule.
 
-            edge_to: ARROW_R_P1 typed_filter_compare_list ARROW_R_P2
-                   | ARROW_R
+            edge_to: ARROW_R | ARROW_R_P1 typed_filter_compare_list ARROW_R_P2
             """
             if self.match_token(Tok.ARROW_R):
                 fcond = None
             else:
                 self.consume_token(Tok.ARROW_R_P1)
-                fcond = self.consume(ast.FilterCompr)
+                fcond = self.consume(uni.FilterCompr)
                 self.consume_token(Tok.ARROW_R_P2)
-            return ast.EdgeOpRef(
+            return uni.EdgeOpRef(
                 filter_cond=fcond, edge_dir=EdgeDir.OUT, kid=self.cur_nodes
             )
 
-        def edge_from(self, _: None) -> ast.EdgeOpRef:
+        def edge_from(self, _: None) -> uni.EdgeOpRef:
             """Grammar rule.
 
-            edge_from: ARROW_L_P1 typed_filter_compare_list ARROW_L_P2
-                     | ARROW_L
+            edge_from: ARROW_L | ARROW_L_P1 typed_filter_compare_list ARROW_L_P2
             """
             if self.match_token(Tok.ARROW_L):
                 fcond = None
             else:
                 self.consume_token(Tok.ARROW_L_P1)
-                fcond = self.consume(ast.FilterCompr)
+                fcond = self.consume(uni.FilterCompr)
                 self.consume_token(Tok.ARROW_L_P2)
-            return ast.EdgeOpRef(
+            return uni.EdgeOpRef(
                 filter_cond=fcond, edge_dir=EdgeDir.IN, kid=self.cur_nodes
             )
 
-        def edge_any(self, _: None) -> ast.EdgeOpRef:
+        def edge_any(self, _: None) -> uni.EdgeOpRef:
             """Grammar rule.
 
             edge_any: ARROW_L_P1 typed_filter_compare_list ARROW_R_P2
@@ -2766,128 +2378,129 @@ class JacParser(Pass):
                 fcond = None
             else:
                 self.consume_token(Tok.ARROW_L_P1)
-                fcond = self.consume(ast.FilterCompr)
+                fcond = self.consume(uni.FilterCompr)
                 self.consume_token(Tok.ARROW_R_P2)
-            return ast.EdgeOpRef(
+            return uni.EdgeOpRef(
                 filter_cond=fcond, edge_dir=EdgeDir.ANY, kid=self.cur_nodes
             )
 
-        def connect_op(self, _: None) -> ast.ConnectOp:
+        def connect_op(self, _: None) -> uni.ConnectOp:
             """Grammar rule.
 
             connect_op: connect_from | connect_to | connect_any
             """
-            return self.consume(ast.ConnectOp)
+            return self.consume(uni.ConnectOp)
 
-        def disconnect_op(self, kid: list[ast.AstNode]) -> ast.DisconnectOp:
+        def disconnect_op(self, kid: list[uni.UniNode]) -> uni.DisconnectOp:
             """Grammar rule.
 
-            disconnect_op: NOT edge_op_ref
+            disconnect_op: KW_DELETE edge_op_ref
             """
-            if isinstance(kid[1], ast.EdgeOpRef):
-                return ast.DisconnectOp(
+            if isinstance(kid[1], uni.EdgeOpRef):
+                return uni.DisconnectOp(
                     edge_spec=kid[1],
                     kid=kid,
                 )
             else:
                 raise self.ice()
 
-        def connect_to(self, _: None) -> ast.ConnectOp:
+        def connect_to(self, _: None) -> uni.ConnectOp:
             """Grammar rule.
 
-            connect_to: CARROW_R_P1 expression (COLON kw_expr_list)? CARROW_R_P2
-                      | CARROW_R
+            connect_to: CARROW_R | CARROW_R_P1 expression (COLON kw_expr_list)? CARROW_R_P2
             """
-            conn_type: ast.Expr | None = None
-            conn_assign_sub: ast.SubNodeList | None = None
+            conn_type: uni.Expr | None = None
+            conn_assign_sub: list[uni.UniNode] | None = None
             if self.match_token(Tok.CARROW_R_P1):
-                conn_type = self.consume(ast.Expr)
+                conn_type = self.consume(uni.Expr)
                 conn_assign_sub = (
-                    self.consume(ast.SubNodeList)
-                    if self.match_token(Tok.COLON)
-                    else None
+                    self.consume(list) if self.match_token(Tok.COLON) else None
                 )
                 self.consume_token(Tok.CARROW_R_P2)
             else:
                 self.consume_token(Tok.CARROW_R)
             conn_assign = (
-                ast.AssignCompr(assigns=conn_assign_sub, kid=[conn_assign_sub])
+                uni.AssignCompr(
+                    assigns=self.extract_from_list(conn_assign_sub, uni.KWPair),
+                    kid=conn_assign_sub,
+                )
                 if conn_assign_sub
                 else None
             )
             if conn_assign:
                 self.cur_nodes[3] = conn_assign
-            return ast.ConnectOp(
+            return uni.ConnectOp(
                 conn_type=conn_type,
                 conn_assign=conn_assign,
                 edge_dir=EdgeDir.OUT,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def connect_from(self, _: None) -> ast.ConnectOp:
+        def connect_from(self, _: None) -> uni.ConnectOp:
             """Grammar rule.
 
-            connect_from: CARROW_L_P1 expression (COLON kw_expr_list)? CARROW_L_P2
-                        | CARROW_L
+            connect_from: CARROW_L | CARROW_L_P1 expression (COLON kw_expr_list)? CARROW_L_P2
             """
-            conn_type: ast.Expr | None = None
-            conn_assign_sub: ast.SubNodeList | None = None
+            conn_type: uni.Expr | None = None
+            conn_assign_sub: list[uni.UniNode] | None = None
             if self.match_token(Tok.CARROW_L_P1):
-                conn_type = self.consume(ast.Expr)
+                conn_type = self.consume(uni.Expr)
                 conn_assign_sub = (
-                    self.consume(ast.SubNodeList)
-                    if self.match_token(Tok.COLON)
-                    else None
+                    self.consume(list) if self.match_token(Tok.COLON) else None
                 )
                 self.consume_token(Tok.CARROW_L_P2)
             else:
                 self.consume_token(Tok.CARROW_L)
             conn_assign = (
-                ast.AssignCompr(assigns=conn_assign_sub, kid=[conn_assign_sub])
+                uni.AssignCompr(
+                    assigns=self.extract_from_list(conn_assign_sub, uni.KWPair),
+                    kid=conn_assign_sub,
+                )
                 if conn_assign_sub
                 else None
             )
             if conn_assign:
                 self.cur_nodes[3] = conn_assign
-            return ast.ConnectOp(
+            return uni.ConnectOp(
                 conn_type=conn_type,
                 conn_assign=conn_assign,
                 edge_dir=EdgeDir.IN,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def connect_any(self, _: None) -> ast.ConnectOp:
+        def connect_any(self, _: None) -> uni.ConnectOp:
             """Grammar rule.
 
             connect_any: CARROW_BI | CARROW_L_P1 expression (COLON kw_expr_list)? CARROW_R_P2
             """
-            conn_type: ast.Expr | None = None
-            conn_assign_sub: ast.SubNodeList | None = None
+            conn_type: uni.Expr | None = None
+            conn_assign_sub: list[uni.UniNode] | None = None
             if self.match_token(Tok.CARROW_L_P1):
-                conn_type = self.consume(ast.Expr)
+                conn_type = self.consume(uni.Expr)
                 conn_assign_sub = (
-                    self.consume(ast.SubNodeList)
-                    if self.match_token(Tok.COLON)
-                    else None
+                    self.consume(list) if self.match_token(Tok.COLON) else None
                 )
                 self.consume_token(Tok.CARROW_R_P2)
             else:
                 self.consume_token(Tok.CARROW_BI)
             conn_assign = (
-                ast.AssignCompr(assigns=conn_assign_sub, kid=[conn_assign_sub])
+                uni.AssignCompr(
+                    assigns=self.extract_from_list(conn_assign_sub, uni.KWPair),
+                    kid=conn_assign_sub,
+                )
                 if conn_assign_sub
                 else None
             )
             if conn_assign:
                 self.cur_nodes[3] = conn_assign
-            return ast.ConnectOp(
+            return uni.ConnectOp(
                 conn_type=conn_type,
                 conn_assign=conn_assign,
                 edge_dir=EdgeDir.ANY,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def filter_compr(self, _: None) -> ast.FilterCompr:
+        def filter_compr(self, _: None) -> uni.FilterCompr:
             """Grammar rule.
 
             filter_compr: LPAREN NULL_OK filter_compare_list RPAREN
@@ -2897,149 +2510,141 @@ class JacParser(Pass):
             self.consume_token(Tok.LPAREN)
             if self.match_token(Tok.TYPE_OP):
                 self.consume_token(Tok.NULL_OK)
-                f_type = self.consume(ast.FilterCompr)
+                f_type = self.consume(uni.FilterCompr)
                 f_type.add_kids_left(kid[:3])
                 f_type.add_kids_right(kid[4:])
                 self.consume_token(Tok.RPAREN)
                 return f_type
             self.consume_token(Tok.NULL_OK)
-            compares = self.consume(ast.SubNodeList)
+            compares_list = self.consume(list)
             self.consume_token(Tok.RPAREN)
-            return ast.FilterCompr(
-                compares=compares,
+            return uni.FilterCompr(
+                compares=self.extract_from_list(compares_list, uni.CompareExpr),
                 f_type=None,
-                kid=self.cur_nodes,
+                kid=self.flat_cur_nodes,
             )
 
-        def filter_compare_list(self, _: None) -> ast.SubNodeList[ast.CompareExpr]:
+        def filter_compare_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             filter_compare_list: (filter_compare_list COMMA)? filter_compare_item
             """
-            if consume := self.match(ast.SubNodeList):
-                comma = self.consume_token(Tok.COMMA)
-                expr = self.consume(ast.CompareExpr)
-                new_kid = [*consume.kid, comma, expr]
-            else:
-                expr = self.consume(ast.CompareExpr)
-                new_kid = [expr]
-            valid_kid = [i for i in new_kid if isinstance(i, ast.CompareExpr)]
-            return ast.SubNodeList[ast.CompareExpr](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=new_kid,
-            )
+            return self.flat_cur_nodes
 
-        def typed_filter_compare_list(self, _: None) -> ast.FilterCompr:
+        def typed_filter_compare_list(self, _: None) -> uni.FilterCompr:
             """Grammar rule.
 
             typed_filter_compare_list: expression (COLON filter_compare_list)?
             """
-            compares: ast.SubNodeList | None = None
-            expr = self.consume(ast.Expr)
+            compares_list: list[uni.UniNode] | None = None
+            expr = self.consume(uni.Expr)
             if self.match_token(Tok.COLON):
-                compares = self.consume(ast.SubNodeList)
-            return ast.FilterCompr(compares=compares, f_type=expr, kid=self.cur_nodes)
+                compares_list = self.consume(list)
+            return uni.FilterCompr(
+                compares=self.extract_from_list(compares_list or [], uni.CompareExpr),
+                f_type=expr,
+                kid=self.flat_cur_nodes,
+            )
 
-        def filter_compare_item(self, _: None) -> ast.CompareExpr:
+        def filter_compare_item(self, _: None) -> uni.CompareExpr:
             """Grammar rule.
 
             filter_compare_item: name_ref cmp_op expression
             """
-            name_ref = self.consume(ast.Name)
-            cmp_op = self.consume(ast.Token)
-            expr = self.consume(ast.Expr)
-            return ast.CompareExpr(
+            name_ref = self.consume(uni.Name)
+            cmp_op = self.consume(uni.Token)
+            expr = self.consume(uni.Expr)
+            return uni.CompareExpr(
                 left=name_ref, ops=[cmp_op], rights=[expr], kid=self.cur_nodes
             )
 
-        def assign_compr(self, _: None) -> ast.AssignCompr:
+        def assign_compr(self, _: None) -> uni.AssignCompr:
             """Grammar rule.
 
             filter_compr: LPAREN EQ kw_expr_list RPAREN
             """
             self.consume_token(Tok.LPAREN)
             self.consume_token(Tok.EQ)
-            assigns = self.consume(ast.SubNodeList)
+            assigns_sn = self.extract_from_list(self.consume(list), uni.KWPair)
             self.consume_token(Tok.RPAREN)
-            return ast.AssignCompr(assigns=assigns, kid=self.cur_nodes)
+            return uni.AssignCompr(assigns=assigns_sn, kid=self.flat_cur_nodes)
 
-        def match_stmt(self, _: None) -> ast.MatchStmt:
+        def match_stmt(self, _: None) -> uni.MatchStmt:
             """Grammar rule.
 
-            match_stmt: KW_MATCH expr_list LBRACE match_case_block+ RBRACE
+            match_stmt: KW_MATCH expression LBRACE match_case_block+ RBRACE
             """
             self.consume_token(Tok.KW_MATCH)
-            target = self.consume(ast.Expr)
+            target = self.consume(uni.Expr)
             self.consume_token(Tok.LBRACE)
-            cases = [self.consume(ast.MatchCase)]
-            while case := self.match(ast.MatchCase):
+            cases = [self.consume(uni.MatchCase)]
+            while case := self.match(uni.MatchCase):
                 cases.append(case)
             self.consume_token(Tok.RBRACE)
-            return ast.MatchStmt(
+            return uni.MatchStmt(
                 target=target,
                 cases=cases,
                 kid=self.cur_nodes,
             )
 
-        def match_case_block(self, _: None) -> ast.MatchCase:
+        def match_case_block(self, _: None) -> uni.MatchCase:
             """Grammar rule.
 
-            match_case_block: KW_CASE pattern_seq (KW_IF expression)? COLON statement_list
+            match_case_block: KW_CASE pattern_seq (KW_IF expression)? COLON statement+
             """
-            guard: ast.Expr | None = None
+            guard: uni.Expr | None = None
             self.consume_token(Tok.KW_CASE)
-            pattern = self.consume(ast.MatchPattern)
+            pattern = self.consume(uni.MatchPattern)
             if self.match_token(Tok.KW_IF):
-                guard = self.consume(ast.Expr)
+                guard = self.consume(uni.Expr)
             self.consume_token(Tok.COLON)
-            stmts = [self.consume(ast.CodeBlockStmt)]
-            while stmt := self.match(ast.CodeBlockStmt):
+            stmts = [self.consume(uni.CodeBlockStmt)]
+            while stmt := self.match(uni.CodeBlockStmt):
                 stmts.append(stmt)
-            return ast.MatchCase(
+            return uni.MatchCase(
                 pattern=pattern,
                 guard=guard,
                 body=stmts,
                 kid=self.cur_nodes,
             )
 
-        def pattern_seq(self, _: None) -> ast.MatchPattern:
+        def pattern_seq(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
             pattern_seq: (or_pattern | as_pattern)
             """
-            return self.consume(ast.MatchPattern)
+            return self.consume(uni.MatchPattern)
 
-        def or_pattern(self, _: None) -> ast.MatchPattern:
+        def or_pattern(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
             or_pattern: (pattern BW_OR)* pattern
             """
-            patterns: list = [self.consume(ast.MatchPattern)]
+            patterns: list = [self.consume(uni.MatchPattern)]
             while self.match_token(Tok.BW_OR):
-                patterns.append(self.consume(ast.MatchPattern))
+                patterns.append(self.consume(uni.MatchPattern))
             if len(patterns) == 1:
                 return patterns[0]
-            return ast.MatchOr(
+            return uni.MatchOr(
                 patterns=patterns,
                 kid=self.cur_nodes,
             )
 
-        def as_pattern(self, _: None) -> ast.MatchPattern:
+        def as_pattern(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
-            as_pattern: pattern KW_AS NAME
+            as_pattern: or_pattern KW_AS NAME
             """
-            pattern = self.consume(ast.MatchPattern)
+            pattern = self.consume(uni.MatchPattern)
             self.consume_token(Tok.KW_AS)
-            name = self.consume(ast.NameAtom)
-            return ast.MatchAs(
+            name = self.consume(uni.NameAtom)
+            return uni.MatchAs(
                 pattern=pattern,
                 name=name,
                 kid=self.cur_nodes,
             )
 
-        def pattern(self, kid: list[ast.AstNode]) -> ast.MatchPattern:
+        def pattern(self, kid: list[uni.UniNode]) -> uni.MatchPattern:
             """Grammar rule.
 
             pattern: literal_pattern
@@ -3048,122 +2653,125 @@ class JacParser(Pass):
                 | mapping_pattern
                 | class_pattern
             """
-            return self.consume(ast.MatchPattern)
+            return self.consume(uni.MatchPattern)
 
-        def literal_pattern(self, _: None) -> ast.MatchPattern:
+        def literal_pattern(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
             literal_pattern: (INT | FLOAT | multistring)
             """
-            value = self.consume(ast.Expr)
-            return ast.MatchValue(
+            value = self.consume(uni.Expr)
+            return uni.MatchValue(
                 value=value,
                 kid=self.cur_nodes,
             )
 
-        def singleton_pattern(self, _: None) -> ast.MatchPattern:
+        def singleton_pattern(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
             singleton_pattern: (NULL | BOOL)
             """
-            value = self.match(ast.Null) or self.consume(ast.Bool)
-            return ast.MatchSingleton(
+            value = self.match(uni.Null) or self.consume(uni.Bool)
+            return uni.MatchSingleton(
                 value=value,
                 kid=self.cur_nodes,
             )
 
-        def capture_pattern(self, _: None) -> ast.MatchPattern:
+        def capture_pattern(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
             capture_pattern: NAME
             """
-            name = self.consume(ast.Name)
+            name = self.consume(uni.Name)
             if name.sym_name == "_":
-                return ast.MatchWild(
+                return uni.MatchWild(
                     kid=self.cur_nodes,
                 )
-            return ast.MatchAs(
+            return uni.MatchAs(
                 name=name,
                 pattern=None,
                 kid=self.cur_nodes,
             )
 
-        def sequence_pattern(self, _: None) -> ast.MatchPattern:
+        def sequence_pattern(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
             sequence_pattern: LSQUARE list_inner_pattern (COMMA list_inner_pattern)* RSQUARE
                             | LPAREN list_inner_pattern (COMMA list_inner_pattern)* RPAREN
             """
             self.consume_token(Tok.LSQUARE) or self.consume_token(Tok.LPAREN)
-            patterns = [self.consume(ast.MatchPattern)]
+            patterns = [self.consume(uni.MatchPattern)]
             while self.match_token(Tok.COMMA):
-                patterns.append(self.consume(ast.MatchPattern))
+                patterns.append(self.consume(uni.MatchPattern))
             self.consume_token(Tok.RSQUARE) or self.consume_token(Tok.RPAREN)
-            return ast.MatchSequence(
+            return uni.MatchSequence(
                 values=patterns,
                 kid=self.cur_nodes,
             )
 
-        def mapping_pattern(self, _: None) -> ast.MatchMapping:
+        def mapping_pattern(self, _: None) -> uni.MatchMapping:
             """Grammar rule.
 
             mapping_pattern: LBRACE (dict_inner_pattern (COMMA dict_inner_pattern)*)? RBRACE
             """
             self.consume_token(Tok.LBRACE)
-            patterns = [self.match(ast.MatchKVPair) or self.consume(ast.MatchStar)]
+            patterns = [self.match(uni.MatchKVPair) or self.consume(uni.MatchStar)]
             while self.match_token(Tok.COMMA):
                 patterns.append(
-                    self.match(ast.MatchKVPair) or self.consume(ast.MatchStar)
+                    self.match(uni.MatchKVPair) or self.consume(uni.MatchStar)
                 )
             self.consume_token(Tok.RBRACE)
-            return ast.MatchMapping(
+            return uni.MatchMapping(
                 values=patterns,
                 kid=self.cur_nodes,
             )
 
-        def list_inner_pattern(self, _: None) -> ast.MatchPattern:
+        def list_inner_pattern(self, _: None) -> uni.MatchPattern:
             """Grammar rule.
 
             list_inner_pattern: (pattern_seq | STAR_MUL NAME)
             """
             if self.match_token(Tok.STAR_MUL):
-                name = self.consume(ast.Name)
-                return ast.MatchStar(
+                name = self.consume(uni.Name)
+                return uni.MatchStar(
                     is_list=True,
                     name=name,
                     kid=self.cur_nodes,
                 )
-            return self.consume(ast.MatchPattern)
+            return self.consume(uni.MatchPattern)
 
-        def dict_inner_pattern(self, _: None) -> ast.MatchKVPair | ast.MatchStar:
+        def dict_inner_pattern(self, _: None) -> uni.MatchKVPair | uni.MatchStar:
             """Grammar rule.
 
-            dict_inner_pattern: (pattern_seq COLON pattern_seq | STAR_POW NAME)
+            dict_inner_pattern: (literal_pattern COLON pattern_seq | STAR_POW NAME)
             """
             if self.match_token(Tok.STAR_POW):
-                name = self.consume(ast.Name)
-                return ast.MatchStar(
+                name = self.consume(uni.Name)
+                return uni.MatchStar(
                     is_list=False,
                     name=name,
                     kid=self.cur_nodes,
                 )
-            pattern = self.consume(ast.MatchPattern)
+            pattern = self.consume(uni.MatchPattern)
             self.consume_token(Tok.COLON)
-            value = self.consume(ast.MatchPattern)
-            return ast.MatchKVPair(key=pattern, value=value, kid=self.cur_nodes)
+            value = self.consume(uni.MatchPattern)
+            return uni.MatchKVPair(key=pattern, value=value, kid=self.cur_nodes)
 
-        def class_pattern(self, _: None) -> ast.MatchArch:
+        def class_pattern(self, _: None) -> uni.MatchArch:
             """Grammar rule.
 
             class_pattern: NAME (DOT NAME)* LPAREN kw_pattern_list? RPAREN
                         | NAME (DOT NAME)* LPAREN pattern_list (COMMA kw_pattern_list)? RPAREN
             """
-            cur_element = self.consume(ast.NameAtom)
-            trailer: ast.AtomTrailer | None = None
+            name_idx = 0
+            cur_element = self.consume(uni.NameAtom)
+            name_idx += 1
+            trailer: uni.AtomTrailer | None = None
             while dot := self.match_token(Tok.DOT):
                 target = trailer if trailer else cur_element
-                right = self.consume(ast.Expr)
-                trailer = ast.AtomTrailer(
+                right = self.consume(uni.NameAtom)
+                name_idx += 2
+                trailer = uni.AtomTrailer(
                     target=target,
                     right=right,
                     is_attr=True,
@@ -3171,92 +2779,65 @@ class JacParser(Pass):
                     kid=[target, dot, right],
                 )
             name = trailer if trailer else cur_element
-            if not isinstance(name, (ast.NameAtom, ast.AtomTrailer)):
+            if not isinstance(name, (uni.NameAtom, uni.AtomTrailer)):
                 raise TypeError(
                     f"Expected name to be either NameAtom or AtomTrailer, got {type(name)}"
                 )
-            lparen = self.consume_token(Tok.LPAREN)
-            first = self.match(ast.SubNodeList)
-            second = (
-                self.consume(ast.SubNodeList)
-                if (comma := self.match_token(Tok.COMMA))
-                else None
-            )
-            rparen = self.consume_token(Tok.RPAREN)
-            arg = (
-                first
-                if (first and isinstance(first.items[0], ast.MatchPattern))
-                else None
-            )
-            kw = (
-                second
-                if (second and isinstance(second.items[0], ast.MatchKVPair))
-                else (
-                    first
-                    if (first and isinstance(first.items[0], ast.MatchKVPair))
-                    else None
-                )
-            )
-            kid_nodes: list = [name, lparen]
-            if arg:
-                kid_nodes.append(arg)
-                if kw:
-                    kid_nodes.extend([comma, kw]) if comma else kid_nodes.append(kw)
-            elif kw:
-                kid_nodes.append(kw)
-            kid_nodes.append(rparen)
-            return ast.MatchArch(
+            self.consume_token(Tok.LPAREN)
+            first = self.match(list)
+            second: list[uni.UniNode] | None = None
+            has_kw = bool(first and any(isinstance(i, uni.MatchKVPair) for i in first))
+            if first and not has_kw and self.match_token(Tok.COMMA):
+                second = self.consume(list)
+            self.consume_token(Tok.RPAREN)
+            if has_kw:
+                arg = None
+                kw_list = first
+            else:
+                arg = first
+                kw_list = second
+            return uni.MatchArch(
                 name=name,
-                arg_patterns=arg,
-                kw_patterns=kw,
-                kid=kid_nodes,
+                arg_patterns=(
+                    self.extract_from_list(arg, uni.MatchPattern) if arg else None
+                ),
+                kw_patterns=(
+                    self.extract_from_list(kw_list, uni.MatchKVPair)
+                    if kw_list
+                    else None
+                ),
+                kid=[name, *self.flat_cur_nodes[name_idx:]],
             )
 
-        def pattern_list(self, _: None) -> ast.SubNodeList[ast.MatchPattern]:
+        def pattern_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             pattern_list: (pattern_list COMMA)? pattern_seq
             """
-            if consume := self.match(ast.SubNodeList):
-                comma = self.consume_token(Tok.COMMA)
-                pattern = self.consume(ast.MatchPattern)
-            else:
-                pattern = self.consume(ast.MatchPattern)
-            new_kid = [*consume.kid, comma, pattern] if consume else [pattern]
-            valid_kid = [i for i in new_kid if isinstance(i, ast.MatchPattern)]
-            return ast.SubNodeList[ast.MatchPattern](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=new_kid,
-            )
+            return self.flat_cur_nodes
 
-        def kw_pattern_list(self, _: None) -> ast.SubNodeList[ast.MatchKVPair]:
+        def kw_pattern_list(self, _: None) -> list[uni.UniNode]:
             """Grammar rule.
 
             kw_pattern_list: (kw_pattern_list COMMA)? named_ref EQ pattern_seq
             """
-            new_kid: list = []
-            if consume := self.match(ast.SubNodeList):
+            new_kid: list[uni.UniNode] = []
+            if consume := self.match(list):
                 comma = self.consume_token(Tok.COMMA)
-                new_kid.extend([*consume.kid, comma])
-            name = self.consume(ast.NameAtom)
+                new_kid.extend([*consume, comma])
+            name = self.consume(uni.NameAtom)
             eq = self.consume_token(Tok.EQ)
-            value = self.consume(ast.MatchPattern)
-            new_kid.extend(
-                [ast.MatchKVPair(key=name, value=value, kid=[name, eq, value])]
-            )
-            valid_kid = [i for i in new_kid if isinstance(i, ast.MatchKVPair)]
-            return ast.SubNodeList[ast.MatchKVPair](
-                items=valid_kid,
-                delim=Tok.COMMA,
-                kid=new_kid,
+            value = self.consume(uni.MatchPattern)
+            new_kid.append(
+                uni.MatchKVPair(key=name, value=value, kid=[name, eq, value])
             )
+            return new_kid
 
-        def __default_token__(self, token: jl.Token) -> ast.Token:
+        def __default_token__(self, token: jl.Token) -> uni.Token:
             """Token handler."""
-            ret_type = ast.Token
+            ret_type = uni.Token
             if token.type in [Tok.NAME, Tok.KWESC_NAME]:
-                ret_type = ast.Name
+                ret_type = uni.Name
             if token.type in [
                 Tok.KW_INIT,
                 Tok.KW_POST_INIT,
@@ -3264,33 +2845,34 @@ class JacParser(Pass):
                 Tok.KW_SUPER,
                 Tok.KW_SELF,
                 Tok.KW_HERE,
+                Tok.KW_VISITOR,
             ]:
-                ret_type = ast.Name
+                ret_type = uni.Name
             elif token.type == Tok.SEMI:
-                ret_type = ast.Semi
+                ret_type = uni.Semi
             elif token.type == Tok.NULL:
-                ret_type = ast.Null
+                ret_type = uni.Null
             elif token.type == Tok.ELLIPSIS:
-                ret_type = ast.Ellipsis
+                ret_type = uni.Ellipsis
             elif token.type == Tok.FLOAT:
-                ret_type = ast.Float
+                ret_type = uni.Float
             elif token.type in [Tok.INT, Tok.INT, Tok.HEX, Tok.BIN, Tok.OCT]:
-                ret_type = ast.Int
+                ret_type = uni.Int
             elif token.type in [
                 Tok.STRING,
                 Tok.FSTR_BESC,
                 Tok.FSTR_PIECE,
                 Tok.FSTR_SQ_PIECE,
             ]:
-                ret_type = ast.String
+                ret_type = uni.String
                 if token.type == Tok.FSTR_BESC:
                     token.value = token.value[1:]
             elif token.type == Tok.BOOL:
-                ret_type = ast.Bool
+                ret_type = uni.Bool
             elif token.type == Tok.PYNLINE and isinstance(token.value, str):
                 token.value = token.value.replace("::py::", "")
             ret = ret_type(
-                orig_src=self.parse_ref.source,
+                orig_src=self.parse_ref.ir_in,
                 name=token.type,
                 value=token.value[2:] if token.type == Tok.KWESC_NAME else token.value,
                 line=token.line if token.line is not None else 0,
@@ -3300,7 +2882,7 @@ class JacParser(Pass):
                 pos_start=token.start_pos if token.start_pos is not None else 0,
                 pos_end=token.end_pos if token.end_pos is not None else 0,
             )
-            if isinstance(ret, ast.Name):
+            if isinstance(ret, uni.Name):
                 if token.type == Tok.KWESC_NAME:
                     ret.is_kwesc = True
                 if ret.value in keyword.kwlist:
@@ -3310,3 +2892,41 @@ class JacParser(Pass):
                     raise err
             self.terminals.append(ret)
             return ret
+
+        def event_clause(self, _: None) -> uni.EventSignature:
+            """Grammar rule.
+
+            event_clause: KW_WITH expression? (KW_EXIT | KW_ENTRY) (RETURN_HINT expression)?
+            """
+            return_spec: uni.Expr | None = None
+            self.consume_token(Tok.KW_WITH)
+            type_specs = self.match(uni.Expr)
+            event = self.match_token(Tok.KW_EXIT) or self.consume_token(Tok.KW_ENTRY)
+            if self.match_token(Tok.RETURN_HINT):
+                return_spec = self.consume(uni.Expr)
+            return uni.EventSignature(
+                event=event,
+                arch_tag_info=type_specs,
+                return_type=return_spec,
+                kid=self.cur_nodes,
+            )
+
+        def block_tail(self, _: None) -> list[uni.CodeBlockStmt] | uni.FuncCall:
+            """Grammar rule.
+
+            block_tail: code_block | KW_BY atomic_call SEMI | KW_ABSTRACT? SEMI
+            """
+            # Try to match code_block first
+            if code_block := self.match(list):
+                return code_block
+
+            # Otherwise, it must be KW_BY atomic_call SEMI
+            by_token = self.consume_token(Tok.KW_BY)
+            func_call = self.consume(uni.FuncCall)
+            semi_token = self.consume_token(Tok.SEMI)
+
+            # Add the tokens to the function call's kid array
+            func_call.add_kids_left([by_token])
+            func_call.add_kids_right([semi_token])
+
+            return func_call