jaclang 0.5.8__py3-none-any.whl → 0.5.9__py3-none-any.whl

jaclang/compiler/absyntree.py

@@ -17,6 +17,7 @@ from jaclang.compiler.symtable import (
     SymbolTable,
     SymbolType,
 )
+from jaclang.core.registry import SemRegistry
 from jaclang.utils.treeprinter import dotgen_ast_tree, print_ast_tree
 
 
@@ -109,6 +110,12 @@ class AstNode:
 
         return Pass.get_all_sub_nodes(node=self, typ=typ, brute_force=brute_force)
 
+    def has_parent_of_type(self, typ: Type[T]) -> Optional[T]:
+        """Get parent of type."""
+        from jaclang.compiler.passes import Pass
+
+        return Pass.has_parent_of_type(node=self, typ=typ)
+
     def format(self) -> str:
         """Get all sub nodes of type."""
         from jaclang.compiler.passes.tool import JacFormatPass
@@ -320,7 +327,7 @@ class SubTag(AstNode, Generic[T]):
     def normalize(self, deep: bool = False) -> bool:
         """Normalize sub tag node."""
         res = self.tag.normalize() if deep else True
-        AstNode.__init__(self, kid=[self.gen_token(Tok.COLON), self.tag])
+        AstNode.set_kids(self, nodes=[self.gen_token(Tok.COLON), self.tag])
         return res
 
 
@@ -363,7 +370,7 @@ class SubNodeList(AstNode, Generic[T]):
             new_kid.pop()
         if self.right_enc:
             new_kid.append(self.right_enc)
-        AstNode.__init__(self, kid=new_kid if len(new_kid) else [EmptyToken()])
+        AstNode.set_kids(self, nodes=new_kid if len(new_kid) else [EmptyToken()])
         return res
 
 
@@ -382,6 +389,7 @@ class Module(AstDocNode):
         kid: Sequence[AstNode],
         impl_mod: Optional[Module] = None,
         test_mod: Optional[Module] = None,
+        registry: Optional[SemRegistry] = None,
     ) -> None:
         """Initialize whole program node."""
         self.name = name
@@ -391,6 +399,7 @@ class Module(AstDocNode):
         self.impl_mod = impl_mod
         self.test_mod = test_mod
         self.mod_deps: dict[str, Module] = {}
+        self.registry = registry
         AstNode.__init__(self, kid=kid)
         AstDocNode.__init__(self, doc=doc)
 
@@ -405,7 +414,7 @@ class Module(AstDocNode):
         if self.doc:
             new_kid.append(self.doc)
         new_kid.extend(self.body)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     def unparse(self) -> str:
@@ -440,17 +449,16 @@ class GlobalVars(ElementStmt, AstAccessNode):
             res = res and self.assignments.normalize(deep)
             res = res and self.doc.normalize(deep) if self.doc else res
         new_kid: list[AstNode] = []
+        if self.doc:
+            new_kid.append(self.doc)
         if self.is_frozen:
             new_kid.append(self.gen_token(Tok.KW_LET))
         else:
             new_kid.append(self.gen_token(Tok.KW_GLOBAL))
-        if self.doc:
-            new_kid.append(self.doc)
         if self.access:
             new_kid.append(self.access)
         new_kid.append(self.assignments)
-        new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -508,10 +516,8 @@ class Test(AstSymbolNode, ElementStmt):
             new_kid.append(self.doc)
         new_kid.append(self.gen_token(Tok.KW_TEST))
         new_kid.append(self.name)
-
         new_kid.append(self.body)
-
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -545,10 +551,8 @@ class ModuleCode(ElementStmt, ArchBlockStmt, EnumBlockStmt):
         new_kid.append(self.gen_token(Tok.KW_ENTRY))
         if self.name:
             new_kid.append(self.name)
-
         new_kid.append(self.body)
-
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -578,7 +582,7 @@ class PyInlineCode(ElementStmt, ArchBlockStmt, EnumBlockStmt, CodeBlockStmt):
         new_kid.append(self.gen_token(Tok.PYNLINE))
         new_kid.append(self.code)
         new_kid.append(self.gen_token(Tok.PYNLINE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -629,7 +633,7 @@ class Import(ElementStmt, CodeBlockStmt):
             new_kid.append(self.gen_token(Tok.COMMA))
             new_kid.append(self.items)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -667,8 +671,8 @@ class ModulePath(AstSymbolNode):
                     res = res and p.normalize(deep)
             res = res and self.alias.normalize(deep) if self.alias else res
         new_kid: list[AstNode] = []
-        for _ in range(self.level):
-            new_kid.append(self.gen_token(Tok.DOT))
+        # for _ in range(self.level):
+        #     new_kid.append(self.gen_token(Tok.DOT))
         if self.path:
             for p in self.path:
                 res = res and p.normalize(deep)
@@ -678,7 +682,7 @@ class ModulePath(AstSymbolNode):
         if self.alias:
             res = res and self.alias.normalize(deep)
             new_kid.append(self.alias)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     @property
@@ -719,7 +723,7 @@ class ModuleItem(AstSymbolNode):
         if self.alias:
             new_kid.append(self.gen_token(Tok.KW_AS))
             new_kid.append(self.alias)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -798,9 +802,14 @@ class Architype(ArchSpec, AstAccessNode, ArchBlockStmt, AstImplNeedingNode):
         new_kid: list[AstNode] = []
         if self.doc:
             new_kid.append(self.doc)
+        if self.decorators:
+            new_kid.append(self.gen_token(Tok.DECOR_OP))
+            new_kid.append(self.decorators)
         new_kid.append(self.arch_type)
         if self.access:
             new_kid.append(self.access)
+        if self.semstr:
+            new_kid.append(self.semstr)
         new_kid.append(self.name)
         if self.base_classes:
             new_kid.append(self.gen_token(Tok.COLON))
@@ -808,12 +817,12 @@ class Architype(ArchSpec, AstAccessNode, ArchBlockStmt, AstImplNeedingNode):
             new_kid.append(self.gen_token(Tok.COLON))
         if self.body:
             if isinstance(self.body, AstImplOnlyNode):
-                new_kid.append(self.body.body)
+                new_kid.append(self.gen_token(Tok.SEMI))
             else:
                 new_kid.append(self.body)
         else:
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -854,14 +863,12 @@ class ArchDef(ArchSpec, AstImplOnlyNode):
         if self.doc:
             new_kid.append(self.doc)
         new_kid.append(self.target)
-
         new_kid.append(self.body)
-
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
-class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode):
+class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode, ArchBlockStmt):
     """Enum node type for Jac Ast."""
 
     def __init__(
@@ -910,6 +917,8 @@ class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode):
         new_kid.append(self.gen_token(Tok.KW_ENUM))
         if self.access:
             new_kid.append(self.access)
+        if self.semstr:
+            new_kid.append(self.semstr)
         new_kid.append(self.name)
         if self.base_classes:
             new_kid.append(self.gen_token(Tok.COLON))
@@ -917,12 +926,14 @@ class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode):
             new_kid.append(self.gen_token(Tok.COLON))
         if self.body:
             if isinstance(self.body, AstImplOnlyNode):
-                new_kid.append(self.body.body)
+                new_kid.append(self.gen_token(Tok.SEMI))
             else:
+                new_kid.append(self.gen_token(Tok.LBRACE))
                 new_kid.append(self.body)
+                new_kid.append(self.gen_token(Tok.RBRACE))
         else:
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -963,10 +974,10 @@ class EnumDef(ArchSpec, AstImplOnlyNode):
         if self.doc:
             new_kid.append(self.doc)
         new_kid.append(self.target)
-
+        new_kid.append(self.gen_token(Tok.LBRACE))
         new_kid.append(self.body)
-
-        AstNode.__init__(self, kid=new_kid)
+        new_kid.append(self.gen_token(Tok.RBRACE))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1059,6 +1070,10 @@ class Ability(
         new_kid: list[AstNode] = []
         if self.doc:
             new_kid.append(self.doc)
+        if self.decorators:
+            new_kid.append(self.gen_token(Tok.DECOR_OP))
+            new_kid.append(self.decorators)
+            new_kid.append(self.gen_token(Tok.WS))
         if self.is_async:
             new_kid.append(self.gen_token(Tok.KW_ASYNC))
         if self.is_override:
@@ -1073,16 +1088,20 @@ class Ability(
         new_kid.append(self.name_ref)
         if self.signature:
             new_kid.append(self.signature)
+        if self.is_genai_ability:
+            new_kid.append(self.gen_token(Tok.KW_BY))
+        if self.is_abstract:
+            new_kid.append(self.gen_token(Tok.KW_ABSTRACT))
         if self.body:
             if isinstance(self.body, AstImplOnlyNode):
-                new_kid.append(self.body.body)
+                new_kid.append(self.gen_token(Tok.SEMI))
             else:
-                new_kid.append(self.gen_token(Tok.LBRACE))
                 new_kid.append(self.body)
-                new_kid.append(self.gen_token(Tok.RBRACE))
+                if self.is_genai_ability:
+                    new_kid.append(self.gen_token(Tok.SEMI))
         else:
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1130,7 +1149,7 @@ class AbilityDef(AstSymbolNode, ElementStmt, AstImplOnlyNode, CodeBlockStmt):
 
         new_kid.append(self.body)
 
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     @property
@@ -1171,8 +1190,11 @@ class FuncSignature(AstSemStrNode):
         new_kid.append(self.gen_token(Tok.RPAREN))
         if self.return_type:
             new_kid.append(self.gen_token(Tok.RETURN_HINT))
+            if self.semstr:
+                new_kid.append(self.semstr)
+                new_kid.append(self.gen_token(Tok.COLON))
             new_kid.append(self.return_type)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     @property
@@ -1231,7 +1253,7 @@ class EventSignature(AstSemStrNode):
                 new_kid.append(self.semstr)
             new_kid.append(self.gen_token(Tok.RETURN_HINT))
             new_kid.append(self.return_type)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     @property
@@ -1267,7 +1289,7 @@ class ArchRefChain(AstNode):
         new_kid: list[AstNode] = []
         for a in self.archs:
             new_kid.append(a)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     def py_resolve_name(self) -> str:
@@ -1328,12 +1350,15 @@ class ParamVar(AstSymbolNode, AstTypedVarNode, AstSemStrNode):
         if self.unpack:
             new_kid.append(self.unpack)
         new_kid.append(self.name)
+        if self.semstr:
+            new_kid.append(self.gen_token(Tok.COLON))
+            new_kid.append(self.semstr)
         if self.type_tag:
             new_kid.append(self.type_tag)
         if self.value:
             new_kid.append(self.gen_token(Tok.EQ))
             new_kid.append(self.value)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1378,7 +1403,7 @@ class ArchHas(AstAccessNode, AstDocNode, ArchBlockStmt):
             new_kid.append(self.access)
         new_kid.append(self.vars)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1428,7 +1453,7 @@ class HasVar(AstSymbolNode, AstTypedVarNode, AstSemStrNode):
         if self.defer:
             new_kid.append(self.gen_token(Tok.KW_BY))
             new_kid.append(self.gen_token(Tok.KW_POST_INIT))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1457,7 +1482,7 @@ class TypedCtxBlock(CodeBlockStmt):
             self.type_ctx,
             self.body,
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1487,13 +1512,11 @@ class IfStmt(CodeBlockStmt, AstElseBodyNode):
         new_kid: list[AstNode] = [
             self.gen_token(Tok.KW_IF),
             self.condition,
-            self.gen_token(Tok.LBRACE),
             self.body,
-            self.gen_token(Tok.RBRACE),
         ]
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1510,13 +1533,11 @@ class ElseIf(IfStmt):
         new_kid: list[AstNode] = [
             self.gen_token(Tok.KW_ELIF),
             self.condition,
-            self.gen_token(Tok.LBRACE),
             self.body,
-            self.gen_token(Tok.RBRACE),
         ]
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1539,11 +1560,9 @@ class ElseStmt(AstNode):
             res = self.body.normalize(deep)
         new_kid: list[AstNode] = [
             self.gen_token(Tok.KW_ELSE),
-            self.gen_token(Tok.LBRACE),
             self.body,
-            self.gen_token(Tok.RBRACE),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1565,14 +1584,13 @@ class ExprStmt(CodeBlockStmt):
         """Normalize ast node."""
         if deep:
             res = self.expr.normalize(deep)
-        AstNode.__init__(
-            self,
-            kid=(
-                [self.expr, self.gen_token(Tok.SEMI)]
-                if not self.in_fstring
-                else [self.expr]
-            ),
-        )
+        new_kid: list[AstNode] = []
+        if self.in_fstring:
+            new_kid.append(self.expr)
+        else:
+            new_kid.append(self.expr)
+            new_kid.append(self.gen_token(Tok.SEMI))
+        AstNode.set_kids(self, nodes=new_kid)
         return res and self.expr is not None
 
 
@@ -1607,16 +1625,14 @@ class TryStmt(AstElseBodyNode, CodeBlockStmt):
         new_kid: list[AstNode] = [
             self.gen_token(Tok.KW_TRY),
         ]
-        new_kid.append(self.gen_token(Tok.LBRACE))
         new_kid.append(self.body)
-        new_kid.append(self.gen_token(Tok.RBRACE))
         if self.excepts:
             new_kid.append(self.excepts)
         if self.else_body:
             new_kid.append(self.else_body)
         if self.finally_body:
             new_kid.append(self.finally_body)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1650,10 +1666,8 @@ class Except(CodeBlockStmt):
         if self.name:
             new_kid.append(self.gen_token(Tok.KW_AS))
             new_kid.append(self.name)
-        new_kid.append(self.gen_token(Tok.LBRACE))
         new_kid.append(self.body)
-        new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1677,10 +1691,8 @@ class FinallyStmt(CodeBlockStmt):
         new_kid: list[AstNode] = [
             self.gen_token(Tok.KW_FINALLY),
         ]
-        new_kid.append(self.gen_token(Tok.LBRACE))
         new_kid.append(self.body)
-        new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1724,12 +1736,10 @@ class IterForStmt(AstAsyncNode, AstElseBodyNode, CodeBlockStmt):
         new_kid.append(self.condition)
         new_kid.append(self.gen_token(Tok.KW_BY))
         new_kid.append(self.count_by)
-        new_kid.append(self.gen_token(Tok.LBRACE))
         new_kid.append(self.body)
-        new_kid.append(self.gen_token(Tok.RBRACE))
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1770,13 +1780,10 @@ class InForStmt(AstAsyncNode, AstElseBodyNode, CodeBlockStmt):
         new_kid.append(self.collection)
 
         if self.body:
-            new_kid.append(self.gen_token(Tok.LBRACE))
             new_kid.append(self.body)
-            new_kid.append(self.gen_token(Tok.RBRACE))
-
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1805,11 +1812,8 @@ class WhileStmt(CodeBlockStmt):
             self.condition,
         ]
         if self.body:
-            new_kid.append(self.gen_token(Tok.LBRACE))
             new_kid.append(self.body)
-            new_kid.append(self.gen_token(Tok.RBRACE))
-
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1840,12 +1844,11 @@ class WithStmt(AstAsyncNode, CodeBlockStmt):
             new_kid.append(self.gen_token(Tok.KW_ASYNC))
         new_kid.append(self.gen_token(Tok.KW_WITH))
         new_kid.append(self.exprs)
-
         new_kid.append(self.gen_token(Tok.LBRACE))
         new_kid.append(self.body)
         new_kid.append(self.gen_token(Tok.RBRACE))
 
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1873,7 +1876,7 @@ class ExprAsItem(AstNode):
         if self.alias:
             new_kid.append(self.gen_token(Tok.KW_AS))
             new_kid.append(self.alias)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1904,7 +1907,7 @@ class RaiseStmt(CodeBlockStmt):
             new_kid.append(self.gen_token(Tok.KW_FROM))
             new_kid.append(self.from_target)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1936,7 +1939,7 @@ class AssertStmt(CodeBlockStmt):
             new_kid.append(self.gen_token(Tok.COMMA))
             new_kid.append(self.error_msg)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1958,7 +1961,7 @@ class CtrlStmt(CodeBlockStmt):
         if deep:
             res = self.ctrl.normalize(deep)
         new_kid: list[AstNode] = [self.ctrl, self.gen_token(Tok.SEMI)]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -1984,7 +1987,7 @@ class DeleteStmt(CodeBlockStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2010,7 +2013,7 @@ class ReportStmt(CodeBlockStmt):
             self.expr,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2037,7 +2040,7 @@ class ReturnStmt(CodeBlockStmt):
         if self.expr:
             new_kid.append(self.expr)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2064,7 +2067,7 @@ class IgnoreStmt(WalkerStmtOnlyNode, CodeBlockStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2099,10 +2102,11 @@ class VisitStmt(WalkerStmtOnlyNode, AstElseBodyNode, CodeBlockStmt):
             new_kid.append(self.vis_type)
             new_kid.append(self.gen_token(Tok.COLON))
         new_kid.append(self.target)
-        new_kid.append(self.gen_token(Tok.SEMI))
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.__init__(self, kid=new_kid)
+        else:
+            new_kid.append(self.gen_token(Tok.SEMI))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2133,7 +2137,7 @@ class RevisitStmt(WalkerStmtOnlyNode, AstElseBodyNode, CodeBlockStmt):
         if self.else_body:
             new_kid.append(self.else_body)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2154,7 +2158,7 @@ class DisengageStmt(WalkerStmtOnlyNode, CodeBlockStmt):
             self.gen_token(Tok.KW_DISENGAGE),
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return True
 
 
@@ -2179,7 +2183,7 @@ class AwaitExpr(Expr):
             self.gen_token(Tok.KW_AWAIT),
             self.target,
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2205,7 +2209,7 @@ class GlobalStmt(CodeBlockStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2222,7 +2226,7 @@ class NonLocalStmt(GlobalStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2260,18 +2264,25 @@ class Assignment(AstSemStrNode, AstTypedVarNode, EnumBlockStmt, CodeBlockStmt):
             res = res and self.aug_op.normalize(deep) if self.aug_op else res
         new_kid: list[AstNode] = []
         new_kid.append(self.target)
+        if self.semstr:
+            new_kid.append(self.gen_token(Tok.COLON))
+            new_kid.append(self.semstr)
         if self.type_tag:
             new_kid.append(self.type_tag)
         if self.aug_op:
             new_kid.append(self.aug_op)
-            new_kid.append(self.gen_token(Tok.EQ))
-        else:
-            new_kid.append(self.gen_token(Tok.EQ))
         if self.value:
+            if not self.aug_op:
+                new_kid.append(self.gen_token(Tok.EQ))
             new_kid.append(self.value)
-        if not isinstance(self.parent, (GlobalVars)):
+        if isinstance(self.parent, SubNodeList) and isinstance(
+            self.parent.parent, GlobalVars
+        ):
+            if self.parent.kid.index(self) == len(self.parent.kid) - 1:
+                new_kid.append(self.gen_token(Tok.SEMI))
+        elif (not self.is_enum_stmt) and not isinstance(self.parent, IterForStmt):
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2305,7 +2316,7 @@ class BinaryExpr(Expr):
             self.right,
             self.gen_token(Tok.RPAREN),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2338,7 +2349,7 @@ class CompareExpr(Expr):
         for i, right in enumerate(self.rights):
             new_kid.append(self.ops[i])
             new_kid.append(right)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2368,7 +2379,7 @@ class BoolExpr(Expr):
             if i > 0:
                 new_kid.append(self.op)
             new_kid.append(value)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2399,7 +2410,7 @@ class LambdaExpr(Expr):
             self.body,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2424,7 +2435,7 @@ class UnaryExpr(Expr):
             res = self.operand.normalize(deep)
             res = res and self.op.normalize(deep) if self.op else res
         new_kid: list[AstNode] = [self.op, self.operand]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2458,7 +2469,7 @@ class IfElseExpr(Expr):
             self.gen_token(Tok.KW_ELSE),
             self.else_value,
         ]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2489,7 +2500,7 @@ class MultiString(AtomExpr):
         new_kid: list[AstNode] = []
         for string in self.strings:
             new_kid.append(string)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2518,8 +2529,13 @@ class FString(AtomExpr):
             res = self.parts.normalize(deep) if self.parts else res
         new_kid: list[AstNode] = []
         if self.parts:
+            for i in self.parts.items:
+                if isinstance(i, String):
+                    i.value = (
+                        "{{" if i.value == "{" else "}}" if i.value == "}" else i.value
+                    )
             new_kid.append(self.parts)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2552,7 +2568,7 @@ class ListVal(AtomExpr):
         if self.values:
             new_kid.append(self.values)
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2579,11 +2595,13 @@ class SetVal(AtomExpr):
         res = True
         if deep:
             res = self.values.normalize(deep) if self.values else res
-        new_kid: list[AstNode] = []
+        new_kid: list[AstNode] = [
+            self.gen_token(Tok.LBRACE),
+        ]
         if self.values:
             new_kid.append(self.values)
-
-        AstNode.__init__(self, kid=new_kid)
+        new_kid.append(self.gen_token(Tok.RBRACE))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2610,15 +2628,28 @@ class TupleVal(AtomExpr):
         res = True
         if deep:
             res = self.values.normalize(deep) if self.values else res
-        new_kid: list[AstNode] = [
-            self.gen_token(Tok.LPAREN),
-        ]
+        in_ret_type = (
+            self.parent
+            and isinstance(self.parent, IndexSlice)
+            and self.parent
+            and isinstance(self.parent.parent, AtomTrailer)
+            and self.parent.parent
+            and isinstance(self.parent.parent.parent, FuncSignature)
+        )
+        new_kid: list[AstNode] = (
+            [
+                self.gen_token(Tok.LPAREN),
+            ]
+            if not in_ret_type
+            else []
+        )
         if self.values:
             new_kid.append(self.values)
             if len(self.values.items) < 2:
                 new_kid.append(self.gen_token(Tok.COMMA))
-        new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.__init__(self, kid=new_kid)
+        if not in_ret_type:
+            new_kid.append(self.gen_token(Tok.RPAREN))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2654,7 +2685,7 @@ class DictVal(AtomExpr):
             if i < len(self.kv_pairs) - 1:
                 new_kid.append(self.gen_token(Tok.COMMA))
         new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2685,7 +2716,7 @@ class KVPair(AstNode):
         else:
             new_kid.append(self.gen_token(Tok.STAR_POW))
         new_kid.append(self.value)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2714,7 +2745,7 @@ class KWPair(AstNode):
             new_kid.append(self.key)
             new_kid.append(self.gen_token(Tok.EQ))
         new_kid.append(self.value)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2752,8 +2783,9 @@ class InnerCompr(AstAsyncNode):
         new_kid.append(self.gen_token(Tok.KW_IN))
         new_kid.append(self.collection)
         for cond in self.conditional if self.conditional else []:
+            new_kid.append(self.gen_token(Tok.KW_IF))
             new_kid.append(cond)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2791,7 +2823,7 @@ class ListCompr(AtomExpr):
         for comp in self.compr:
             new_kid.append(comp)
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2812,7 +2844,7 @@ class GenCompr(ListCompr):
         for comp in self.compr:
             new_kid.append(comp)
         new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2827,12 +2859,13 @@ class SetCompr(ListCompr):
             for comp in self.compr:
                 res = res and comp.normalize(deep)
         new_kid: list[AstNode] = [
+            self.gen_token(Tok.LBRACE),
             self.out_expr,
         ]
         for comp in self.compr:
             new_kid.append(comp)
-
-        AstNode.__init__(self, kid=new_kid)
+        new_kid.append(self.gen_token(Tok.RBRACE))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2863,12 +2896,13 @@ class DictCompr(AtomExpr):
         for comp in self.compr:
             res = res and comp.normalize(deep)
         new_kid: list[AstNode] = [
+            self.gen_token(Tok.LBRACE),
             self.kv_pair,
         ]
         for comp in self.compr:
             new_kid.append(comp)
-
-        AstNode.__init__(self, kid=new_kid)
+        new_kid.append(self.gen_token(Tok.RBRACE))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2903,7 +2937,7 @@ class AtomTrailer(Expr):
             new_kid.append(self.gen_token(Tok.DOT))
         if self.right:
             new_kid.append(self.right)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2928,7 +2962,7 @@ class AtomUnit(Expr):
         new_kid.append(self.gen_token(Tok.LPAREN))
         new_kid.append(self.value)
         new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -2957,7 +2991,7 @@ class YieldExpr(Expr):
         if self.expr:
             new_kid.append(self.expr)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3023,18 +3057,18 @@ class IndexSlice(AtomExpr):
         if self.is_range:
             if self.start:
                 new_kid.append(self.start)
-            new_kid.append(self.gen_token(Tok.COLON))
             if self.stop:
+                new_kid.append(self.gen_token(Tok.COLON))
                 new_kid.append(self.stop)
-            new_kid.append(self.gen_token(Tok.COLON))
             if self.step:
+                new_kid.append(self.gen_token(Tok.COLON))
                 new_kid.append(self.step)
         elif self.start:
             new_kid.append(self.start)
         else:
             res = False
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3064,7 +3098,7 @@ class ArchRef(NameSpec):
         if deep:
             res = self.name_ref.normalize(deep)
         new_kid: list[AstNode] = [self.arch, self.name_ref]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     def py_resolve_name(self) -> str:
@@ -3101,7 +3135,7 @@ class SpecialVarRef(NameSpec):
         if deep:
             res = self.var.normalize(deep)
         new_kid: list[AstNode] = [self.var]
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
     def py_resolve_name(self) -> str:
@@ -3144,11 +3178,10 @@ class EdgeRefTrailer(Expr):
         new_kid: list[AstNode] = []
         if self.edges_only:
             new_kid.append(self.gen_token(Tok.EDGE_OP))
-        self.gen_token(Tok.LSQUARE)
-        for expr in self.chain:
-            new_kid.append(expr)
-        self.gen_token(Tok.RSQUARE)
-        AstNode.__init__(self, kid=new_kid)
+        new_kid.append(self.gen_token(Tok.LSQUARE))
+        new_kid.extend(self.chain)
+        new_kid.append(self.gen_token(Tok.RSQUARE))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3200,7 +3233,7 @@ class EdgeOpRef(WalkerStmtOnlyNode, AtomExpr):
                 new_kid.append(self.gen_token(Tok.ARROW_L_P1))
                 new_kid.append(self.filter_cond)
                 new_kid.append(self.gen_token(Tok.ARROW_R_P2))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3222,8 +3255,8 @@ class DisconnectOp(WalkerStmtOnlyNode):
         res = True
         if deep:
             res = self.edge_spec.normalize(deep)
-        new_kid: list[AstNode] = [self.gen_token(Tok.NOT), self.edge_spec]
-        AstNode.__init__(self, kid=new_kid)
+        new_kid: list[AstNode] = [self.gen_token(Tok.KW_DELETE), self.edge_spec]
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3283,7 +3316,7 @@ class ConnectOp(AstNode):
                     new_kid.append(self.gen_token(Tok.COLON))
                     new_kid.append(self.conn_assign)
                 new_kid.append(self.gen_token(Tok.CARROW_R_P2))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3314,17 +3347,20 @@ class FilterCompr(AtomExpr):
             res = self.f_type.normalize(deep) if self.f_type else res
             res = res and self.compares.normalize(deep) if self.compares else res
         new_kid: list[AstNode] = []
-        new_kid.append(self.gen_token(Tok.LPAREN))
-        if self.f_type:
-            new_kid.append(self.gen_token(Tok.TYPE_OP))
-        new_kid.append(self.gen_token(Tok.NULL_OK))
+        if not isinstance(self.parent, EdgeOpRef):
+            new_kid.append(self.gen_token(Tok.LPAREN))
+            if self.f_type:
+                new_kid.append(self.gen_token(Tok.TYPE_OP))
+            new_kid.append(self.gen_token(Tok.NULL_OK))
         if self.f_type:
             new_kid.append(self.f_type)
-            new_kid.append(self.gen_token(Tok.COLON))
         if self.compares:
+            if self.f_type:
+                new_kid.append(self.gen_token(Tok.COLON))
             new_kid.append(self.compares)
-        new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.__init__(self, kid=new_kid)
+        if not isinstance(self.parent, EdgeOpRef):
+            new_kid.append(self.gen_token(Tok.RPAREN))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3352,11 +3388,14 @@ class AssignCompr(AtomExpr):
         if deep:
             res = self.assigns.normalize(deep)
         new_kid: list[AstNode] = []
-        new_kid.append(self.gen_token(Tok.LPAREN))
-        new_kid.append(self.gen_token(Tok.EQ))
-        new_kid.append(self.assigns)
-        new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.__init__(self, kid=new_kid)
+        if isinstance(self.parent, ConnectOp):
+            new_kid.append(self.assigns)
+        else:
+            new_kid.append(self.gen_token(Tok.LPAREN))
+            new_kid.append(self.gen_token(Tok.EQ))
+            new_kid.append(self.assigns)
+            new_kid.append(self.gen_token(Tok.RPAREN))
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3389,10 +3428,12 @@ class MatchStmt(CodeBlockStmt):
             self.gen_token(Tok.KW_MATCH),
             self.target,
         ]
+        new_kid.append(self.gen_token(Tok.LBRACE))
         for case in self.cases:
             new_kid.append(case)
+        new_kid.append(self.gen_token(Tok.RBRACE))
 
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3427,7 +3468,7 @@ class MatchCase(AstNode):
         new_kid.append(self.gen_token(Tok.COLON))
         if self.body:
             new_kid.extend([*self.body])
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3454,7 +3495,7 @@ class MatchOr(MatchPattern):
             new_kid.append(pattern)
             new_kid.append(self.gen_token(Tok.KW_OR))
         new_kid.pop()
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3483,7 +3524,7 @@ class MatchAs(MatchPattern):
             new_kid.append(self.pattern)
             new_kid.append(self.gen_token(Tok.KW_AS))
         new_kid.append(self.name)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3492,9 +3533,9 @@ class MatchWild(MatchPattern):
 
     def normalize(self, deep: bool = False) -> bool:
         """Normalize match wild card node."""
-        AstNode.__init__(
+        AstNode.set_kids(
             self,
-            kid=[
+            nodes=[
                 Name(
                     file_path=self.loc.mod_path,
                     name=Tok.NAME,
@@ -3527,7 +3568,7 @@ class MatchValue(MatchPattern):
         res = True
         if deep:
             res = self.value.normalize(deep)
-        AstNode.__init__(self, kid=[self.value])
+        AstNode.set_kids(self, nodes=[self.value])
         return res
 
 
@@ -3546,7 +3587,7 @@ class MatchSingleton(MatchPattern):
     def normalize(self, deep: bool = False) -> bool:
         """Normalize match singleton node."""
         res = True
-        AstNode.__init__(self, kid=[self.value])
+        AstNode.set_kids(self, nodes=[self.value])
         return res
 
 
@@ -3574,7 +3615,7 @@ class MatchSequence(MatchPattern):
             new_kid.append(self.gen_token(Tok.COMMA))
         new_kid.pop()
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3602,7 +3643,7 @@ class MatchMapping(MatchPattern):
             new_kid.append(self.gen_token(Tok.COMMA))
         new_kid.pop()
         new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3628,8 +3669,9 @@ class MatchKVPair(MatchPattern):
                 self.key.normalize(deep) if isinstance(self.key, MatchPattern) else True
             )
             res = res and self.value.normalize(deep)
-        new_kid: list[AstNode] = [self.key, self.gen_token(Tok.COLON), self.value]
-        AstNode.__init__(self, kid=new_kid)
+        op = Tok.EQ if isinstance(self.key, Name) else Tok.COLON
+        new_kid: list[AstNode] = [self.key, self.gen_token(op), self.value]
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3656,7 +3698,7 @@ class MatchStar(MatchPattern):
             self.gen_token(Tok.STAR_MUL if self.is_list else Tok.STAR_POW)
         ]
         new_kid.append(self.name)
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3693,7 +3735,7 @@ class MatchArch(MatchPattern):
         else:
             new_kid.pop()
         new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.__init__(self, kid=new_kid)
+        AstNode.set_kids(self, nodes=new_kid)
         return res
 
 
@@ -3913,6 +3955,8 @@ class String(Literal):
     @property
     def lit_value(self) -> str:
         """Return literal value in its python type."""
+        if isinstance(self.value, bytes):
+            return self.value
         prefix_len = 3 if self.value.startswith(("'''", '"""')) else 1
         if any(
             self.value.startswith(prefix)
@@ -3923,13 +3967,13 @@ class String(Literal):
 
         elif self.value.startswith(("'", '"')):
             ret_str = self.value[prefix_len:-prefix_len]
+            return ret_str.encode().decode("unicode_escape", errors="backslashreplace")
         else:
-            ret_str = self.value
-        ret_str = ret_str.encode().decode("unicode_escape")
-        return ret_str
+            return self.value
 
     def normalize(self, deep: bool = True) -> bool:
         """Normalize string."""
+        self.value = r"%s" % self.value
         return True
 
     def unparse(self) -> str: