[3.12] gh-104799: Move location of type_params AST fields (GH-104828) (#104974)

gh-104799: Move location of type_params AST fields (GH-104828)
(cherry picked from commit ba73473)

Co-authored-by: Jelle Zijlstra <[email protected]>
Co-authored-by: Alex Waygood <[email protected]>

Author: 3 people

Doc/data/python3.12.abi

@@ -1821,7 +1821,6 @@ Function and class definitions
             body=[
                 FunctionDef(
                     name='f',
-                    type_params=[],
                     args=arguments(
                         posonlyargs=[],
                         args=[
@@ -1846,7 +1845,8 @@ Function and class definitions
                     decorator_list=[
                         Name(id='decorator1', ctx=Load()),
                         Name(id='decorator2', ctx=Load())],
-                    returns=Constant(value='return annotation'))],
+                    returns=Constant(value='return annotation'),
+                    type_params=[])],
             type_ignores=[])
 
 
@@ -1943,7 +1943,6 @@ Function and class definitions
             body=[
                 ClassDef(
                     name='Foo',
-                    type_params=[],
                     bases=[
                         Name(id='base1', ctx=Load()),
                         Name(id='base2', ctx=Load())],
@@ -1955,7 +1954,8 @@ Function and class definitions
                         Pass()],
                     decorator_list=[
                         Name(id='decorator1', ctx=Load()),
-                        Name(id='decorator2', ctx=Load())])],
+                        Name(id='decorator2', ctx=Load())],
+                    type_params=[])],
             type_ignores=[])
 
 Async and await
@@ -1982,7 +1982,6 @@ Async and await
         body=[
             AsyncFunctionDef(
                 name='f',
-                type_params=[],
                 args=arguments(
                     posonlyargs=[],
                     args=[],
@@ -1996,7 +1995,8 @@ Async and await
                                 func=Name(id='other_func', ctx=Load()),
                                 args=[],
                                 keywords=[])))],
-                decorator_list=[])],
+                decorator_list=[],
+                type_params=[])],
         type_ignores=[])
 
 

Doc/library/ast.rst

@@ -254,10 +254,10 @@ 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, t,
+        _PyAST_ClassDef(a->v.Name.id,
                      (b) ? ((expr_ty) b)->v.Call.args : NULL,
                      (b) ? ((expr_ty) b)->v.Call.keywords : NULL,
-                     c, NULL, EXTRA) }
+                     c, NULL, t, EXTRA) }
 
 # Function definitions
 # --------------------
@@ -269,17 +269,17 @@ function_def[stmt_ty]:
 function_def_raw[stmt_ty]:
     | invalid_def_raw
     | 'def' n=NAME t=[type_params] &&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
-        _PyAST_FunctionDef(n->v.Name.id, t,
+        _PyAST_FunctionDef(n->v.Name.id,
                         (params) ? params : CHECK(arguments_ty, _PyPegen_empty_arguments(p)),
-                        b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA) }
+                        b, NULL, a, NEW_TYPE_COMMENT(p, tc), t, EXTRA) }
     | ASYNC 'def' n=NAME t=[type_params] &&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
         CHECK_VERSION(
             stmt_ty,
             5,
             "Async functions are",
-            _PyAST_AsyncFunctionDef(n->v.Name.id, t,
+            _PyAST_AsyncFunctionDef(n->v.Name.id,
                             (params) ? params : CHECK(arguments_ty, _PyPegen_empty_arguments(p)),
-                            b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA)
+                            b, NULL, a, NEW_TYPE_COMMENT(p, tc), t, EXTRA)
         ) }
 
 # Function parameters