jaclang 0.5.11__py3-none-any.whl → 0.5.16__py3-none-any.whl

jaclang/compiler/absyntree.py

@@ -327,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.set_kids(self, nodes=[self.gen_token(Tok.COLON), self.tag])
+        self.set_kids(nodes=[self.gen_token(Tok.COLON), self.tag])
         return res
 
 
@@ -370,7 +370,7 @@ class SubNodeList(AstNode, Generic[T]):
             new_kid.pop()
         if self.right_enc:
             new_kid.append(self.right_enc)
-        AstNode.set_kids(self, nodes=new_kid if len(new_kid) else [EmptyToken()])
+        self.set_kids(nodes=new_kid if len(new_kid) else [EmptyToken()])
         return res
 
 
@@ -414,7 +414,7 @@ class Module(AstDocNode):
         if self.doc:
             new_kid.append(self.doc)
         new_kid.extend(self.body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     def unparse(self) -> str:
@@ -458,7 +458,7 @@ class GlobalVars(ElementStmt, AstAccessNode):
         if self.access:
             new_kid.append(self.access)
         new_kid.append(self.assignments)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -517,7 +517,7 @@ class Test(AstSymbolNode, ElementStmt):
         new_kid.append(self.gen_token(Tok.KW_TEST))
         new_kid.append(self.name)
         new_kid.append(self.body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -552,7 +552,7 @@ class ModuleCode(ElementStmt, ArchBlockStmt, EnumBlockStmt):
         if self.name:
             new_kid.append(self.name)
         new_kid.append(self.body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -582,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -633,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -671,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)
@@ -681,8 +681,9 @@ class ModulePath(AstSymbolNode):
             new_kid.pop()
         if self.alias:
             res = res and self.alias.normalize(deep)
+            new_kid.append(self.gen_token(Tok.KW_AS))
             new_kid.append(self.alias)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     @property
@@ -723,7 +724,7 @@ class ModuleItem(AstSymbolNode):
         if self.alias:
             new_kid.append(self.gen_token(Tok.KW_AS))
             new_kid.append(self.alias)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -822,7 +823,7 @@ class Architype(ArchSpec, AstAccessNode, ArchBlockStmt, AstImplNeedingNode):
                 new_kid.append(self.body)
         else:
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -864,7 +865,7 @@ class ArchDef(ArchSpec, AstImplOnlyNode):
             new_kid.append(self.doc)
         new_kid.append(self.target)
         new_kid.append(self.body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -933,7 +934,7 @@ class Enum(ArchSpec, AstAccessNode, AstImplNeedingNode, ArchBlockStmt):
                 new_kid.append(self.gen_token(Tok.RBRACE))
         else:
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -977,7 +978,7 @@ class EnumDef(ArchSpec, AstImplOnlyNode):
         new_kid.append(self.gen_token(Tok.LBRACE))
         new_kid.append(self.body)
         new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1101,7 +1102,7 @@ class Ability(
                     new_kid.append(self.gen_token(Tok.SEMI))
         else:
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1149,7 +1150,7 @@ class AbilityDef(AstSymbolNode, ElementStmt, AstImplOnlyNode, CodeBlockStmt):
 
         new_kid.append(self.body)
 
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     @property
@@ -1194,7 +1195,7 @@ class FuncSignature(AstSemStrNode):
                 new_kid.append(self.semstr)
                 new_kid.append(self.gen_token(Tok.COLON))
             new_kid.append(self.return_type)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     @property
@@ -1253,7 +1254,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     @property
@@ -1289,7 +1290,7 @@ class ArchRefChain(AstNode):
         new_kid: list[AstNode] = []
         for a in self.archs:
             new_kid.append(a)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     def py_resolve_name(self) -> str:
@@ -1358,7 +1359,7 @@ class ParamVar(AstSymbolNode, AstTypedVarNode, AstSemStrNode):
         if self.value:
             new_kid.append(self.gen_token(Tok.EQ))
             new_kid.append(self.value)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1403,7 +1404,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1453,7 +1454,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1482,7 +1483,7 @@ class TypedCtxBlock(CodeBlockStmt):
             self.type_ctx,
             self.body,
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1516,7 +1517,7 @@ class IfStmt(CodeBlockStmt, AstElseBodyNode):
         ]
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1537,7 +1538,7 @@ class ElseIf(IfStmt):
         ]
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1562,7 +1563,7 @@ class ElseStmt(AstNode):
             self.gen_token(Tok.KW_ELSE),
             self.body,
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1590,7 +1591,7 @@ class ExprStmt(CodeBlockStmt):
         else:
             new_kid.append(self.expr)
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res and self.expr is not None
 
 
@@ -1632,7 +1633,7 @@ class TryStmt(AstElseBodyNode, CodeBlockStmt):
             new_kid.append(self.else_body)
         if self.finally_body:
             new_kid.append(self.finally_body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1667,7 +1668,7 @@ class Except(CodeBlockStmt):
             new_kid.append(self.gen_token(Tok.KW_AS))
             new_kid.append(self.name)
         new_kid.append(self.body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1692,7 +1693,7 @@ class FinallyStmt(CodeBlockStmt):
             self.gen_token(Tok.KW_FINALLY),
         ]
         new_kid.append(self.body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1739,7 +1740,7 @@ class IterForStmt(AstAsyncNode, AstElseBodyNode, CodeBlockStmt):
         new_kid.append(self.body)
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1783,7 +1784,7 @@ class InForStmt(AstAsyncNode, AstElseBodyNode, CodeBlockStmt):
             new_kid.append(self.body)
         if self.else_body:
             new_kid.append(self.else_body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1813,7 +1814,7 @@ class WhileStmt(CodeBlockStmt):
         ]
         if self.body:
             new_kid.append(self.body)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1848,7 +1849,7 @@ class WithStmt(AstAsyncNode, CodeBlockStmt):
         new_kid.append(self.body)
         new_kid.append(self.gen_token(Tok.RBRACE))
 
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1876,7 +1877,7 @@ class ExprAsItem(AstNode):
         if self.alias:
             new_kid.append(self.gen_token(Tok.KW_AS))
             new_kid.append(self.alias)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1907,7 +1908,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1939,7 +1940,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1961,7 +1962,7 @@ class CtrlStmt(CodeBlockStmt):
         if deep:
             res = self.ctrl.normalize(deep)
         new_kid: list[AstNode] = [self.ctrl, self.gen_token(Tok.SEMI)]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -1987,7 +1988,7 @@ class DeleteStmt(CodeBlockStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2013,7 +2014,7 @@ class ReportStmt(CodeBlockStmt):
             self.expr,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2040,7 +2041,7 @@ class ReturnStmt(CodeBlockStmt):
         if self.expr:
             new_kid.append(self.expr)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2067,7 +2068,7 @@ class IgnoreStmt(WalkerStmtOnlyNode, CodeBlockStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2106,7 +2107,7 @@ class VisitStmt(WalkerStmtOnlyNode, AstElseBodyNode, CodeBlockStmt):
             new_kid.append(self.else_body)
         else:
             new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2137,7 +2138,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2158,7 +2159,7 @@ class DisengageStmt(WalkerStmtOnlyNode, CodeBlockStmt):
             self.gen_token(Tok.KW_DISENGAGE),
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return True
 
 
@@ -2183,7 +2184,7 @@ class AwaitExpr(Expr):
             self.gen_token(Tok.KW_AWAIT),
             self.target,
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2209,7 +2210,7 @@ class GlobalStmt(CodeBlockStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2226,7 +2227,7 @@ class NonLocalStmt(GlobalStmt):
             self.target,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2282,7 +2283,7 @@ class Assignment(AstSemStrNode, AstTypedVarNode, EnumBlockStmt, CodeBlockStmt):
                 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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2316,7 +2317,7 @@ class BinaryExpr(Expr):
             self.right,
             self.gen_token(Tok.RPAREN),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2349,7 +2350,7 @@ class CompareExpr(Expr):
         for i, right in enumerate(self.rights):
             new_kid.append(self.ops[i])
             new_kid.append(right)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2379,7 +2380,7 @@ class BoolExpr(Expr):
             if i > 0:
                 new_kid.append(self.op)
             new_kid.append(value)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2410,7 +2411,7 @@ class LambdaExpr(Expr):
             self.body,
             self.gen_token(Tok.SEMI),
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2435,7 +2436,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2469,7 +2470,7 @@ class IfElseExpr(Expr):
             self.gen_token(Tok.KW_ELSE),
             self.else_value,
         ]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2500,7 +2501,7 @@ class MultiString(AtomExpr):
         new_kid: list[AstNode] = []
         for string in self.strings:
             new_kid.append(string)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2535,7 +2536,7 @@ class FString(AtomExpr):
                         "{{" if i.value == "{" else "}}" if i.value == "}" else i.value
                     )
             new_kid.append(self.parts)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2568,7 +2569,7 @@ class ListVal(AtomExpr):
         if self.values:
             new_kid.append(self.values)
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2601,7 +2602,7 @@ class SetVal(AtomExpr):
         if self.values:
             new_kid.append(self.values)
         new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2649,7 +2650,7 @@ class TupleVal(AtomExpr):
                 new_kid.append(self.gen_token(Tok.COMMA))
         if not in_ret_type:
             new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2685,7 +2686,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2716,7 +2717,7 @@ class KVPair(AstNode):
         else:
             new_kid.append(self.gen_token(Tok.STAR_POW))
         new_kid.append(self.value)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2745,7 +2746,7 @@ class KWPair(AstNode):
             new_kid.append(self.key)
             new_kid.append(self.gen_token(Tok.EQ))
         new_kid.append(self.value)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2785,7 +2786,7 @@ class InnerCompr(AstAsyncNode):
         for cond in self.conditional if self.conditional else []:
             new_kid.append(self.gen_token(Tok.KW_IF))
             new_kid.append(cond)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2823,7 +2824,7 @@ class ListCompr(AtomExpr):
         for comp in self.compr:
             new_kid.append(comp)
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2844,7 +2845,7 @@ class GenCompr(ListCompr):
         for comp in self.compr:
             new_kid.append(comp)
         new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2865,7 +2866,7 @@ class SetCompr(ListCompr):
         for comp in self.compr:
             new_kid.append(comp)
         new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2902,7 +2903,7 @@ class DictCompr(AtomExpr):
         for comp in self.compr:
             new_kid.append(comp)
         new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2916,12 +2917,14 @@ class AtomTrailer(Expr):
         is_attr: bool,
         is_null_ok: bool,
         kid: Sequence[AstNode],
+        is_genai: bool = False,
     ) -> None:
         """Initialize atom trailer expression node."""
         self.target = target
         self.right = right
         self.is_attr = is_attr
         self.is_null_ok = is_null_ok
+        self.is_genai = is_genai
         AstNode.__init__(self, kid=kid)
 
     def normalize(self, deep: bool = True) -> bool:
@@ -2937,7 +2940,7 @@ class AtomTrailer(Expr):
             new_kid.append(self.gen_token(Tok.DOT))
         if self.right:
             new_kid.append(self.right)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2962,7 +2965,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -2991,7 +2994,7 @@ class YieldExpr(Expr):
         if self.expr:
             new_kid.append(self.expr)
         new_kid.append(self.gen_token(Tok.SEMI))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3002,11 +3005,13 @@ class FuncCall(Expr):
         self,
         target: Expr,
         params: Optional[SubNodeList[Expr | KWPair]],
+        genai_call: Optional[FuncCall],
         kid: Sequence[AstNode],
     ) -> None:
         """Initialize function call expression node."""
         self.target = target
         self.params = params
+        self.genai_call = genai_call
         AstNode.__init__(self, kid=kid)
 
     def normalize(self, deep: bool = True) -> bool:
@@ -3014,10 +3019,14 @@ class FuncCall(Expr):
         if deep:
             res = self.target.normalize(deep)
             res = res and (not self.params or self.params.normalize(deep))
-        AstNode.__init__(self, kid=[self.target, self.gen_token(Tok.LPAREN, "(")])
-        if self.params:  # TODO: Fix
-            self.kid.append(self.params)
-        self.kid.append(self.gen_token(Tok.RPAREN, ")"))
+        new_kids = [self.target, self.gen_token(Tok.LPAREN, "(")]
+        if self.params:
+            new_kids.append(self.params)
+        if self.genai_call:
+            new_kids.append(self.gen_token(Tok.KW_BY))
+            new_kids.append(self.genai_call)
+        new_kids.append(self.gen_token(Tok.RPAREN, ")"))
+        self.set_kids(nodes=new_kids)
         return res
 
 
@@ -3068,7 +3077,7 @@ class IndexSlice(AtomExpr):
         else:
             res = False
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3098,7 +3107,7 @@ class ArchRef(NameSpec):
         if deep:
             res = self.name_ref.normalize(deep)
         new_kid: list[AstNode] = [self.arch, self.name_ref]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     def py_resolve_name(self) -> str:
@@ -3135,7 +3144,7 @@ class SpecialVarRef(NameSpec):
         if deep:
             res = self.var.normalize(deep)
         new_kid: list[AstNode] = [self.var]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
     def py_resolve_name(self) -> str:
@@ -3181,7 +3190,7 @@ class EdgeRefTrailer(Expr):
         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)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3233,7 +3242,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3256,7 +3265,7 @@ class DisconnectOp(WalkerStmtOnlyNode):
         if deep:
             res = self.edge_spec.normalize(deep)
         new_kid: list[AstNode] = [self.gen_token(Tok.KW_DELETE), self.edge_spec]
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3316,7 +3325,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.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3360,7 +3369,7 @@ class FilterCompr(AtomExpr):
             new_kid.append(self.compares)
         if not isinstance(self.parent, EdgeOpRef):
             new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3395,7 +3404,7 @@ class AssignCompr(AtomExpr):
             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)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3433,7 +3442,7 @@ class MatchStmt(CodeBlockStmt):
             new_kid.append(case)
         new_kid.append(self.gen_token(Tok.RBRACE))
 
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3468,7 +3477,7 @@ class MatchCase(AstNode):
         new_kid.append(self.gen_token(Tok.COLON))
         if self.body:
             new_kid.extend([*self.body])
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3495,7 +3504,7 @@ class MatchOr(MatchPattern):
             new_kid.append(pattern)
             new_kid.append(self.gen_token(Tok.KW_OR))
         new_kid.pop()
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3524,7 +3533,7 @@ class MatchAs(MatchPattern):
             new_kid.append(self.pattern)
             new_kid.append(self.gen_token(Tok.KW_AS))
         new_kid.append(self.name)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3568,7 +3577,7 @@ class MatchValue(MatchPattern):
         res = True
         if deep:
             res = self.value.normalize(deep)
-        AstNode.set_kids(self, nodes=[self.value])
+        self.set_kids(nodes=[self.value])
         return res
 
 
@@ -3587,7 +3596,7 @@ class MatchSingleton(MatchPattern):
     def normalize(self, deep: bool = False) -> bool:
         """Normalize match singleton node."""
         res = True
-        AstNode.set_kids(self, nodes=[self.value])
+        self.set_kids(nodes=[self.value])
         return res
 
 
@@ -3615,7 +3624,7 @@ class MatchSequence(MatchPattern):
             new_kid.append(self.gen_token(Tok.COMMA))
         new_kid.pop()
         new_kid.append(self.gen_token(Tok.RSQUARE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3643,7 +3652,7 @@ class MatchMapping(MatchPattern):
             new_kid.append(self.gen_token(Tok.COMMA))
         new_kid.pop()
         new_kid.append(self.gen_token(Tok.RBRACE))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3671,7 +3680,7 @@ class MatchKVPair(MatchPattern):
             res = res and self.value.normalize(deep)
         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)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3698,7 +3707,7 @@ class MatchStar(MatchPattern):
             self.gen_token(Tok.STAR_MUL if self.is_list else Tok.STAR_POW)
         ]
         new_kid.append(self.name)
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res
 
 
@@ -3735,7 +3744,7 @@ class MatchArch(MatchPattern):
         else:
             new_kid.pop()
         new_kid.append(self.gen_token(Tok.RPAREN))
-        AstNode.set_kids(self, nodes=new_kid)
+        self.set_kids(nodes=new_kid)
         return res