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

jaclang/compiler/parser.py

@@ -390,6 +390,7 @@ class JacParser(Pass):
             """
             ret = ast.SubNodeList[ast.ModuleItem](
                 items=[i for i in kid if isinstance(i, ast.ModuleItem)],
+                delim=Tok.COMMA,
                 kid=kid,
             )
             return self.nu(ret)
@@ -509,6 +510,7 @@ class JacParser(Pass):
                 return self.nu(
                     ast.SubNodeList[ast.Expr](
                         items=valid_decors,
+                        delim=Tok.DECOR_OP,
                         kid=kid,
                     )
                 )
@@ -525,6 +527,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.Expr](
                     items=valid_inh,
+                    delim=Tok.COMMA,
                     kid=kid,
                 )
             )
@@ -570,11 +573,12 @@ class JacParser(Pass):
         def special_ref(self, kid: list[ast.AstNode]) -> ast.SpecialVarRef:
             """Grammar rule.
 
-            special_ref: INIT_OP
-                        | ROOT_OP
-                        | SUPER_OP
-                        | SELF_OP
-                        | HERE_OP
+            special_ref: KW_INIT
+                        | KW_POST_INIT
+                        | KW_ROOT
+                        | KW_SUPER
+                        | KW_SELF
+                        | KW_HERE
             """
             if isinstance(kid[0], ast.Token):
                 return self.nu(
@@ -595,6 +599,7 @@ class JacParser(Pass):
             if isinstance(kid[0], (ast.Enum, ast.EnumDef)):
                 return self.nu(kid[0])
             else:
+
                 raise self.ice()
 
         def enum_decl(self, kid: list[ast.AstNode]) -> ast.Enum:
@@ -654,44 +659,75 @@ class JacParser(Pass):
 
             enum_block: LBRACE ((enum_stmt COMMA)* enum_stmt)? RBRACE
             """
-            ret = ast.SubNodeList[ast.EnumBlockStmt](
-                items=[],
-                kid=kid,
-            )
+            ret = ast.SubNodeList[ast.EnumBlockStmt](items=[], delim=Tok.COMMA, kid=kid)
             ret.items = [i for i in kid if isinstance(i, ast.EnumBlockStmt)]
             return self.nu(ret)
 
         def enum_stmt(self, kid: list[ast.AstNode]) -> ast.EnumBlockStmt:
             """Grammar rule.
 
-            enum_stmt: NAME EQ expression
-                    | NAME
+            enum_stmt: NAME (COLON STRING)? EQ expression
+                    | NAME (COLON STRING)?
                     | py_code_block
             """
             if isinstance(kid[0], ast.PyInlineCode):
                 return self.nu(kid[0])
             if isinstance(kid[0], (ast.Name)):
-                if len(kid) == 1:
-                    kid[0].is_enum_singleton = True
-                    return self.nu(kid[0])
-                elif isinstance(kid[2], ast.Expr):
-                    targ = ast.SubNodeList[ast.Expr](items=[kid[0]], kid=[kid[0]])
+                if (
+                    len(kid) >= 3
+                    and isinstance(kid[-1], ast.Expr)
+                    and not isinstance(kid[-1], ast.String)
+                ):
+                    semstr = (
+                        kid[2]
+                        if len(kid) > 3 and isinstance(kid[2], ast.String)
+                        else None
+                    )
+                    targ = ast.SubNodeList[ast.Expr](
+                        items=[kid[0]], delim=Tok.COMMA, kid=[kid[0]]
+                    )
+                    kid[0] = targ
+                    return self.nu(
+                        ast.Assignment(
+                            target=targ,
+                            value=kid[-1],
+                            type_tag=None,
+                            kid=kid,
+                            semstr=semstr,
+                            is_enum_stmt=True,
+                        )
+                    )
+                else:
+                    semstr = (
+                        kid[2]
+                        if len(kid) == 3 and isinstance(kid[2], ast.String)
+                        else None
+                    )
+                    targ = ast.SubNodeList[ast.Expr](
+                        items=[kid[0]], delim=Tok.COMMA, kid=[kid[0]]
+                    )
                     kid[0] = targ
                     return self.nu(
                         ast.Assignment(
                             target=targ,
-                            value=kid[2],
+                            value=None,
                             type_tag=None,
                             kid=kid,
+                            semstr=semstr,
+                            is_enum_stmt=True,
                         )
                     )
+
             raise self.ice()
 
-        def ability(self, kid: list[ast.AstNode]) -> ast.Ability | ast.AbilityDef:
-            """Grammar rule.
+        def ability(
+            self, kid: list[ast.AstNode]
+        ) -> ast.Ability | ast.AbilityDef | ast.FuncCall:
+            """Grammer rule.
 
             ability: decorators? ability_def
                     | decorators? KW_ASYNC? ability_decl
+                    | decorators? genai_ability
             """
             chomp = [*kid]
             decorators = chomp[0] if isinstance(chomp[0], ast.SubNodeList) else None
@@ -744,7 +780,6 @@ class JacParser(Pass):
             chomp = chomp[1:] if semstr else chomp
             name = chomp[0]
             chomp = chomp[1:]
-            is_func = isinstance(chomp[0], ast.FuncSignature)
             signature = chomp[0]
             chomp = chomp[1:]
             body = chomp[0] if isinstance(chomp[0], ast.SubNodeList) else None
@@ -754,7 +789,6 @@ class JacParser(Pass):
                 return self.nu(
                     ast.Ability(
                         name_ref=name,
-                        is_func=is_func,
                         is_async=False,
                         is_override=is_override,
                         is_static=is_static,
@@ -790,6 +824,8 @@ class JacParser(Pass):
             else:
                 raise self.ice()
 
+        # 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, kid: list[ast.AstNode]) -> ast.Ability:
             """Grammar rule.
 
@@ -812,7 +848,6 @@ class JacParser(Pass):
             chomp = chomp[1:] if semstr else chomp
             name = chomp[0]
             chomp = chomp[1:]
-            is_func = isinstance(chomp[0], ast.FuncSignature)
             signature = chomp[0]
             chomp = chomp[1:]
             if isinstance(name, ast.NameSpec) and isinstance(
@@ -821,7 +856,6 @@ class JacParser(Pass):
                 return self.nu(
                     ast.Ability(
                         name_ref=name,
-                        is_func=is_func,
                         is_async=False,
                         is_override=is_override,
                         is_static=is_static,
@@ -836,6 +870,55 @@ class JacParser(Pass):
             else:
                 raise self.ice()
 
+        def genai_ability(self, kid: list[ast.AstNode]) -> ast.Ability:
+            """Grammar rule.
+
+            genai_ability: KW_OVERRIDE? KW_STATIC? KW_CAN access_tag? STRING?
+            any_ref (func_decl) KW_BY atomic_call SEMI
+            """
+            chomp = [*kid]
+            is_override = (
+                isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_OVERRIDE
+            )
+            chomp = chomp[1:] if is_override else chomp
+            is_static = (
+                isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_STATIC
+            )
+            chomp = chomp[1:] if is_static else chomp
+            chomp = chomp[1:]
+            access = chomp[0] if isinstance(chomp[0], ast.SubTag) else None
+            chomp = chomp[1:] if access else chomp
+            semstr = chomp[0] if isinstance(chomp[0], ast.String) else None
+            chomp = chomp[1:] if semstr else chomp
+            name = chomp[0]
+            chomp = chomp[1:]
+            signature = chomp[0]
+            chomp = chomp[1:]
+            has_by = isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_BY
+            chomp = chomp[1:] if has_by else chomp
+            if (
+                isinstance(name, ast.NameSpec)
+                and isinstance(signature, (ast.FuncSignature, ast.EventSignature))
+                and isinstance(chomp[0], ast.FuncCall)
+                and has_by
+            ):
+                return self.nu(
+                    ast.Ability(
+                        name_ref=name,
+                        is_async=False,
+                        is_override=is_override,
+                        is_static=is_static,
+                        is_abstract=False,
+                        access=access,
+                        semstr=semstr,
+                        signature=signature,
+                        body=chomp[0],
+                        kid=kid,
+                    )
+                )
+            else:
+                raise self.ice()
+
         def event_clause(self, kid: list[ast.AstNode]) -> ast.EventSignature:
             """Grammar rule.
 
@@ -865,7 +948,7 @@ class JacParser(Pass):
         def func_decl(self, kid: list[ast.AstNode]) -> ast.FuncSignature:
             """Grammar rule.
 
-            func_decl: (LPAREN func_decl_params? RPAREN)? (STRING? RETURN_HINT expression)?
+            func_decl: (LPAREN func_decl_params? RPAREN)? (RETURN_HINT (STRING COLON)? expression)?
             """
             params = (
                 kid[1] if len(kid) > 1 and isinstance(kid[1], ast.SubNodeList) else None
@@ -875,7 +958,7 @@ class JacParser(Pass):
             )
             semstr = (
                 kid[-3]
-                if return_spec and len(kid) > 2 and isinstance(kid[-3], ast.String)
+                if return_spec and len(kid) > 3 and isinstance(kid[-3], ast.String)
                 else None
             )
             if (isinstance(params, ast.SubNodeList) or params is None) and (
@@ -901,6 +984,7 @@ class JacParser(Pass):
             """
             ret = ast.SubNodeList[ast.ParamVar](
                 items=[i for i in kid if isinstance(i, ast.ParamVar)],
+                delim=Tok.COMMA,
                 kid=kid,
             )
             return self.nu(ret)
@@ -908,7 +992,7 @@ class JacParser(Pass):
         def param_var(self, kid: list[ast.AstNode]) -> ast.ParamVar:
             """Grammar rule.
 
-            param_var: (STAR_POW | STAR_MUL)? STRING? NAME type_tag (EQ expression)?
+            param_var: (STAR_POW | STAR_MUL)? NAME (COLON STRING)? type_tag (EQ expression)?
             """
             star = (
                 kid[0]
@@ -917,18 +1001,22 @@ class JacParser(Pass):
                 and not isinstance(kid[0], ast.String)
                 else None
             )
+            name = kid[1] if (star) else kid[0]
+            value = kid[-1] if isinstance(kid[-1], ast.Expr) else None
+            type_tag = kid[-3] if value else kid[-1]
             semstr = (
-                kid[1]
-                if (star and isinstance(kid[1], ast.String))
-                else kid[0] if isinstance(kid[0], ast.String) else None
-            )
-            name = (
-                kid[2] if (star and semstr) else kid[1] if (star or semstr) else kid[0]
-            )
-            type_tag = (
-                kid[3] if (star and semstr) else kid[2] if (star or semstr) else kid[1]
+                kid[3]
+                if star and len(kid) > 3 and isinstance(kid[3], ast.String)
+                else (
+                    kid[2]
+                    if len(kid) > 4 and value and isinstance(kid[2], ast.String)
+                    else (
+                        kid[2]
+                        if len(kid) > 2 and isinstance(kid[2], ast.String)
+                        else None
+                    )
+                )
             )
-            value = kid[-1] if isinstance(kid[-1], ast.Expr) else None
             if isinstance(name, ast.Name) and isinstance(type_tag, ast.SubTag):
                 return self.nu(
                     ast.ParamVar(
@@ -952,9 +1040,12 @@ class JacParser(Pass):
             """
             ret = ast.SubNodeList[ast.ArchBlockStmt](
                 items=[],
+                delim=Tok.WS,
                 kid=kid,
             )
             ret.items = [i for i in kid if isinstance(i, ast.ArchBlockStmt)]
+            ret.left_enc = kid[0] if isinstance(kid[0], ast.Token) else None
+            ret.right_enc = kid[-1] if isinstance(kid[-1], ast.Token) else None
             return self.nu(ret)
 
         def member_stmt(self, kid: list[ast.AstNode]) -> ast.ArchBlockStmt:
@@ -1030,6 +1121,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.HasVar](
                     items=valid_kid,
+                    delim=Tok.COMMA,
                     kid=new_kid,
                 )
             )
@@ -1037,12 +1129,12 @@ class JacParser(Pass):
         def typed_has_clause(self, kid: list[ast.AstNode]) -> ast.HasVar:
             """Grammar rule.
 
-            typed_has_clause: STRING? named_ref type_tag (EQ expression | KW_BY POST_INIT_OP)?
+            typed_has_clause: named_ref (COLON STRING)? type_tag (EQ expression | KW_BY KW_POST_INIT)?
             """
-            semstr = kid[0] if isinstance(kid[0], ast.String) else None
-            name = kid[1] if semstr else kid[0]
-            type_tag = kid[2] if semstr else kid[1]
-            defer = isinstance(kid[-1], ast.Token) and kid[-1].name == Tok.POST_INIT_OP
+            name = kid[0]
+            semstr = kid[2] if len(kid) > 2 and isinstance(kid[2], ast.String) else None
+            type_tag = kid[3] if semstr else kid[1]
+            defer = isinstance(kid[-1], ast.Token) and kid[-1].name == Tok.KW_POST_INIT
             value = kid[-1] if not defer and isinstance(kid[-1], ast.Expr) else None
             if isinstance(name, ast.Name) and isinstance(type_tag, ast.SubTag):
                 return self.nu(
@@ -1099,7 +1191,6 @@ class JacParser(Pass):
                         col_end=kid[0].loc.col_end,
                         pos_start=kid[0].pos_start,
                         pos_end=kid[0].pos_end,
-                        kid=kid[0].kid,
                     )
                 )
             else:
@@ -1110,32 +1201,18 @@ class JacParser(Pass):
         ) -> ast.SubNodeList[ast.CodeBlockStmt]:
             """Grammar rule.
 
-            code_block: LBRACE statement_list* RBRACE
-            """
-            if isinstance(kid[1], ast.SubNodeList):
-                kid[1].add_kids_left([kid[0]])
-                kid[1].add_kids_right([kid[2]])
-                return self.nu(kid[1])
-            else:
-                return self.nu(
-                    ast.SubNodeList[ast.CodeBlockStmt](
-                        items=[],
-                        kid=kid,
-                    )
-                )
-
-        def statement_list(
-            self, kid: list[ast.AstNode]
-        ) -> ast.SubNodeList[ast.CodeBlockStmt]:
-            """Grammar rule.
-
-            statement_list: statement+
+            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):
+            if len(valid_stmt) == len(kid) - 2:
                 return self.nu(
                     ast.SubNodeList[ast.CodeBlockStmt](
                         items=valid_stmt,
+                        delim=Tok.WS,
+                        left_enc=left_enc,
+                        right_enc=right_enc,
                         kid=kid,
                     )
                 )
@@ -1305,6 +1382,7 @@ class JacParser(Pass):
                 return self.nu(
                     ast.SubNodeList[ast.Except](
                         items=valid_kid,
+                        delim=Tok.WS,
                         kid=kid,
                     )
                 )
@@ -1453,6 +1531,7 @@ class JacParser(Pass):
             """
             ret = ast.SubNodeList[ast.ExprAsItem](
                 items=[i for i in kid if isinstance(i, ast.ExprAsItem)],
+                delim=Tok.COMMA,
                 kid=kid,
             )
             return self.nu(ret)
@@ -1675,70 +1754,66 @@ class JacParser(Pass):
         def assignment(self, kid: list[ast.AstNode]) -> ast.Assignment:
             """Grammar rule.
 
-            assignment: KW_LET? (atomic_chain EQ)+ (yield_stmt | expression)
-                    | atomic_chain type_tag (EQ (yield_stmt | expression))?
-                    | atomic_chain aug_op (yield_stmt | expression)
+            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)
             """
             chomp = [*kid]
             is_frozen = isinstance(chomp[0], ast.Token) and chomp[0].name == Tok.KW_LET
             is_aug = None
             assignees = []
             chomp = chomp[1:] if is_frozen else chomp
-            if (
-                len(chomp) > 1
-                and isinstance(chomp[1], ast.Token)
-                and chomp[1].name != Tok.EQ
-            ):
-                assignees += [chomp[0]]
-                is_aug = chomp[1]
-                chomp = chomp[2:]
-            elif (
-                len(chomp) > 1
-                and isinstance(chomp[1], ast.Token)
-                and chomp[1].name == Tok.EQ
-            ):
-                while (
-                    isinstance(chomp[0], ast.Expr)
-                    and len(chomp) > 1
-                    and isinstance(chomp[1], ast.Token)
-                    and chomp[1].name == Tok.EQ
-                ):
-                    assignees += [chomp[0], chomp[1]]
-                    chomp = chomp[2:]
-            elif isinstance(chomp[0], ast.Expr):
-                assignees += [chomp[0]]
-                chomp = chomp[1:]
-            else:
-                raise self.ice()
+            value = chomp[-1] if isinstance(chomp[-1], ast.Expr) else None
+            chomp = (
+                chomp[:-2]
+                if value and isinstance(chomp[-3], ast.SubTag)
+                else chomp[:-1] if value else chomp
+            )
+            type_tag = chomp[-1] if isinstance(chomp[-1], ast.SubTag) else None
+            if not value:
+                semstr = chomp[2] if len(chomp) > 2 else None
+            else:
+                if type_tag:
+                    chomp = chomp[:-1]
+                    semstr = (
+                        chomp[-1]
+                        if len(chomp) > 1 and isinstance(chomp[-1], ast.String)
+                        else None
+                    )
+                    chomp = chomp[:-2] if semstr else chomp
+                else:
+                    if (
+                        isinstance(chomp[1], ast.Token)
+                        and chomp[1].name != Tok.EQ
+                        and chomp[1].name != Tok.COLON
+                    ):
+                        assignees += [chomp[0]]
+                        is_aug = chomp[1]
+                        chomp = chomp[2:]
+                    else:
+                        while (
+                            len(chomp) > 1
+                            and isinstance(chomp[0], ast.Expr)
+                            and isinstance(chomp[1], ast.Token)
+                            and chomp[1].name == Tok.EQ
+                        ):
+                            assignees += [chomp[0], chomp[1]]
+                            chomp = chomp[2:]
+
+            assignees += chomp
             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 kid if x not in assignees]
             kid.insert(1, new_targ) if is_frozen else kid.insert(0, new_targ)
-            type_tag = (
-                chomp[0]
-                if len(chomp) > 0 and isinstance(chomp[0], ast.SubTag)
-                else None
-            )
-            chomp = chomp[1:] if type_tag else chomp
-            if (
-                len(chomp) > 0
-                and isinstance(chomp[0], ast.Token)
-                and chomp[0].name == Tok.EQ
-            ):
-                chomp = chomp[1:]
-            value = (
-                chomp[0]
-                if len(chomp) > 0 and isinstance(chomp[0], (ast.YieldExpr, ast.Expr))
-                else None
-            )
             if is_aug:
                 return self.nu(
                     ast.Assignment(
                         target=new_targ,
-                        type_tag=type_tag,
+                        type_tag=type_tag if isinstance(type_tag, ast.SubTag) else None,
                         value=value,
                         mutable=is_frozen,
                         aug_op=is_aug,
@@ -1748,7 +1823,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.Assignment(
                     target=new_targ,
-                    type_tag=type_tag,
+                    type_tag=type_tag if isinstance(type_tag, ast.SubTag) else None,
                     value=value,
                     mutable=is_frozen,
                     kid=kid,
@@ -2218,7 +2293,7 @@ class JacParser(Pass):
                         target=target,
                         right=chomp[0],
                         is_null_ok=is_null_ok,
-                        is_attr=None,
+                        is_attr=False,
                         kid=kid,
                     )
                 )
@@ -2233,7 +2308,7 @@ class JacParser(Pass):
                         target=(target if chomp[0].name != Tok.DOT_BKWD else chomp[1]),
                         right=(chomp[1] if chomp[0].name != Tok.DOT_BKWD else target),
                         is_null_ok=is_null_ok,
-                        is_attr=chomp[0],
+                        is_attr=True,
                         kid=kid,
                     )
                 )
@@ -2265,14 +2340,23 @@ class JacParser(Pass):
             if len(kid) == 1:
                 index = kid[0]
                 if isinstance(index, ast.ListVal):
-                    expr = index.values.items[0] if index.values else None
+                    if not index.values:
+                        raise self.ice()
+                    if len(index.values.items) == 1:
+                        expr = index.values.items[0] if index.values else None
+                    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])
+                        kid = [expr]
                     return self.nu(
                         ast.IndexSlice(
                             start=expr,
                             stop=None,
                             step=None,
                             is_range=False,
-                            kid=kid[0].kid,
+                            kid=kid,
                         )
                     )
                 else:
@@ -2321,7 +2405,7 @@ class JacParser(Pass):
                     and isinstance(kid[1], (ast.Expr, ast.YieldExpr))
                     and isinstance(kid[2], ast.Token)
                 ):
-                    ret = ast.AtomUnit(value=kid[1], is_paren=True, kid=kid)
+                    ret = ast.AtomUnit(value=kid[1], kid=kid)
                     return self.nu(ret)
                 else:
                     raise self.ice()
@@ -2438,6 +2522,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.String | ast.ExprStmt](
                     items=valid_parts,
+                    delim=None,
                     kid=valid_parts,
                 )
             )
@@ -2461,6 +2546,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.String | ast.ExprStmt](
                     items=valid_parts,
+                    delim=None,
                     kid=valid_parts,
                 )
             )
@@ -2551,6 +2637,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.Expr](
                     items=valid_kid,
+                    delim=Tok.COMMA,
                     kid=new_kid,
                 )
             )
@@ -2575,6 +2662,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.KWPair](
                     items=valid_kid,
+                    delim=Tok.COMMA,
                     kid=new_kid,
                 )
             )
@@ -2627,6 +2715,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.Name](
                     items=valid_kid,
+                    delim=Tok.COMMA,
                     kid=new_kid,
                 )
             )
@@ -2661,6 +2750,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.Expr | ast.KWPair](
                     items=valid_kid,
+                    delim=Tok.COMMA,
                     kid=kid,
                 )
             )
@@ -2776,7 +2866,7 @@ class JacParser(Pass):
         def inner_compr(self, kid: list[ast.AstNode]) -> ast.InnerCompr:
             """Grammar rule.
 
-            inner_compr: KW_ASYNC? KW_FOR atomic_chain KW_IN walrus_assign (KW_IF expression)?
+            inner_compr: KW_ASYNC? KW_FOR atomic_chain KW_IN pipe_call (KW_IF walrus_assign)*
             """
             chomp = [*kid]
             is_async = bool(
@@ -2791,7 +2881,7 @@ class JacParser(Pass):
                         target=chomp[0],
                         collection=chomp[2],
                         conditional=(
-                            chomp[4]
+                            [i for i in chomp[4:] if isinstance(i, ast.Expr)]
                             if len(chomp) > 4 and isinstance(chomp[4], ast.Expr)
                             else None
                         ),
@@ -2827,6 +2917,7 @@ class JacParser(Pass):
                     return self.nu(
                         ast.SubNodeList[ast.Expr | ast.KWPair](
                             items=valid_kid,
+                            delim=Tok.COMMA,
                             kid=kid,
                         )
                     )
@@ -2856,6 +2947,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.Assignment](
                     items=valid_kid,
+                    delim=Tok.COMMA,
                     kid=new_kid,
                 )
             )
@@ -3110,9 +3202,9 @@ class JacParser(Pass):
         def edge_ref_chain(self, kid: list[ast.AstNode]) -> ast.EdgeRefTrailer:
             """Grammar rule.
 
-            edge_ref_chain: (EDGE_OP|NODE_OP)? LSQUARE expression? (edge_op_ref expression?)+ RSQUARE
+            (EDGE_OP|NODE_OP)? LSQUARE expression? (edge_op_ref (filter_compr | expression)?)+ RSQUARE
             """
-            valid_chain = [i for i in kid if isinstance(i, (ast.Expr))]
+            valid_chain = [i for i in kid if isinstance(i, (ast.Expr, ast.FilterCompr))]
             return self.nu(
                 ast.EdgeRefTrailer(
                     chain=valid_chain,
@@ -3177,7 +3269,7 @@ class JacParser(Pass):
         def connect_op(self, kid: list[ast.AstNode]) -> ast.ConnectOp:
             """Grammar rule.
 
-            connect_op: EDGE_OP? (connect_from | connect_to)
+            connect_op: connect_from | connect_to | connect_any
             """
             if len(kid) < 2 and isinstance(kid[0], ast.ConnectOp):
                 return self.nu(kid[0])
@@ -3322,6 +3414,7 @@ class JacParser(Pass):
             return self.nu(
                 ast.SubNodeList[ast.CompareExpr](
                     items=valid_kid,
+                    delim=Tok.COMMA,
                     kid=new_kid,
                 )
             )
@@ -3362,7 +3455,7 @@ class JacParser(Pass):
         def assign_compr(self, kid: list[ast.AstNode]) -> ast.AssignCompr:
             """Grammar rule.
 
-            filter_compr: LPAREN STAR_MUL kw_expr_list RPAREN
+            filter_compr: LPAREN EQ kw_expr_list RPAREN
             """
             if isinstance(kid[2], ast.SubNodeList):
                 return self.nu(
@@ -3398,11 +3491,9 @@ class JacParser(Pass):
             """
             pattern = kid[1]
             guard = kid[3] if len(kid) > 4 else None
-            stmts = kid[-1]
-            if (
-                isinstance(pattern, ast.MatchPattern)
-                and isinstance(guard, (ast.Expr, type(None)))
-                and isinstance(stmts, ast.SubNodeList)
+            stmts = [i for i in kid if isinstance(i, ast.CodeBlockStmt)]
+            if isinstance(pattern, ast.MatchPattern) and isinstance(
+                guard, (ast.Expr, type(None))
             ):
                 return self.nu(
                     ast.MatchCase(
@@ -3665,6 +3756,7 @@ class JacParser(Pass):
             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=kid,
             )
 
@@ -3710,6 +3802,7 @@ class JacParser(Pass):
                 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,
                 )
             else:
@@ -3730,7 +3823,6 @@ 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,
                         is_kwesc=True,
-                        kid=[],
                     )
                 )
             elif token.type == Tok.NAME:
@@ -3769,6 +3861,5 @@ class JacParser(Pass):
                     col_end=token.end_column if token.end_column is not None else 0,
                     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,
-                    kid=[],
                 )
             )