May 16, 2023 · Apr 9, 2023 · Apr 13, 2023 · Apr 13, 2023 · Apr 13, 2023 · Apr 13, 2023
diff --git a/Doc/library/ast.rst b/Doc/library/ast.rst
            body=[
                FunctionDef(
                    name='f',
                    typeparams=[],
                    args=arguments(
                        posonlyargs=[],
                        args=[
            body=[
                ClassDef(
                    name='Foo',
                    typeparams=[],
                    bases=[
                        Name(id='base1', ctx=Load()),
                        Name(id='base2', ctx=Load())],
        body=[
            AsyncFunctionDef(
                name='f',
                typeparams=[],
                args=arguments(
                    posonlyargs=[],
                    args=[],
diff --git a/Grammar/python.gram b/Grammar/python.gram
 # will throw a SyntaxError.
 simple_stmt[stmt_ty] (memo):
    | assignment
    | &"type" type_alias
    | e=star_expressions { _PyAST_Expr(e, EXTRA) }
    | &'return' return_stmt
    | &('import' | 'from') import_stmt

 class_def_raw[stmt_ty]:
    | invalid_class_def_raw
    | 'class' a=NAME b=['(' z=[arguments] ')' { z }] ':' c=block {
        _PyAST_ClassDef(a->v.Name.id,
    | 'class' a=NAMEt=[type_params]b=['(' z=[arguments] ')' { z }] ':' c=block {
        _PyAST_ClassDef(a->v.Name.id, t,
                     (b) ? ((expr_ty) b)->v.Call.args : NULL,
                     (b) ? ((expr_ty) b)->v.Call.keywords : NULL,
                     c, NULL, EXTRA) }

 function_def_raw[stmt_ty]:
    | invalid_def_raw
    | 'def' n=NAME &&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
        _PyAST_FunctionDef(n->v.Name.id,
    | 'def' n=NAMEt=[type_params]&&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
        _PyAST_FunctionDef(n->v.Name.id, t,
                        (params) ? params : CHECK(arguments_ty, _PyPegen_empty_arguments(p)),
                        b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA) }
    | ASYNC 'def' n=NAME &&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
    | ASYNC 'def' n=NAMEt=[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,
            _PyAST_AsyncFunctionDef(n->v.Name.id, t,
                            (params) ? params : CHECK(arguments_ty, _PyPegen_empty_arguments(p)),
                            b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA)
        ) }
 keyword_pattern[KeyPatternPair*]:
    | arg=NAME '=' value=pattern { _PyPegen_key_pattern_pair(p, arg, value) }

 # Type statement
 # ---------------

 type_alias[stmt_ty]:
    | "type" n=NAME t=[type_params] '=' b=expression {
        CHECK_VERSION(stmt_ty, 12, "Type statement is",
        _PyAST_TypeAlias(CHECK(expr_ty, _PyPegen_set_expr_context(p, n, Store)), t, b, EXTRA)) }

 # Type parameter declaration
 # --------------------------

 type_params[asdl_typeparam_seq*]: '[' t=type_param_seq  ']' {
        CHECK_VERSION(asdl_typeparam_seq *, 12, "Type parameter lists are", t) }

 type_param_seq[asdl_typeparam_seq*]: a[asdl_typeparam_seq*]=','.type_param+ [','] { a }

 type_param[typeparam_ty] (memo):
    | a=NAME b=[type_param_bound] { _PyAST_TypeVar(a->v.Name.id, b, EXTRA) }
    | '*' a=NAME colon=":" e=expression {
            RAISE_SYNTAX_ERROR_STARTING_FROM(colon, e->kind == Tuple_kind
                ? "cannot use constraints with TypeVarTuple"
                : "cannot use bound with TypeVarTuple")
        }
    | '*' a=NAME { _PyAST_TypeVarTuple(a->v.Name.id, EXTRA) }
    | '**' a=NAME colon=":" e=expression {
            RAISE_SYNTAX_ERROR_STARTING_FROM(colon, e->kind == Tuple_kind
                ? "cannot use constraints with ParamSpec"
                : "cannot use bound with ParamSpec")
        }
    | '**' a=NAME { _PyAST_ParamSpec(a->v.Name.id, EXTRA) }

 type_param_bound[expr_ty]: ":" e=expression { e }

 # EXPRESSIONS
 # -----------

diff --git a/Include/cpython/funcobject.h b/Include/cpython/funcobject.h
    PyObject *func_weakreflist; /* List of weak references */
    PyObject *func_module;      /* The __module__ attribute, can be anything */
    PyObject *func_annotations; /* Annotations, a dict or NULL */
    PyObject *func_typeparams;  /* Tuple of active type variables or NULL */
    vectorcallfunc vectorcall;
    /* Version number for use by specializer.
     * Can set to non-zero when we want to specialize.
diff --git a/Include/internal/pycore_ast.h b/Include/internal/pycore_ast.h
diff --git a/Include/internal/pycore_ast_state.h b/Include/internal/pycore_ast_state.h
diff --git a/Include/internal/pycore_function.h b/Include/internal/pycore_function.h
 extern PyFunctionObject* _PyFunction_FromConstructor(PyFrameConstructor *constr);

 extern uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func);
 extern PyObject *_Py_set_function_type_params(
    PyThreadState* unused, PyObject *func, PyObject *type_params);

 #ifdef __cplusplus
 }
diff --git a/Include/internal/pycore_global_objects.h b/Include/internal/pycore_global_objects.h
    PyObject *type_slots_pname;
    pytype_slotdef *type_slots_ptrs[MAX_EQUIV];

    /* TypeVar and related types */
    PyTypeObject *generic_type;
    PyTypeObject *typevar_type;
    PyTypeObject *typevartuple_type;
    PyTypeObject *paramspec_type;
    PyTypeObject *paramspecargs_type;
    PyTypeObject *paramspeckwargs_type;
    PyTypeObject *typealias_type;
 };

 #define _Py_INTERP_STATIC_OBJECT(interp, NAME) \
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1724,6 +1724,7 @@ Function and class definitions
		body=[
		FunctionDef(
		name='f',
		typeparams=[],
		args=arguments(
		posonlyargs=[],
		args=[
Expand DownExpand Up		@@ -1847,6 +1848,7 @@ Function and class definitions
		body=[
		ClassDef(
		name='Foo',
		typeparams=[],
		bases=[
		Name(id='base1', ctx=Load()),
		Name(id='base2', ctx=Load())],
Expand DownExpand Up		@@ -1885,6 +1887,7 @@ Async and await
		body=[
		AsyncFunctionDef(
		name='f',
		typeparams=[],
		args=arguments(
		posonlyargs=[],
		args=[],
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -112,6 +112,7 @@ simple_stmts[asdl_stmt_seq*]:
		# will throw a SyntaxError.
		simple_stmt[stmt_ty] (memo):
		\| assignment
		\| &"type" type_alias
		\| e=star_expressions { _PyAST_Expr(e, EXTRA) }
		\| &'return' return_stmt
		\| &('import' \| 'from') import_stmt
Expand DownExpand Up		@@ -252,8 +253,8 @@ class_def[stmt_ty]:

		class_def_raw[stmt_ty]:
		\| invalid_class_def_raw
		\| 'class' a=NAME b=['(' z=[arguments] ')' { z }] ':' c=block {
		_PyAST_ClassDef(a->v.Name.id,
		\| 'class' a=NAMEt=[type_params]b=['(' z=[arguments] ')' { z }] ':' c=block {
		_PyAST_ClassDef(a->v.Name.id, t,
		(b) ? ((expr_ty) b)->v.Call.args : NULL,
		(b) ? ((expr_ty) b)->v.Call.keywords : NULL,
		c, NULL, EXTRA) }
Expand All		@@ -267,16 +268,16 @@ function_def[stmt_ty]:

		function_def_raw[stmt_ty]:
		\| invalid_def_raw
		\| 'def' n=NAME &&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
		_PyAST_FunctionDef(n->v.Name.id,
		\| 'def' n=NAMEt=[type_params]&&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
		_PyAST_FunctionDef(n->v.Name.id, t,
		(params) ? params : CHECK(arguments_ty, _PyPegen_empty_arguments(p)),
		b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA) }
		\| ASYNC 'def' n=NAME &&'(' params=[params] ')' a=['->' z=expression { z }] &&':' tc=[func_type_comment] b=block {
		\| ASYNC 'def' n=NAMEt=[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,
		_PyAST_AsyncFunctionDef(n->v.Name.id, t,
		(params) ? params : CHECK(arguments_ty, _PyPegen_empty_arguments(p)),
		b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA)
		) }
Expand DownExpand Up		@@ -628,6 +629,39 @@ keyword_patterns[asdl_seq*]:
		keyword_pattern[KeyPatternPair*]:
		\| arg=NAME '=' value=pattern { _PyPegen_key_pattern_pair(p, arg, value) }

		# Type statement
		# ---------------

		type_alias[stmt_ty]:
		\| "type" n=NAME t=[type_params] '=' b=expression {
		CHECK_VERSION(stmt_ty, 12, "Type statement is",
		_PyAST_TypeAlias(CHECK(expr_ty, _PyPegen_set_expr_context(p, n, Store)), t, b, EXTRA)) }

		# Type parameter declaration
		# --------------------------

		type_params[asdl_typeparam_seq*]: '[' t=type_param_seq ']' {
		CHECK_VERSION(asdl_typeparam_seq *, 12, "Type parameter lists are", t) }

		type_param_seq[asdl_typeparam_seq]: a[asdl_typeparam_seq]=','.type_param+ [','] { a }

		type_param[typeparam_ty] (memo):
		\| a=NAME b=[type_param_bound] { _PyAST_TypeVar(a->v.Name.id, b, EXTRA) }
		\| '*' a=NAME colon=":" e=expression {
		RAISE_SYNTAX_ERROR_STARTING_FROM(colon, e->kind == Tuple_kind
		? "cannot use constraints with TypeVarTuple"
		: "cannot use bound with TypeVarTuple")
		}
		\| '*' a=NAME { _PyAST_TypeVarTuple(a->v.Name.id, EXTRA) }
		\| '**' a=NAME colon=":" e=expression {
		RAISE_SYNTAX_ERROR_STARTING_FROM(colon, e->kind == Tuple_kind
		? "cannot use constraints with ParamSpec"
		: "cannot use bound with ParamSpec")
		}
		\| '**' a=NAME { _PyAST_ParamSpec(a->v.Name.id, EXTRA) }

		type_param_bound[expr_ty]: ":" e=expression { e }

		# EXPRESSIONS
		# -----------

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -41,6 +41,7 @@ typedef struct {
		PyObject func_weakreflist; / List of weak references */
		PyObject func_module; / The __module__ attribute, can be anything */
		PyObject func_annotations; / Annotations, a dict or NULL */
		PyObject func_typeparams; / Tuple of active type variables or NULL */
		vectorcallfunc vectorcall;
		/* Version number for use by specializer.
		* Can set to non-zero when we want to specialize.
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -17,6 +17,8 @@ struct _py_func_state {
		extern PyFunctionObject* _PyFunction_FromConstructor(PyFrameConstructor *constr);

		extern uint32_t _PyFunction_GetVersionForCurrentState(PyFunctionObject *func);
		extern PyObject *_Py_set_function_type_params(
		PyThreadState* unused, PyObject func, PyObject type_params);

		#ifdef __cplusplus
		}
Expand Down