add action helper for ClassDef

python · iritkatriel · Sep 10, 2024 · Sep 9, 2024 · Sep 9, 2024 · Sep 9, 2024
commit 031c6972cdb9e7328c83115bf7e2e81cc2921ba1
diff --git a/Grammar/python.gram b/Grammar/python.gram
@@ -254,10 +254,7 @@ class_def[stmt_ty]:
 class_def_raw[stmt_ty]:
     | invalid_class_def_raw
     | 'class' a=NAME t=[type_params] b=['(' z=[arguments] ')' { z }] ':' c=block {
-        _PyAST_ClassDef(a->v.Name.id,
-                     (b) ? ((expr_ty) b)->v.Call.args : NULL,
-                     (b) ? ((expr_ty) b)->v.Call.keywords : NULL,
-                     c, NULL, t, EXTRA) }
+        _PyPegen_class_def(a, b, c, t, EXTRA) }
 
 # Function definitions
 # --------------------

diff --git a/Parser/action_helpers.c b/Parser/action_helpers.c
@@ -746,6 +746,22 @@ _PyPegen_function_def_decorators(Parser *p, asdl_expr_seq *decorators, stmt_ty f
         function_def->end_lineno, function_def->end_col_offset, p->arena);
 }
 
+/* Construct a ClassDef */
+stmt_ty
+_PyPegen_class_def(expr_ty a, arguments_ty b, asdl_stmt_seq *c, asdl_type_param_seq *t,
+                   int lineno, int col_offset, int end_lineno, int end_col_offset,
+                   PyArena *arena)
+{
+    identifier name = a->v.Name.id;
+    asdl_expr_seq *bases = (b) ? ((expr_ty) b)->v.Call.args : NULL;
+    asdl_keyword_seq *keywords = (b) ? ((expr_ty) b)->v.Call.keywords : NULL;
+    asdl_stmt_seq *body = c;
+    asdl_expr_seq *decorator_list = NULL;
+    asdl_type_param_seq *type_params = t;
+    return _PyAST_ClassDef(name, bases, keywords, body, decorator_list, type_params,
+                           lineno, col_offset, end_lineno, end_col_offset, arena);
+}
+
 /* Construct a ClassDef equivalent to class_def, but with decorators */
 stmt_ty
 _PyPegen_class_def_decorators(Parser *p, asdl_expr_seq *decorators, stmt_ty class_def)

diff --git a/Parser/parser.c b/Parser/parser.c
diff --git a/Parser/pegen.h b/Parser/pegen.h
@@ -322,6 +322,8 @@ expr_ty _PyPegen_formatted_value(Parser *, expr_ty, Token *, ResultTokenWithMeta
                                  int, int, int, int, PyArena *);
 AugOperator *_PyPegen_augoperator(Parser*, operator_ty type);
 stmt_ty _PyPegen_function_def_decorators(Parser *, asdl_expr_seq *, stmt_ty);
+stmt_ty _PyPegen_class_def(expr_ty, arguments_ty, asdl_stmt_seq *,
+                           asdl_type_param_seq *, int, int, int, int, PyArena *);
 stmt_ty _PyPegen_class_def_decorators(Parser *, asdl_expr_seq *, stmt_ty);
 KeywordOrStarred *_PyPegen_keyword_or_starred(Parser *, void *, int);
 asdl_expr_seq *_PyPegen_seq_extract_starred_exprs(Parser *, asdl_seq *);