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

Doc/library/ast.rst

@@ -43,12 +43,12 @@
 
 .. class:: AST
 
    This is the base of all AST node classes.  The actual node classes are
    derived from the :file:`Parser/Python.asdl` file, which is reproduced
    :ref:`above <abstract-grammar>`.  They are defined in the :mod:`_ast` C
    module and re-exported in :mod:`ast`.
 
    There is one class defined for each left-hand side symbol in the abstract
    grammar (for example, :class:`ast.stmt` or :class:`ast.expr`).  In addition,
    there is one class defined for each constructor on the right-hand side; these
    classes inherit from the classes for the left-hand side trees.  For example,
@@ -64,7 +64,7 @@
       Each concrete class has an attribute :attr:`_fields` which gives the names
       of all child nodes.
 
       Each instance of a concrete class has one attribute for each child node,
       of the type as defined in the grammar.  For example, :class:`ast.BinOp`
       instances have an attribute :attr:`left` of type :class:`ast.expr`.
 
@@ -79,7 +79,7 @@
                   end_lineno
                   end_col_offset
 
       Instances of :class:`ast.expr` and :class:`ast.stmt` subclasses have
       :attr:`lineno`, :attr:`col_offset`, :attr:`end_lineno`, and
       :attr:`end_col_offset` attributes.  The :attr:`lineno` and :attr:`end_lineno`
       are the first and last line numbers of source text span (1-indexed so the
@@ -93,9 +93,9 @@
       one can get the source segment of a one-line expression node using
       ``source_line[node.col_offset : node.end_col_offset]``.
 
    The constructor of a class :class:`ast.T` parses its arguments as follows:
 
    * If there are positional arguments, there must be as many as there are items
      in :attr:`T._fields`; they will be assigned as attributes of these names.
    * If there are keyword arguments, they will set the attributes of the same
      names to the given values.
@@ -1724,7 +1724,6 @@
             body=[
                 FunctionDef(
                     name='f',
-                    type_params=[],
                     args=arguments(
                         posonlyargs=[],
                         args=[
@@ -1749,7 +1748,8 @@
                     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=[])
 
 
@@ -1848,7 +1848,6 @@
             body=[
                 ClassDef(
                     name='Foo',
-                    type_params=[],
                     bases=[
                         Name(id='base1', ctx=Load()),
                         Name(id='base2', ctx=Load())],
@@ -1860,7 +1859,8 @@
                         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
@@ -1887,7 +1887,6 @@
         body=[
             AsyncFunctionDef(
                 name='f',
-                type_params=[],
                 args=arguments(
                     posonlyargs=[],
                     args=[],
@@ -1901,7 +1900,8 @@
                                 func=Name(id='other_func', ctx=Load()),
                                 args=[],
                                 keywords=[])))],
-                decorator_list=[])],
+                decorator_list=[],
+                type_params=[])],
         type_ignores=[])
 
 

Grammar/python.gram

@@ -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