Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity
cpython/Python/Python-ast.c

17699 lines
587 KiB
C
Raw Normal View History

bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
// File automatically generated by Parser/asdl_c.py.
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
#include "Python.h"
bpo-43244: Remove Yield macro from pycore_ast.h (GH-25243) * pycore_ast.h no longer defines the Yield macro. * Fix a compiler warning on Windows: "warning C4005: 'Yield': macro redefinition". * Python-ast.c now defines directly functions with their real _Py_xxx() name, rather than xxx(). * Remove "#undef Yield" in C files including pycore_ast.h.
2021-04-07 08:01:09 -03:00
#include "pycore_ast.h"
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
#include "pycore_ast_state.h" // struct ast_state
#include "pycore_ceval.h" // _Py_EnterRecursiveCall
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
#include "pycore_lock.h" // _PyOnceFlag
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
#include "pycore_interp.h" // _PyInterpreterState.ast
#include "pycore_pystate.h" // _PyInterpreterState_GET()
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
#include "pycore_unionobject.h" // _Py_union_type_or
#include "structmember.h"
bpo-43244: Remove Yield macro from pycore_ast.h (GH-25243) * pycore_ast.h no longer defines the Yield macro. * Fix a compiler warning on Windows: "warning C4005: 'Yield': macro redefinition". * Python-ast.c now defines directly functions with their real _Py_xxx() name, rather than xxx(). * Remove "#undef Yield" in C files including pycore_ast.h.
2021-04-07 08:01:09 -03:00
#include <stddef.h>
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
struct validator {
int recursion_depth; /* current recursion depth */
int recursion_limit; /* recursion limit */
};
bpo-41631: _ast module uses again a global state (#21961) Partially revert commit ac46eb4ad6662cf6d771b20d8963658b2186c48c: "bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957)". Using a module state per module instance is causing subtle practical problems. For example, the Mercurial project replaces the __import__() function to implement lazy import, whereas Python expected that "import _ast" always return a fully initialized _ast module. Add _PyAST_Fini() to clear the state at exit. The _ast module has no state (set _astmodule.m_size to 0). Remove astmodule_traverse(), astmodule_clear() and astmodule_free() functions.
2020-09-15 13:03:34 -03:00
// Forward declaration
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int init_types(struct ast_state *state);
bpo-41631: _ast module uses again a global state (#21961) Partially revert commit ac46eb4ad6662cf6d771b20d8963658b2186c48c: "bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957)". Using a module state per module instance is causing subtle practical problems. For example, the Mercurial project replaces the __import__() function to implement lazy import, whereas Python expected that "import _ast" always return a fully initialized _ast module. Add _PyAST_Fini() to clear the state at exit. The _ast module has no state (set _astmodule.m_size to 0). Remove astmodule_traverse(), astmodule_clear() and astmodule_free() functions.
2020-09-15 13:03:34 -03:00
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static struct ast_state*
get_ast_state(void)
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
{
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
PyInterpreterState *interp = _PyInterpreterState_GET();
struct ast_state *state = &interp->ast;
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
assert(!state->finalized);
if (_PyOnceFlag_CallOnce(&state->once, (_Py_once_fn_t *)&init_types, state) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return NULL;
}
return state;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
void _PyAST_Fini(PyInterpreterState *interp)
bpo-41631: _ast module uses again a global state (#21961) Partially revert commit ac46eb4ad6662cf6d771b20d8963658b2186c48c: "bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957)". Using a module state per module instance is causing subtle practical problems. For example, the Mercurial project replaces the __import__() function to implement lazy import, whereas Python expected that "import _ast" always return a fully initialized _ast module. Add _PyAST_Fini() to clear the state at exit. The _ast module has no state (set _astmodule.m_size to 0). Remove astmodule_traverse(), astmodule_clear() and astmodule_free() functions.
2020-09-15 13:03:34 -03:00
{
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
struct ast_state *state = &interp->ast;
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->AST_type);
Py_CLEAR(state->Add_singleton);
Py_CLEAR(state->Add_type);
Py_CLEAR(state->And_singleton);
Py_CLEAR(state->And_type);
Py_CLEAR(state->AnnAssign_type);
Py_CLEAR(state->Assert_type);
Py_CLEAR(state->Assign_type);
Py_CLEAR(state->AsyncFor_type);
Py_CLEAR(state->AsyncFunctionDef_type);
Py_CLEAR(state->AsyncWith_type);
Py_CLEAR(state->Attribute_type);
Py_CLEAR(state->AugAssign_type);
Py_CLEAR(state->Await_type);
Py_CLEAR(state->BinOp_type);
Py_CLEAR(state->BitAnd_singleton);
Py_CLEAR(state->BitAnd_type);
Py_CLEAR(state->BitOr_singleton);
Py_CLEAR(state->BitOr_type);
Py_CLEAR(state->BitXor_singleton);
Py_CLEAR(state->BitXor_type);
Py_CLEAR(state->BoolOp_type);
Py_CLEAR(state->Break_type);
Py_CLEAR(state->Call_type);
Py_CLEAR(state->ClassDef_type);
Py_CLEAR(state->Compare_type);
Py_CLEAR(state->Constant_type);
Py_CLEAR(state->Continue_type);
Py_CLEAR(state->Del_singleton);
Py_CLEAR(state->Del_type);
Py_CLEAR(state->Delete_type);
Py_CLEAR(state->DictComp_type);
Py_CLEAR(state->Dict_type);
Py_CLEAR(state->Div_singleton);
Py_CLEAR(state->Div_type);
Py_CLEAR(state->Eq_singleton);
Py_CLEAR(state->Eq_type);
Py_CLEAR(state->ExceptHandler_type);
Py_CLEAR(state->Expr_type);
Py_CLEAR(state->Expression_type);
Py_CLEAR(state->FloorDiv_singleton);
Py_CLEAR(state->FloorDiv_type);
Py_CLEAR(state->For_type);
Py_CLEAR(state->FormattedValue_type);
Py_CLEAR(state->FunctionDef_type);
Py_CLEAR(state->FunctionType_type);
Py_CLEAR(state->GeneratorExp_type);
Py_CLEAR(state->Global_type);
Py_CLEAR(state->GtE_singleton);
Py_CLEAR(state->GtE_type);
Py_CLEAR(state->Gt_singleton);
Py_CLEAR(state->Gt_type);
Py_CLEAR(state->IfExp_type);
Py_CLEAR(state->If_type);
Py_CLEAR(state->ImportFrom_type);
Py_CLEAR(state->Import_type);
Py_CLEAR(state->In_singleton);
Py_CLEAR(state->In_type);
Py_CLEAR(state->Interactive_type);
Py_CLEAR(state->Invert_singleton);
Py_CLEAR(state->Invert_type);
Py_CLEAR(state->IsNot_singleton);
Py_CLEAR(state->IsNot_type);
Py_CLEAR(state->Is_singleton);
Py_CLEAR(state->Is_type);
Py_CLEAR(state->JoinedStr_type);
Py_CLEAR(state->LShift_singleton);
Py_CLEAR(state->LShift_type);
Py_CLEAR(state->Lambda_type);
Py_CLEAR(state->ListComp_type);
Py_CLEAR(state->List_type);
Py_CLEAR(state->Load_singleton);
Py_CLEAR(state->Load_type);
Py_CLEAR(state->LtE_singleton);
Py_CLEAR(state->LtE_type);
Py_CLEAR(state->Lt_singleton);
Py_CLEAR(state->Lt_type);
Py_CLEAR(state->MatMult_singleton);
Py_CLEAR(state->MatMult_type);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->MatchAs_type);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_CLEAR(state->MatchClass_type);
Py_CLEAR(state->MatchMapping_type);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->MatchOr_type);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_CLEAR(state->MatchSequence_type);
Py_CLEAR(state->MatchSingleton_type);
Py_CLEAR(state->MatchStar_type);
Py_CLEAR(state->MatchValue_type);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->Match_type);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->Mod_singleton);
Py_CLEAR(state->Mod_type);
Py_CLEAR(state->Module_type);
Py_CLEAR(state->Mult_singleton);
Py_CLEAR(state->Mult_type);
Py_CLEAR(state->Name_type);
Py_CLEAR(state->NamedExpr_type);
Py_CLEAR(state->Nonlocal_type);
Py_CLEAR(state->NotEq_singleton);
Py_CLEAR(state->NotEq_type);
Py_CLEAR(state->NotIn_singleton);
Py_CLEAR(state->NotIn_type);
Py_CLEAR(state->Not_singleton);
Py_CLEAR(state->Not_type);
Py_CLEAR(state->Or_singleton);
Py_CLEAR(state->Or_type);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
Py_CLEAR(state->ParamSpec_type);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->Pass_type);
Py_CLEAR(state->Pow_singleton);
Py_CLEAR(state->Pow_type);
Py_CLEAR(state->RShift_singleton);
Py_CLEAR(state->RShift_type);
Py_CLEAR(state->Raise_type);
Py_CLEAR(state->Return_type);
Py_CLEAR(state->SetComp_type);
Py_CLEAR(state->Set_type);
Py_CLEAR(state->Slice_type);
Py_CLEAR(state->Starred_type);
Py_CLEAR(state->Store_singleton);
Py_CLEAR(state->Store_type);
Py_CLEAR(state->Sub_singleton);
Py_CLEAR(state->Sub_type);
Py_CLEAR(state->Subscript_type);
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
Py_CLEAR(state->TryStar_type);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->Try_type);
Py_CLEAR(state->Tuple_type);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
Py_CLEAR(state->TypeAlias_type);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->TypeIgnore_type);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
Py_CLEAR(state->TypeVarTuple_type);
Py_CLEAR(state->TypeVar_type);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->UAdd_singleton);
Py_CLEAR(state->UAdd_type);
Py_CLEAR(state->USub_singleton);
Py_CLEAR(state->USub_type);
Py_CLEAR(state->UnaryOp_type);
Py_CLEAR(state->While_type);
Py_CLEAR(state->With_type);
Py_CLEAR(state->YieldFrom_type);
Py_CLEAR(state->Yield_type);
Py_CLEAR(state->__dict__);
Py_CLEAR(state->__doc__);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->__match_args__);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->__module__);
Py_CLEAR(state->_attributes);
Py_CLEAR(state->_fields);
Py_CLEAR(state->alias_type);
Py_CLEAR(state->annotation);
Py_CLEAR(state->arg);
Py_CLEAR(state->arg_type);
Py_CLEAR(state->args);
Py_CLEAR(state->argtypes);
Py_CLEAR(state->arguments_type);
Py_CLEAR(state->asname);
Py_CLEAR(state->ast);
Py_CLEAR(state->attr);
Py_CLEAR(state->bases);
Py_CLEAR(state->body);
Py_CLEAR(state->boolop_type);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
Py_CLEAR(state->bound);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->cases);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->cause);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_CLEAR(state->cls);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->cmpop_type);
Py_CLEAR(state->col_offset);
Py_CLEAR(state->comparators);
Py_CLEAR(state->comprehension_type);
Py_CLEAR(state->context_expr);
Py_CLEAR(state->conversion);
Py_CLEAR(state->ctx);
Py_CLEAR(state->decorator_list);
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
Py_CLEAR(state->default_value);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->defaults);
Py_CLEAR(state->elt);
Py_CLEAR(state->elts);
Py_CLEAR(state->end_col_offset);
Py_CLEAR(state->end_lineno);
Py_CLEAR(state->exc);
Py_CLEAR(state->excepthandler_type);
Py_CLEAR(state->expr_context_type);
Py_CLEAR(state->expr_type);
Py_CLEAR(state->finalbody);
Py_CLEAR(state->format_spec);
Py_CLEAR(state->func);
Py_CLEAR(state->generators);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->guard);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->handlers);
Py_CLEAR(state->id);
Py_CLEAR(state->ifs);
Py_CLEAR(state->is_async);
Py_CLEAR(state->items);
Py_CLEAR(state->iter);
Py_CLEAR(state->key);
Py_CLEAR(state->keys);
Py_CLEAR(state->keyword_type);
Py_CLEAR(state->keywords);
Py_CLEAR(state->kind);
Py_CLEAR(state->kw_defaults);
Py_CLEAR(state->kwarg);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_CLEAR(state->kwd_attrs);
Py_CLEAR(state->kwd_patterns);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->kwonlyargs);
Py_CLEAR(state->left);
Py_CLEAR(state->level);
Py_CLEAR(state->lineno);
Py_CLEAR(state->lower);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->match_case_type);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->mod_type);
Py_CLEAR(state->module);
Py_CLEAR(state->msg);
Py_CLEAR(state->name);
Py_CLEAR(state->names);
Py_CLEAR(state->op);
Py_CLEAR(state->operand);
Py_CLEAR(state->operator_type);
Py_CLEAR(state->ops);
Py_CLEAR(state->optional_vars);
Py_CLEAR(state->orelse);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->pattern);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_CLEAR(state->pattern_type);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->patterns);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->posonlyargs);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_CLEAR(state->rest);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->returns);
Py_CLEAR(state->right);
Py_CLEAR(state->simple);
Py_CLEAR(state->slice);
Py_CLEAR(state->step);
Py_CLEAR(state->stmt_type);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_CLEAR(state->subject);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->tag);
Py_CLEAR(state->target);
Py_CLEAR(state->targets);
Py_CLEAR(state->test);
Py_CLEAR(state->type);
Py_CLEAR(state->type_comment);
Py_CLEAR(state->type_ignore_type);
Py_CLEAR(state->type_ignores);
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
Py_CLEAR(state->type_param_type);
Py_CLEAR(state->type_params);
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
Py_CLEAR(state->unaryop_type);
Py_CLEAR(state->upper);
Py_CLEAR(state->value);
Py_CLEAR(state->values);
Py_CLEAR(state->vararg);
Py_CLEAR(state->withitem_type);
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
gh-100227: Move _str_replace_inf to PyInterpreterState (gh-102333) https://github.com/python/cpython/issues/100227
2023-02-28 17:16:39 -04:00
Py_CLEAR(_Py_INTERP_CACHED_OBJECT(interp, str_replace_inf));
gh-81057: Move Global Variables Holding Objects to _PyRuntimeState. (gh-99487) This moves nearly all remaining object-holding globals in core code (other than static types). https://github.com/python/cpython/issues/81057
2022-11-14 16:50:56 -04:00
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
state->finalized = 1;
state->once = (_PyOnceFlag){0};
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int init_identifiers(struct ast_state *state)
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
{
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if ((state->__dict__ = PyUnicode_InternFromString("__dict__")) == NULL) return -1;
if ((state->__doc__ = PyUnicode_InternFromString("__doc__")) == NULL) return -1;
if ((state->__match_args__ = PyUnicode_InternFromString("__match_args__")) == NULL) return -1;
if ((state->__module__ = PyUnicode_InternFromString("__module__")) == NULL) return -1;
if ((state->_attributes = PyUnicode_InternFromString("_attributes")) == NULL) return -1;
if ((state->_fields = PyUnicode_InternFromString("_fields")) == NULL) return -1;
if ((state->annotation = PyUnicode_InternFromString("annotation")) == NULL) return -1;
if ((state->arg = PyUnicode_InternFromString("arg")) == NULL) return -1;
if ((state->args = PyUnicode_InternFromString("args")) == NULL) return -1;
if ((state->argtypes = PyUnicode_InternFromString("argtypes")) == NULL) return -1;
if ((state->asname = PyUnicode_InternFromString("asname")) == NULL) return -1;
if ((state->ast = PyUnicode_InternFromString("ast")) == NULL) return -1;
if ((state->attr = PyUnicode_InternFromString("attr")) == NULL) return -1;
if ((state->bases = PyUnicode_InternFromString("bases")) == NULL) return -1;
if ((state->body = PyUnicode_InternFromString("body")) == NULL) return -1;
if ((state->bound = PyUnicode_InternFromString("bound")) == NULL) return -1;
if ((state->cases = PyUnicode_InternFromString("cases")) == NULL) return -1;
if ((state->cause = PyUnicode_InternFromString("cause")) == NULL) return -1;
if ((state->cls = PyUnicode_InternFromString("cls")) == NULL) return -1;
if ((state->col_offset = PyUnicode_InternFromString("col_offset")) == NULL) return -1;
if ((state->comparators = PyUnicode_InternFromString("comparators")) == NULL) return -1;
if ((state->context_expr = PyUnicode_InternFromString("context_expr")) == NULL) return -1;
if ((state->conversion = PyUnicode_InternFromString("conversion")) == NULL) return -1;
if ((state->ctx = PyUnicode_InternFromString("ctx")) == NULL) return -1;
if ((state->decorator_list = PyUnicode_InternFromString("decorator_list")) == NULL) return -1;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
if ((state->default_value = PyUnicode_InternFromString("default_value")) == NULL) return -1;
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if ((state->defaults = PyUnicode_InternFromString("defaults")) == NULL) return -1;
if ((state->elt = PyUnicode_InternFromString("elt")) == NULL) return -1;
if ((state->elts = PyUnicode_InternFromString("elts")) == NULL) return -1;
if ((state->end_col_offset = PyUnicode_InternFromString("end_col_offset")) == NULL) return -1;
if ((state->end_lineno = PyUnicode_InternFromString("end_lineno")) == NULL) return -1;
if ((state->exc = PyUnicode_InternFromString("exc")) == NULL) return -1;
if ((state->finalbody = PyUnicode_InternFromString("finalbody")) == NULL) return -1;
if ((state->format_spec = PyUnicode_InternFromString("format_spec")) == NULL) return -1;
if ((state->func = PyUnicode_InternFromString("func")) == NULL) return -1;
if ((state->generators = PyUnicode_InternFromString("generators")) == NULL) return -1;
if ((state->guard = PyUnicode_InternFromString("guard")) == NULL) return -1;
if ((state->handlers = PyUnicode_InternFromString("handlers")) == NULL) return -1;
if ((state->id = PyUnicode_InternFromString("id")) == NULL) return -1;
if ((state->ifs = PyUnicode_InternFromString("ifs")) == NULL) return -1;
if ((state->is_async = PyUnicode_InternFromString("is_async")) == NULL) return -1;
if ((state->items = PyUnicode_InternFromString("items")) == NULL) return -1;
if ((state->iter = PyUnicode_InternFromString("iter")) == NULL) return -1;
if ((state->key = PyUnicode_InternFromString("key")) == NULL) return -1;
if ((state->keys = PyUnicode_InternFromString("keys")) == NULL) return -1;
if ((state->keywords = PyUnicode_InternFromString("keywords")) == NULL) return -1;
if ((state->kind = PyUnicode_InternFromString("kind")) == NULL) return -1;
if ((state->kw_defaults = PyUnicode_InternFromString("kw_defaults")) == NULL) return -1;
if ((state->kwarg = PyUnicode_InternFromString("kwarg")) == NULL) return -1;
if ((state->kwd_attrs = PyUnicode_InternFromString("kwd_attrs")) == NULL) return -1;
if ((state->kwd_patterns = PyUnicode_InternFromString("kwd_patterns")) == NULL) return -1;
if ((state->kwonlyargs = PyUnicode_InternFromString("kwonlyargs")) == NULL) return -1;
if ((state->left = PyUnicode_InternFromString("left")) == NULL) return -1;
if ((state->level = PyUnicode_InternFromString("level")) == NULL) return -1;
if ((state->lineno = PyUnicode_InternFromString("lineno")) == NULL) return -1;
if ((state->lower = PyUnicode_InternFromString("lower")) == NULL) return -1;
if ((state->module = PyUnicode_InternFromString("module")) == NULL) return -1;
if ((state->msg = PyUnicode_InternFromString("msg")) == NULL) return -1;
if ((state->name = PyUnicode_InternFromString("name")) == NULL) return -1;
if ((state->names = PyUnicode_InternFromString("names")) == NULL) return -1;
if ((state->op = PyUnicode_InternFromString("op")) == NULL) return -1;
if ((state->operand = PyUnicode_InternFromString("operand")) == NULL) return -1;
if ((state->ops = PyUnicode_InternFromString("ops")) == NULL) return -1;
if ((state->optional_vars = PyUnicode_InternFromString("optional_vars")) == NULL) return -1;
if ((state->orelse = PyUnicode_InternFromString("orelse")) == NULL) return -1;
if ((state->pattern = PyUnicode_InternFromString("pattern")) == NULL) return -1;
if ((state->patterns = PyUnicode_InternFromString("patterns")) == NULL) return -1;
if ((state->posonlyargs = PyUnicode_InternFromString("posonlyargs")) == NULL) return -1;
if ((state->rest = PyUnicode_InternFromString("rest")) == NULL) return -1;
if ((state->returns = PyUnicode_InternFromString("returns")) == NULL) return -1;
if ((state->right = PyUnicode_InternFromString("right")) == NULL) return -1;
if ((state->simple = PyUnicode_InternFromString("simple")) == NULL) return -1;
if ((state->slice = PyUnicode_InternFromString("slice")) == NULL) return -1;
if ((state->step = PyUnicode_InternFromString("step")) == NULL) return -1;
if ((state->subject = PyUnicode_InternFromString("subject")) == NULL) return -1;
if ((state->tag = PyUnicode_InternFromString("tag")) == NULL) return -1;
if ((state->target = PyUnicode_InternFromString("target")) == NULL) return -1;
if ((state->targets = PyUnicode_InternFromString("targets")) == NULL) return -1;
if ((state->test = PyUnicode_InternFromString("test")) == NULL) return -1;
if ((state->type = PyUnicode_InternFromString("type")) == NULL) return -1;
if ((state->type_comment = PyUnicode_InternFromString("type_comment")) == NULL) return -1;
if ((state->type_ignores = PyUnicode_InternFromString("type_ignores")) == NULL) return -1;
if ((state->type_params = PyUnicode_InternFromString("type_params")) == NULL) return -1;
if ((state->upper = PyUnicode_InternFromString("upper")) == NULL) return -1;
if ((state->value = PyUnicode_InternFromString("value")) == NULL) return -1;
if ((state->values = PyUnicode_InternFromString("values")) == NULL) return -1;
if ((state->vararg = PyUnicode_InternFromString("vararg")) == NULL) return -1;
return 0;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
};
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
GENERATE_ASDL_SEQ_CONSTRUCTOR(mod, mod_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(stmt, stmt_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(expr, expr_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(comprehension, comprehension_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(excepthandler, excepthandler_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(arguments, arguments_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(arg, arg_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(keyword, keyword_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(alias, alias_ty)
GENERATE_ASDL_SEQ_CONSTRUCTOR(withitem, withitem_ty)
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
GENERATE_ASDL_SEQ_CONSTRUCTOR(match_case, match_case_ty)
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
GENERATE_ASDL_SEQ_CONSTRUCTOR(pattern, pattern_ty)
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
GENERATE_ASDL_SEQ_CONSTRUCTOR(type_ignore, type_ignore_ty)
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
GENERATE_ASDL_SEQ_CONSTRUCTOR(type_param, type_param_ty)
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_mod(struct ast_state *state, struct validator *vstate,
void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Module_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"body",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_ignores",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Interactive_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"body",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Expression_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"body",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const FunctionType_fields[]={
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"argtypes",
"returns",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const stmt_attributes[] = {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"lineno",
"col_offset",
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
"end_lineno",
"end_col_offset",
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_stmt(struct ast_state *state, struct validator
*vstate, void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const FunctionDef_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"name",
"args",
"body",
"decorator_list",
"returns",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
"type_params",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const AsyncFunctionDef_fields[]={
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
"name",
"args",
"body",
"decorator_list",
"returns",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
"type_params",
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const ClassDef_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"name",
"bases",
"keywords",
"body",
"decorator_list",
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
"type_params",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Return_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"value",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Delete_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"targets",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Assign_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"targets",
"value",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
static const char * const TypeAlias_fields[]={
"name",
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
"type_params",
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
"value",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const AugAssign_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"target",
"op",
"value",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const AnnAssign_fields[]={
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
"target",
"annotation",
"value",
"simple",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const For_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"target",
"iter",
"body",
"orelse",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const AsyncFor_fields[]={
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
"target",
"iter",
"body",
"orelse",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const While_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"test",
"body",
"orelse",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const If_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"test",
"body",
"orelse",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const With_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"items",
"body",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 18:32:47 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const AsyncWith_fields[]={
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
"items",
"body",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
};
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
static const char * const Match_fields[]={
"subject",
"cases",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Raise_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"exc",
"cause",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Try_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"body",
"handlers",
"orelse",
"finalbody",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
static const char * const TryStar_fields[]={
"body",
"handlers",
"orelse",
"finalbody",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Assert_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"test",
"msg",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Import_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"names",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const ImportFrom_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"module",
"names",
"level",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Global_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"names",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Nonlocal_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"names",
Provisional implementation of PEP 3104. Add nonlocal_stmt to Grammar and Nonlocal node to AST. They both parallel the definitions for globals. The symbol table treats variables declared as nonlocal just like variables that are free implicitly. This change is missing the language spec changes, but makes some decisions about what the spec should say via the unittests. The PEP is silent on a number of decisions, so we should review those before claiming that nonlocal is complete. Thomas Wouters made the grammer and ast changes. Jeremy Hylton added the symbol table changes and the tests. Pete Shinners and Neal Norwitz helped review the code.
2007-02-27 02:50:52 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Expr_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"value",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const expr_attributes[] = {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"lineno",
"col_offset",
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
"end_lineno",
"end_col_offset",
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_expr(struct ast_state *state, struct validator
*vstate, void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const BoolOp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"op",
"values",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const NamedExpr_fields[]={
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
"target",
"value",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const BinOp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"left",
"op",
"right",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const UnaryOp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"op",
"operand",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Lambda_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"args",
"body",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const IfExp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"test",
"body",
"orelse",
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-26 20:24:13 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Dict_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"keys",
"values",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Set_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"elts",
SF patch 1547796 by Georg Brandl -- set literals.
2006-08-28 12:27:34 -03:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const ListComp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"elt",
"generators",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const SetComp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"elt",
"generators",
Hide list comp variables and support set comprehensions
2007-04-15 09:05:43 -03:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const DictComp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"key",
"value",
"generators",
Merged revisions 56154-56264 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line Get this test working after converting map to return an iterator ................ r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines Merged revisions 56124-56201 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines Document smtp.SMTPAuthenticationError. ........ r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines Fix a few webbrowser.py problems. ........ r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines Remove duplicate sentence from alarm() doc. ........ r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines copy built files to the PCBuild directory, where tools like distutils or external build processes can find them. ........ r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines Many calls to tk.call involve an arglist containing a single tuple. Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG don't. Tcl's concatenation of args was affected; IDLE doesn't start. Modify Tkapp_Call() to unpack single tuple arglists. Bug 1733943 Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html ........ r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line Fix typo in comment ........ ................ r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line Get working with map returning an iterator (had to fix whitespace too) ................ r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines Clean up merge glitch or copy-paste error (the entire module was duplicated, except the first half even had some more copy-paste errors, referring to listcomps and genexps instead of setcomps) ................ r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines Dict comprehensions. Still needs doc changes (like many python-3000 features ;-). It generates bytecode similar to: x = {} for k, v in (generator here): x[k] = v except there is no tuple-packing and -unpacking involved. Trivial measurement suggests it's significantly faster than dict(generator here) (in the order of 2 to 3 times as fast) but I have not done extensive measurements. ................ r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................
2007-07-11 10:09:30 -03:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const GeneratorExp_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"elt",
"generators",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Await_fields[]={
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
"value",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Yield_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"value",
make YieldFrom its own distinct from Yield (closes #13780)
2012-01-14 09:58:23 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const YieldFrom_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"value",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Compare_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"left",
"ops",
"comparators",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Call_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"func",
"args",
"keywords",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const FormattedValue_fields[]={
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
"value",
"conversion",
"format_spec",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const JoinedStr_fields[]={
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
"values",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Constant_fields[]={
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
"value",
bpo-36280: Add Constant.kind field (GH-12295) The value is a string for string and byte literals, None otherwise. It is 'u' for u"..." literals, 'b' for b"..." literals, '' for "..." literals. The 'r' (raw) prefix is ignored. Does not apply to f-strings. This appears sufficient to make mypy capable of using the stdlib ast module instead of typed_ast (assuming a mypy patch I'm working on). WIP: I need to make the tests pass. @ilevkivskyi @serhiy-storchaka https://bugs.python.org/issue36280
2019-03-13 17:00:46 -03:00
"kind",
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Attribute_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"value",
"attr",
"ctx",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Subscript_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"value",
"slice",
"ctx",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Starred_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"value",
"ctx",
Merged revisions 55225-55227,55229-55269 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55238 | guido.van.rossum | 2007-05-10 16:46:05 -0700 (Thu, 10 May 2007) | 9 lines Merged revisions 55227 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines Fix a bug in test_c_api() that caused a negative refcount. ........ ................ r55246 | neal.norwitz | 2007-05-11 00:01:52 -0700 (Fri, 11 May 2007) | 1 line Remove commands.getstatus() it is obsolete. ................ r55248 | neal.norwitz | 2007-05-11 00:29:05 -0700 (Fri, 11 May 2007) | 2 lines Remove bsddb185 support. ................ r55249 | neal.norwitz | 2007-05-11 00:29:50 -0700 (Fri, 11 May 2007) | 1 line Remove bsddb185 module too ................ r55250 | neal.norwitz | 2007-05-11 00:32:13 -0700 (Fri, 11 May 2007) | 1 line bsddb185: Gotta remove from the file checked in, not Setup ................ r55251 | neal.norwitz | 2007-05-11 00:53:26 -0700 (Fri, 11 May 2007) | 1 line Remove obsolete IRIX modules (as much as I could find, there is probably more) ................ r55252 | neal.norwitz | 2007-05-11 00:55:35 -0700 (Fri, 11 May 2007) | 1 line Remove SGI turd. ................ r55254 | georg.brandl | 2007-05-11 03:11:01 -0700 (Fri, 11 May 2007) | 2 lines Add a case for set comprehensions to the "cannot assign to" switch. ................ r55255 | georg.brandl | 2007-05-11 03:11:25 -0700 (Fri, 11 May 2007) | 2 lines Fix wrong imports. ................ r55261 | georg.brandl | 2007-05-11 07:37:48 -0700 (Fri, 11 May 2007) | 2 lines Remove removed tex files. ................ r55262 | georg.brandl | 2007-05-11 08:28:41 -0700 (Fri, 11 May 2007) | 2 lines Commit PEP 3132 implementation. ................ r55264 | georg.brandl | 2007-05-11 08:50:19 -0700 (Fri, 11 May 2007) | 2 lines Check in the inevitable AST version number and format Py_ssize_t with %zd. ................ r55265 | neal.norwitz | 2007-05-11 09:12:22 -0700 (Fri, 11 May 2007) | 1 line Remove mention of os.popen* and popen2.* since these will be removed. ................ r55266 | neal.norwitz | 2007-05-11 09:19:57 -0700 (Fri, 11 May 2007) | 1 line Get doc to build again (almost, the doc is fine) ................ r55267 | neal.norwitz | 2007-05-11 09:21:02 -0700 (Fri, 11 May 2007) | 1 line Really get doc to build (remove use of string module) ................ r55269 | neal.norwitz | 2007-05-11 09:29:43 -0700 (Fri, 11 May 2007) | 1 line Add some notes to cleanup later ................
2007-05-11 13:50:42 -03:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Name_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"id",
"ctx",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const List_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"elts",
"ctx",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Tuple_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"elts",
"ctx",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const Slice_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"lower",
"upper",
"step",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_expr_context(struct ast_state *state, struct validator
*vstate, expr_context_ty);
static PyObject* ast2obj_boolop(struct ast_state *state, struct validator
*vstate, boolop_ty);
static PyObject* ast2obj_operator(struct ast_state *state, struct validator
*vstate, operator_ty);
static PyObject* ast2obj_unaryop(struct ast_state *state, struct validator
*vstate, unaryop_ty);
static PyObject* ast2obj_cmpop(struct ast_state *state, struct validator
*vstate, cmpop_ty);
static PyObject* ast2obj_comprehension(struct ast_state *state, struct
validator *vstate, void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const comprehension_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"target",
"iter",
"ifs",
Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 14:36:01 -03:00
"is_async",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const excepthandler_attributes[] = {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"lineno",
"col_offset",
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
"end_lineno",
"end_col_offset",
Merged revisions 62047 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62047 | georg.brandl | 2008-03-29 23:40:17 -0700 (Sat, 29 Mar 2008) | 2 lines Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. ........
2008-03-31 02:14:30 -03:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_excepthandler(struct ast_state *state, struct
validator *vstate, void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const ExceptHandler_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"type",
"name",
"body",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_arguments(struct ast_state *state, struct validator
*vstate, void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const arguments_fields[]={
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
"posonlyargs",
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
"args",
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"vararg",
"kwonlyargs",
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
"kw_defaults",
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"kwarg",
"defaults",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_arg(struct ast_state *state, struct validator *vstate,
void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const arg_attributes[] = {
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
"lineno",
"col_offset",
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
"end_lineno",
"end_col_offset",
unify some ast.argument's attrs; change Attribute column offset (closes #16795) Patch from Sven Brauch.
2013-03-18 14:48:58 -03:00
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const arg_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"arg",
"annotation",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"type_comment",
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_keyword(struct ast_state *state, struct validator
*vstate, void*);
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
static const char * const keyword_attributes[] = {
"lineno",
"col_offset",
"end_lineno",
"end_col_offset",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const keyword_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"arg",
"value",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_alias(struct ast_state *state, struct validator
*vstate, void*);
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
static const char * const alias_attributes[] = {
"lineno",
"col_offset",
"end_lineno",
"end_col_offset",
};
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const alias_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"name",
"asname",
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_withitem(struct ast_state *state, struct validator
*vstate, void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const withitem_fields[]={
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
"context_expr",
"optional_vars",
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_match_case(struct ast_state *state, struct validator
*vstate, void*);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
static const char * const match_case_fields[]={
"pattern",
"guard",
"body",
};
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
static const char * const pattern_attributes[] = {
"lineno",
"col_offset",
"end_lineno",
"end_col_offset",
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_pattern(struct ast_state *state, struct validator
*vstate, void*);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
static const char * const MatchValue_fields[]={
"value",
};
static const char * const MatchSingleton_fields[]={
"value",
};
static const char * const MatchSequence_fields[]={
"patterns",
};
static const char * const MatchMapping_fields[]={
"keys",
"patterns",
"rest",
};
static const char * const MatchClass_fields[]={
"cls",
"patterns",
"kwd_attrs",
"kwd_patterns",
};
static const char * const MatchStar_fields[]={
"name",
};
static const char * const MatchAs_fields[]={
"pattern",
"name",
};
static const char * const MatchOr_fields[]={
"patterns",
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_type_ignore(struct ast_state *state, struct validator
*vstate, void*);
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static const char * const TypeIgnore_fields[]={
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
"lineno",
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
"tag",
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
};
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
static const char * const type_param_attributes[] = {
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
"lineno",
"col_offset",
"end_lineno",
"end_col_offset",
};
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_type_param(struct ast_state *state, struct validator
*vstate, void*);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
static const char * const TypeVar_fields[]={
"name",
"bound",
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
"default_value",
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
};
static const char * const ParamSpec_fields[]={
"name",
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
"default_value",
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
};
static const char * const TypeVarTuple_fields[]={
"name",
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
"default_value",
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
};
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
static int
add_ast_annotations(struct ast_state *state)
{
bool cond;
PyObject *Module_annotations = PyDict_New();
if (!Module_annotations) return 0;
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Module_annotations);
return 0;
}
cond = PyDict_SetItemString(Module_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Module_annotations);
return 0;
}
}
{
PyObject *type = state->type_ignore_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Module_annotations);
return 0;
}
cond = PyDict_SetItemString(Module_annotations, "type_ignores", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Module_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Module_type, "_field_types",
Module_annotations) == 0;
if (!cond) {
Py_DECREF(Module_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Module_type, "__annotations__",
Module_annotations) == 0;
if (!cond) {
Py_DECREF(Module_annotations);
return 0;
}
Py_DECREF(Module_annotations);
PyObject *Interactive_annotations = PyDict_New();
if (!Interactive_annotations) return 0;
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Interactive_annotations);
return 0;
}
cond = PyDict_SetItemString(Interactive_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Interactive_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Interactive_type, "_field_types",
Interactive_annotations) == 0;
if (!cond) {
Py_DECREF(Interactive_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Interactive_type, "__annotations__",
Interactive_annotations) == 0;
if (!cond) {
Py_DECREF(Interactive_annotations);
return 0;
}
Py_DECREF(Interactive_annotations);
PyObject *Expression_annotations = PyDict_New();
if (!Expression_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Expression_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Expression_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Expression_type, "_field_types",
Expression_annotations) == 0;
if (!cond) {
Py_DECREF(Expression_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Expression_type, "__annotations__",
Expression_annotations) == 0;
if (!cond) {
Py_DECREF(Expression_annotations);
return 0;
}
Py_DECREF(Expression_annotations);
PyObject *FunctionType_annotations = PyDict_New();
if (!FunctionType_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(FunctionType_annotations);
return 0;
}
cond = PyDict_SetItemString(FunctionType_annotations, "argtypes", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionType_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(FunctionType_annotations, "returns", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionType_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->FunctionType_type, "_field_types",
FunctionType_annotations) == 0;
if (!cond) {
Py_DECREF(FunctionType_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->FunctionType_type, "__annotations__",
FunctionType_annotations) == 0;
if (!cond) {
Py_DECREF(FunctionType_annotations);
return 0;
}
Py_DECREF(FunctionType_annotations);
PyObject *FunctionDef_annotations = PyDict_New();
if (!FunctionDef_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(FunctionDef_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->arguments_type;
Py_INCREF(type);
cond = PyDict_SetItemString(FunctionDef_annotations, "args", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(FunctionDef_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(FunctionDef_annotations, "decorator_list",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(FunctionDef_annotations, "returns", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(FunctionDef_annotations, "type_comment",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->type_param_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(FunctionDef_annotations, "type_params",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->FunctionDef_type, "_field_types",
FunctionDef_annotations) == 0;
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->FunctionDef_type, "__annotations__",
FunctionDef_annotations) == 0;
if (!cond) {
Py_DECREF(FunctionDef_annotations);
return 0;
}
Py_DECREF(FunctionDef_annotations);
PyObject *AsyncFunctionDef_annotations = PyDict_New();
if (!AsyncFunctionDef_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(AsyncFunctionDef_annotations, "name", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->arguments_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AsyncFunctionDef_annotations, "args", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFunctionDef_annotations, "body", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFunctionDef_annotations,
"decorator_list", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFunctionDef_annotations, "returns",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFunctionDef_annotations,
"type_comment", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
}
{
PyObject *type = state->type_param_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFunctionDef_annotations,
"type_params", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->AsyncFunctionDef_type, "_field_types",
AsyncFunctionDef_annotations) == 0;
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->AsyncFunctionDef_type,
"__annotations__",
AsyncFunctionDef_annotations) == 0;
if (!cond) {
Py_DECREF(AsyncFunctionDef_annotations);
return 0;
}
Py_DECREF(AsyncFunctionDef_annotations);
PyObject *ClassDef_annotations = PyDict_New();
if (!ClassDef_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(ClassDef_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
cond = PyDict_SetItemString(ClassDef_annotations, "bases", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
}
{
PyObject *type = state->keyword_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
cond = PyDict_SetItemString(ClassDef_annotations, "keywords", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
cond = PyDict_SetItemString(ClassDef_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
cond = PyDict_SetItemString(ClassDef_annotations, "decorator_list",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
}
{
PyObject *type = state->type_param_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
cond = PyDict_SetItemString(ClassDef_annotations, "type_params", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->ClassDef_type, "_field_types",
ClassDef_annotations) == 0;
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->ClassDef_type, "__annotations__",
ClassDef_annotations) == 0;
if (!cond) {
Py_DECREF(ClassDef_annotations);
return 0;
}
Py_DECREF(ClassDef_annotations);
PyObject *Return_annotations = PyDict_New();
if (!Return_annotations) return 0;
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Return_annotations);
return 0;
}
cond = PyDict_SetItemString(Return_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Return_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Return_type, "_field_types",
Return_annotations) == 0;
if (!cond) {
Py_DECREF(Return_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Return_type, "__annotations__",
Return_annotations) == 0;
if (!cond) {
Py_DECREF(Return_annotations);
return 0;
}
Py_DECREF(Return_annotations);
PyObject *Delete_annotations = PyDict_New();
if (!Delete_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Delete_annotations);
return 0;
}
cond = PyDict_SetItemString(Delete_annotations, "targets", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Delete_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Delete_type, "_field_types",
Delete_annotations) == 0;
if (!cond) {
Py_DECREF(Delete_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Delete_type, "__annotations__",
Delete_annotations) == 0;
if (!cond) {
Py_DECREF(Delete_annotations);
return 0;
}
Py_DECREF(Delete_annotations);
PyObject *Assign_annotations = PyDict_New();
if (!Assign_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Assign_annotations);
return 0;
}
cond = PyDict_SetItemString(Assign_annotations, "targets", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Assign_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Assign_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Assign_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Assign_annotations);
return 0;
}
cond = PyDict_SetItemString(Assign_annotations, "type_comment", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Assign_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Assign_type, "_field_types",
Assign_annotations) == 0;
if (!cond) {
Py_DECREF(Assign_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Assign_type, "__annotations__",
Assign_annotations) == 0;
if (!cond) {
Py_DECREF(Assign_annotations);
return 0;
}
Py_DECREF(Assign_annotations);
PyObject *TypeAlias_annotations = PyDict_New();
if (!TypeAlias_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(TypeAlias_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeAlias_annotations);
return 0;
}
}
{
PyObject *type = state->type_param_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(TypeAlias_annotations);
return 0;
}
cond = PyDict_SetItemString(TypeAlias_annotations, "type_params", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeAlias_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(TypeAlias_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeAlias_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->TypeAlias_type, "_field_types",
TypeAlias_annotations) == 0;
if (!cond) {
Py_DECREF(TypeAlias_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->TypeAlias_type, "__annotations__",
TypeAlias_annotations) == 0;
if (!cond) {
Py_DECREF(TypeAlias_annotations);
return 0;
}
Py_DECREF(TypeAlias_annotations);
PyObject *AugAssign_annotations = PyDict_New();
if (!AugAssign_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AugAssign_annotations, "target", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AugAssign_annotations);
return 0;
}
}
{
PyObject *type = state->operator_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AugAssign_annotations, "op", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AugAssign_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AugAssign_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AugAssign_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->AugAssign_type, "_field_types",
AugAssign_annotations) == 0;
if (!cond) {
Py_DECREF(AugAssign_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->AugAssign_type, "__annotations__",
AugAssign_annotations) == 0;
if (!cond) {
Py_DECREF(AugAssign_annotations);
return 0;
}
Py_DECREF(AugAssign_annotations);
PyObject *AnnAssign_annotations = PyDict_New();
if (!AnnAssign_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AnnAssign_annotations, "target", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AnnAssign_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AnnAssign_annotations, "annotation", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AnnAssign_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(AnnAssign_annotations);
return 0;
}
cond = PyDict_SetItemString(AnnAssign_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AnnAssign_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyLong_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(AnnAssign_annotations, "simple", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AnnAssign_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->AnnAssign_type, "_field_types",
AnnAssign_annotations) == 0;
if (!cond) {
Py_DECREF(AnnAssign_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->AnnAssign_type, "__annotations__",
AnnAssign_annotations) == 0;
if (!cond) {
Py_DECREF(AnnAssign_annotations);
return 0;
}
Py_DECREF(AnnAssign_annotations);
PyObject *For_annotations = PyDict_New();
if (!For_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(For_annotations, "target", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(For_annotations, "iter", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
cond = PyDict_SetItemString(For_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
cond = PyDict_SetItemString(For_annotations, "orelse", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
cond = PyDict_SetItemString(For_annotations, "type_comment", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->For_type, "_field_types",
For_annotations) == 0;
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->For_type, "__annotations__",
For_annotations) == 0;
if (!cond) {
Py_DECREF(For_annotations);
return 0;
}
Py_DECREF(For_annotations);
PyObject *AsyncFor_annotations = PyDict_New();
if (!AsyncFor_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AsyncFor_annotations, "target", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(AsyncFor_annotations, "iter", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFor_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFor_annotations, "orelse", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncFor_annotations, "type_comment", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->AsyncFor_type, "_field_types",
AsyncFor_annotations) == 0;
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->AsyncFor_type, "__annotations__",
AsyncFor_annotations) == 0;
if (!cond) {
Py_DECREF(AsyncFor_annotations);
return 0;
}
Py_DECREF(AsyncFor_annotations);
PyObject *While_annotations = PyDict_New();
if (!While_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(While_annotations, "test", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(While_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(While_annotations);
return 0;
}
cond = PyDict_SetItemString(While_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(While_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(While_annotations);
return 0;
}
cond = PyDict_SetItemString(While_annotations, "orelse", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(While_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->While_type, "_field_types",
While_annotations) == 0;
if (!cond) {
Py_DECREF(While_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->While_type, "__annotations__",
While_annotations) == 0;
if (!cond) {
Py_DECREF(While_annotations);
return 0;
}
Py_DECREF(While_annotations);
PyObject *If_annotations = PyDict_New();
if (!If_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(If_annotations, "test", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(If_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(If_annotations);
return 0;
}
cond = PyDict_SetItemString(If_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(If_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(If_annotations);
return 0;
}
cond = PyDict_SetItemString(If_annotations, "orelse", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(If_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->If_type, "_field_types",
If_annotations) == 0;
if (!cond) {
Py_DECREF(If_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->If_type, "__annotations__",
If_annotations) == 0;
if (!cond) {
Py_DECREF(If_annotations);
return 0;
}
Py_DECREF(If_annotations);
PyObject *With_annotations = PyDict_New();
if (!With_annotations) return 0;
{
PyObject *type = state->withitem_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
cond = PyDict_SetItemString(With_annotations, "items", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
cond = PyDict_SetItemString(With_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
cond = PyDict_SetItemString(With_annotations, "type_comment", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->With_type, "_field_types",
With_annotations) == 0;
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->With_type, "__annotations__",
With_annotations) == 0;
if (!cond) {
Py_DECREF(With_annotations);
return 0;
}
Py_DECREF(With_annotations);
PyObject *AsyncWith_annotations = PyDict_New();
if (!AsyncWith_annotations) return 0;
{
PyObject *type = state->withitem_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncWith_annotations, "items", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncWith_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
cond = PyDict_SetItemString(AsyncWith_annotations, "type_comment",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->AsyncWith_type, "_field_types",
AsyncWith_annotations) == 0;
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->AsyncWith_type, "__annotations__",
AsyncWith_annotations) == 0;
if (!cond) {
Py_DECREF(AsyncWith_annotations);
return 0;
}
Py_DECREF(AsyncWith_annotations);
PyObject *Match_annotations = PyDict_New();
if (!Match_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Match_annotations, "subject", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Match_annotations);
return 0;
}
}
{
PyObject *type = state->match_case_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Match_annotations);
return 0;
}
cond = PyDict_SetItemString(Match_annotations, "cases", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Match_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Match_type, "_field_types",
Match_annotations) == 0;
if (!cond) {
Py_DECREF(Match_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Match_type, "__annotations__",
Match_annotations) == 0;
if (!cond) {
Py_DECREF(Match_annotations);
return 0;
}
Py_DECREF(Match_annotations);
PyObject *Raise_annotations = PyDict_New();
if (!Raise_annotations) return 0;
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Raise_annotations);
return 0;
}
cond = PyDict_SetItemString(Raise_annotations, "exc", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Raise_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Raise_annotations);
return 0;
}
cond = PyDict_SetItemString(Raise_annotations, "cause", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Raise_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Raise_type, "_field_types",
Raise_annotations) == 0;
if (!cond) {
Py_DECREF(Raise_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Raise_type, "__annotations__",
Raise_annotations) == 0;
if (!cond) {
Py_DECREF(Raise_annotations);
return 0;
}
Py_DECREF(Raise_annotations);
PyObject *Try_annotations = PyDict_New();
if (!Try_annotations) return 0;
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
cond = PyDict_SetItemString(Try_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
}
{
PyObject *type = state->excepthandler_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
cond = PyDict_SetItemString(Try_annotations, "handlers", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
cond = PyDict_SetItemString(Try_annotations, "orelse", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
cond = PyDict_SetItemString(Try_annotations, "finalbody", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Try_type, "_field_types",
Try_annotations) == 0;
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Try_type, "__annotations__",
Try_annotations) == 0;
if (!cond) {
Py_DECREF(Try_annotations);
return 0;
}
Py_DECREF(Try_annotations);
PyObject *TryStar_annotations = PyDict_New();
if (!TryStar_annotations) return 0;
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
cond = PyDict_SetItemString(TryStar_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
}
{
PyObject *type = state->excepthandler_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
cond = PyDict_SetItemString(TryStar_annotations, "handlers", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
cond = PyDict_SetItemString(TryStar_annotations, "orelse", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
cond = PyDict_SetItemString(TryStar_annotations, "finalbody", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->TryStar_type, "_field_types",
TryStar_annotations) == 0;
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->TryStar_type, "__annotations__",
TryStar_annotations) == 0;
if (!cond) {
Py_DECREF(TryStar_annotations);
return 0;
}
Py_DECREF(TryStar_annotations);
PyObject *Assert_annotations = PyDict_New();
if (!Assert_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Assert_annotations, "test", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Assert_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Assert_annotations);
return 0;
}
cond = PyDict_SetItemString(Assert_annotations, "msg", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Assert_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Assert_type, "_field_types",
Assert_annotations) == 0;
if (!cond) {
Py_DECREF(Assert_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Assert_type, "__annotations__",
Assert_annotations) == 0;
if (!cond) {
Py_DECREF(Assert_annotations);
return 0;
}
Py_DECREF(Assert_annotations);
PyObject *Import_annotations = PyDict_New();
if (!Import_annotations) return 0;
{
PyObject *type = state->alias_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Import_annotations);
return 0;
}
cond = PyDict_SetItemString(Import_annotations, "names", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Import_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Import_type, "_field_types",
Import_annotations) == 0;
if (!cond) {
Py_DECREF(Import_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Import_type, "__annotations__",
Import_annotations) == 0;
if (!cond) {
Py_DECREF(Import_annotations);
return 0;
}
Py_DECREF(Import_annotations);
PyObject *ImportFrom_annotations = PyDict_New();
if (!ImportFrom_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
cond = PyDict_SetItemString(ImportFrom_annotations, "module", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
}
{
PyObject *type = state->alias_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
cond = PyDict_SetItemString(ImportFrom_annotations, "names", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyLong_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
cond = PyDict_SetItemString(ImportFrom_annotations, "level", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->ImportFrom_type, "_field_types",
ImportFrom_annotations) == 0;
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->ImportFrom_type, "__annotations__",
ImportFrom_annotations) == 0;
if (!cond) {
Py_DECREF(ImportFrom_annotations);
return 0;
}
Py_DECREF(ImportFrom_annotations);
PyObject *Global_annotations = PyDict_New();
if (!Global_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Global_annotations);
return 0;
}
cond = PyDict_SetItemString(Global_annotations, "names", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Global_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Global_type, "_field_types",
Global_annotations) == 0;
if (!cond) {
Py_DECREF(Global_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Global_type, "__annotations__",
Global_annotations) == 0;
if (!cond) {
Py_DECREF(Global_annotations);
return 0;
}
Py_DECREF(Global_annotations);
PyObject *Nonlocal_annotations = PyDict_New();
if (!Nonlocal_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Nonlocal_annotations);
return 0;
}
cond = PyDict_SetItemString(Nonlocal_annotations, "names", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Nonlocal_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Nonlocal_type, "_field_types",
Nonlocal_annotations) == 0;
if (!cond) {
Py_DECREF(Nonlocal_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Nonlocal_type, "__annotations__",
Nonlocal_annotations) == 0;
if (!cond) {
Py_DECREF(Nonlocal_annotations);
return 0;
}
Py_DECREF(Nonlocal_annotations);
PyObject *Expr_annotations = PyDict_New();
if (!Expr_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Expr_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Expr_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Expr_type, "_field_types",
Expr_annotations) == 0;
if (!cond) {
Py_DECREF(Expr_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Expr_type, "__annotations__",
Expr_annotations) == 0;
if (!cond) {
Py_DECREF(Expr_annotations);
return 0;
}
Py_DECREF(Expr_annotations);
PyObject *Pass_annotations = PyDict_New();
if (!Pass_annotations) return 0;
cond = PyObject_SetAttrString(state->Pass_type, "_field_types",
Pass_annotations) == 0;
if (!cond) {
Py_DECREF(Pass_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Pass_type, "__annotations__",
Pass_annotations) == 0;
if (!cond) {
Py_DECREF(Pass_annotations);
return 0;
}
Py_DECREF(Pass_annotations);
PyObject *Break_annotations = PyDict_New();
if (!Break_annotations) return 0;
cond = PyObject_SetAttrString(state->Break_type, "_field_types",
Break_annotations) == 0;
if (!cond) {
Py_DECREF(Break_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Break_type, "__annotations__",
Break_annotations) == 0;
if (!cond) {
Py_DECREF(Break_annotations);
return 0;
}
Py_DECREF(Break_annotations);
PyObject *Continue_annotations = PyDict_New();
if (!Continue_annotations) return 0;
cond = PyObject_SetAttrString(state->Continue_type, "_field_types",
Continue_annotations) == 0;
if (!cond) {
Py_DECREF(Continue_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Continue_type, "__annotations__",
Continue_annotations) == 0;
if (!cond) {
Py_DECREF(Continue_annotations);
return 0;
}
Py_DECREF(Continue_annotations);
PyObject *BoolOp_annotations = PyDict_New();
if (!BoolOp_annotations) return 0;
{
PyObject *type = state->boolop_type;
Py_INCREF(type);
cond = PyDict_SetItemString(BoolOp_annotations, "op", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(BoolOp_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(BoolOp_annotations);
return 0;
}
cond = PyDict_SetItemString(BoolOp_annotations, "values", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(BoolOp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->BoolOp_type, "_field_types",
BoolOp_annotations) == 0;
if (!cond) {
Py_DECREF(BoolOp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->BoolOp_type, "__annotations__",
BoolOp_annotations) == 0;
if (!cond) {
Py_DECREF(BoolOp_annotations);
return 0;
}
Py_DECREF(BoolOp_annotations);
PyObject *NamedExpr_annotations = PyDict_New();
if (!NamedExpr_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(NamedExpr_annotations, "target", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(NamedExpr_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(NamedExpr_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(NamedExpr_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->NamedExpr_type, "_field_types",
NamedExpr_annotations) == 0;
if (!cond) {
Py_DECREF(NamedExpr_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->NamedExpr_type, "__annotations__",
NamedExpr_annotations) == 0;
if (!cond) {
Py_DECREF(NamedExpr_annotations);
return 0;
}
Py_DECREF(NamedExpr_annotations);
PyObject *BinOp_annotations = PyDict_New();
if (!BinOp_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(BinOp_annotations, "left", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(BinOp_annotations);
return 0;
}
}
{
PyObject *type = state->operator_type;
Py_INCREF(type);
cond = PyDict_SetItemString(BinOp_annotations, "op", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(BinOp_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(BinOp_annotations, "right", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(BinOp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->BinOp_type, "_field_types",
BinOp_annotations) == 0;
if (!cond) {
Py_DECREF(BinOp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->BinOp_type, "__annotations__",
BinOp_annotations) == 0;
if (!cond) {
Py_DECREF(BinOp_annotations);
return 0;
}
Py_DECREF(BinOp_annotations);
PyObject *UnaryOp_annotations = PyDict_New();
if (!UnaryOp_annotations) return 0;
{
PyObject *type = state->unaryop_type;
Py_INCREF(type);
cond = PyDict_SetItemString(UnaryOp_annotations, "op", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(UnaryOp_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(UnaryOp_annotations, "operand", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(UnaryOp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->UnaryOp_type, "_field_types",
UnaryOp_annotations) == 0;
if (!cond) {
Py_DECREF(UnaryOp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->UnaryOp_type, "__annotations__",
UnaryOp_annotations) == 0;
if (!cond) {
Py_DECREF(UnaryOp_annotations);
return 0;
}
Py_DECREF(UnaryOp_annotations);
PyObject *Lambda_annotations = PyDict_New();
if (!Lambda_annotations) return 0;
{
PyObject *type = state->arguments_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Lambda_annotations, "args", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Lambda_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Lambda_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Lambda_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Lambda_type, "_field_types",
Lambda_annotations) == 0;
if (!cond) {
Py_DECREF(Lambda_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Lambda_type, "__annotations__",
Lambda_annotations) == 0;
if (!cond) {
Py_DECREF(Lambda_annotations);
return 0;
}
Py_DECREF(Lambda_annotations);
PyObject *IfExp_annotations = PyDict_New();
if (!IfExp_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(IfExp_annotations, "test", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(IfExp_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(IfExp_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(IfExp_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(IfExp_annotations, "orelse", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(IfExp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->IfExp_type, "_field_types",
IfExp_annotations) == 0;
if (!cond) {
Py_DECREF(IfExp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->IfExp_type, "__annotations__",
IfExp_annotations) == 0;
if (!cond) {
Py_DECREF(IfExp_annotations);
return 0;
}
Py_DECREF(IfExp_annotations);
PyObject *Dict_annotations = PyDict_New();
if (!Dict_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Dict_annotations);
return 0;
}
cond = PyDict_SetItemString(Dict_annotations, "keys", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Dict_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Dict_annotations);
return 0;
}
cond = PyDict_SetItemString(Dict_annotations, "values", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Dict_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Dict_type, "_field_types",
Dict_annotations) == 0;
if (!cond) {
Py_DECREF(Dict_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Dict_type, "__annotations__",
Dict_annotations) == 0;
if (!cond) {
Py_DECREF(Dict_annotations);
return 0;
}
Py_DECREF(Dict_annotations);
PyObject *Set_annotations = PyDict_New();
if (!Set_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Set_annotations);
return 0;
}
cond = PyDict_SetItemString(Set_annotations, "elts", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Set_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Set_type, "_field_types",
Set_annotations) == 0;
if (!cond) {
Py_DECREF(Set_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Set_type, "__annotations__",
Set_annotations) == 0;
if (!cond) {
Py_DECREF(Set_annotations);
return 0;
}
Py_DECREF(Set_annotations);
PyObject *ListComp_annotations = PyDict_New();
if (!ListComp_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(ListComp_annotations, "elt", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ListComp_annotations);
return 0;
}
}
{
PyObject *type = state->comprehension_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ListComp_annotations);
return 0;
}
cond = PyDict_SetItemString(ListComp_annotations, "generators", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ListComp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->ListComp_type, "_field_types",
ListComp_annotations) == 0;
if (!cond) {
Py_DECREF(ListComp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->ListComp_type, "__annotations__",
ListComp_annotations) == 0;
if (!cond) {
Py_DECREF(ListComp_annotations);
return 0;
}
Py_DECREF(ListComp_annotations);
PyObject *SetComp_annotations = PyDict_New();
if (!SetComp_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(SetComp_annotations, "elt", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(SetComp_annotations);
return 0;
}
}
{
PyObject *type = state->comprehension_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(SetComp_annotations);
return 0;
}
cond = PyDict_SetItemString(SetComp_annotations, "generators", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(SetComp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->SetComp_type, "_field_types",
SetComp_annotations) == 0;
if (!cond) {
Py_DECREF(SetComp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->SetComp_type, "__annotations__",
SetComp_annotations) == 0;
if (!cond) {
Py_DECREF(SetComp_annotations);
return 0;
}
Py_DECREF(SetComp_annotations);
PyObject *DictComp_annotations = PyDict_New();
if (!DictComp_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(DictComp_annotations, "key", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(DictComp_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(DictComp_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(DictComp_annotations);
return 0;
}
}
{
PyObject *type = state->comprehension_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(DictComp_annotations);
return 0;
}
cond = PyDict_SetItemString(DictComp_annotations, "generators", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(DictComp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->DictComp_type, "_field_types",
DictComp_annotations) == 0;
if (!cond) {
Py_DECREF(DictComp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->DictComp_type, "__annotations__",
DictComp_annotations) == 0;
if (!cond) {
Py_DECREF(DictComp_annotations);
return 0;
}
Py_DECREF(DictComp_annotations);
PyObject *GeneratorExp_annotations = PyDict_New();
if (!GeneratorExp_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(GeneratorExp_annotations, "elt", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(GeneratorExp_annotations);
return 0;
}
}
{
PyObject *type = state->comprehension_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(GeneratorExp_annotations);
return 0;
}
cond = PyDict_SetItemString(GeneratorExp_annotations, "generators",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(GeneratorExp_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->GeneratorExp_type, "_field_types",
GeneratorExp_annotations) == 0;
if (!cond) {
Py_DECREF(GeneratorExp_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->GeneratorExp_type, "__annotations__",
GeneratorExp_annotations) == 0;
if (!cond) {
Py_DECREF(GeneratorExp_annotations);
return 0;
}
Py_DECREF(GeneratorExp_annotations);
PyObject *Await_annotations = PyDict_New();
if (!Await_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Await_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Await_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Await_type, "_field_types",
Await_annotations) == 0;
if (!cond) {
Py_DECREF(Await_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Await_type, "__annotations__",
Await_annotations) == 0;
if (!cond) {
Py_DECREF(Await_annotations);
return 0;
}
Py_DECREF(Await_annotations);
PyObject *Yield_annotations = PyDict_New();
if (!Yield_annotations) return 0;
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Yield_annotations);
return 0;
}
cond = PyDict_SetItemString(Yield_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Yield_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Yield_type, "_field_types",
Yield_annotations) == 0;
if (!cond) {
Py_DECREF(Yield_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Yield_type, "__annotations__",
Yield_annotations) == 0;
if (!cond) {
Py_DECREF(Yield_annotations);
return 0;
}
Py_DECREF(Yield_annotations);
PyObject *YieldFrom_annotations = PyDict_New();
if (!YieldFrom_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(YieldFrom_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(YieldFrom_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->YieldFrom_type, "_field_types",
YieldFrom_annotations) == 0;
if (!cond) {
Py_DECREF(YieldFrom_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->YieldFrom_type, "__annotations__",
YieldFrom_annotations) == 0;
if (!cond) {
Py_DECREF(YieldFrom_annotations);
return 0;
}
Py_DECREF(YieldFrom_annotations);
PyObject *Compare_annotations = PyDict_New();
if (!Compare_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Compare_annotations, "left", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Compare_annotations);
return 0;
}
}
{
PyObject *type = state->cmpop_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Compare_annotations);
return 0;
}
cond = PyDict_SetItemString(Compare_annotations, "ops", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Compare_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Compare_annotations);
return 0;
}
cond = PyDict_SetItemString(Compare_annotations, "comparators", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Compare_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Compare_type, "_field_types",
Compare_annotations) == 0;
if (!cond) {
Py_DECREF(Compare_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Compare_type, "__annotations__",
Compare_annotations) == 0;
if (!cond) {
Py_DECREF(Compare_annotations);
return 0;
}
Py_DECREF(Compare_annotations);
PyObject *Call_annotations = PyDict_New();
if (!Call_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Call_annotations, "func", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Call_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Call_annotations);
return 0;
}
cond = PyDict_SetItemString(Call_annotations, "args", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Call_annotations);
return 0;
}
}
{
PyObject *type = state->keyword_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Call_annotations);
return 0;
}
cond = PyDict_SetItemString(Call_annotations, "keywords", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Call_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Call_type, "_field_types",
Call_annotations) == 0;
if (!cond) {
Py_DECREF(Call_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Call_type, "__annotations__",
Call_annotations) == 0;
if (!cond) {
Py_DECREF(Call_annotations);
return 0;
}
Py_DECREF(Call_annotations);
PyObject *FormattedValue_annotations = PyDict_New();
if (!FormattedValue_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(FormattedValue_annotations, "value", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FormattedValue_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyLong_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(FormattedValue_annotations, "conversion",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FormattedValue_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(FormattedValue_annotations);
return 0;
}
cond = PyDict_SetItemString(FormattedValue_annotations, "format_spec",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(FormattedValue_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->FormattedValue_type, "_field_types",
FormattedValue_annotations) == 0;
if (!cond) {
Py_DECREF(FormattedValue_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->FormattedValue_type,
"__annotations__",
FormattedValue_annotations) == 0;
if (!cond) {
Py_DECREF(FormattedValue_annotations);
return 0;
}
Py_DECREF(FormattedValue_annotations);
PyObject *JoinedStr_annotations = PyDict_New();
if (!JoinedStr_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(JoinedStr_annotations);
return 0;
}
cond = PyDict_SetItemString(JoinedStr_annotations, "values", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(JoinedStr_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->JoinedStr_type, "_field_types",
JoinedStr_annotations) == 0;
if (!cond) {
Py_DECREF(JoinedStr_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->JoinedStr_type, "__annotations__",
JoinedStr_annotations) == 0;
if (!cond) {
Py_DECREF(JoinedStr_annotations);
return 0;
}
Py_DECREF(JoinedStr_annotations);
PyObject *Constant_annotations = PyDict_New();
if (!Constant_annotations) return 0;
{
PyObject *type = (PyObject *)&PyBaseObject_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(Constant_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Constant_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Constant_annotations);
return 0;
}
cond = PyDict_SetItemString(Constant_annotations, "kind", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Constant_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Constant_type, "_field_types",
Constant_annotations) == 0;
if (!cond) {
Py_DECREF(Constant_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Constant_type, "__annotations__",
Constant_annotations) == 0;
if (!cond) {
Py_DECREF(Constant_annotations);
return 0;
}
Py_DECREF(Constant_annotations);
PyObject *Attribute_annotations = PyDict_New();
if (!Attribute_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Attribute_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Attribute_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(Attribute_annotations, "attr", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Attribute_annotations);
return 0;
}
}
{
PyObject *type = state->expr_context_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Attribute_annotations, "ctx", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Attribute_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Attribute_type, "_field_types",
Attribute_annotations) == 0;
if (!cond) {
Py_DECREF(Attribute_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Attribute_type, "__annotations__",
Attribute_annotations) == 0;
if (!cond) {
Py_DECREF(Attribute_annotations);
return 0;
}
Py_DECREF(Attribute_annotations);
PyObject *Subscript_annotations = PyDict_New();
if (!Subscript_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Subscript_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Subscript_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Subscript_annotations, "slice", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Subscript_annotations);
return 0;
}
}
{
PyObject *type = state->expr_context_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Subscript_annotations, "ctx", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Subscript_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Subscript_type, "_field_types",
Subscript_annotations) == 0;
if (!cond) {
Py_DECREF(Subscript_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Subscript_type, "__annotations__",
Subscript_annotations) == 0;
if (!cond) {
Py_DECREF(Subscript_annotations);
return 0;
}
Py_DECREF(Subscript_annotations);
PyObject *Starred_annotations = PyDict_New();
if (!Starred_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Starred_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Starred_annotations);
return 0;
}
}
{
PyObject *type = state->expr_context_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Starred_annotations, "ctx", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Starred_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Starred_type, "_field_types",
Starred_annotations) == 0;
if (!cond) {
Py_DECREF(Starred_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Starred_type, "__annotations__",
Starred_annotations) == 0;
if (!cond) {
Py_DECREF(Starred_annotations);
return 0;
}
Py_DECREF(Starred_annotations);
PyObject *Name_annotations = PyDict_New();
if (!Name_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(Name_annotations, "id", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Name_annotations);
return 0;
}
}
{
PyObject *type = state->expr_context_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Name_annotations, "ctx", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Name_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Name_type, "_field_types",
Name_annotations) == 0;
if (!cond) {
Py_DECREF(Name_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Name_type, "__annotations__",
Name_annotations) == 0;
if (!cond) {
Py_DECREF(Name_annotations);
return 0;
}
Py_DECREF(Name_annotations);
PyObject *List_annotations = PyDict_New();
if (!List_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(List_annotations);
return 0;
}
cond = PyDict_SetItemString(List_annotations, "elts", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(List_annotations);
return 0;
}
}
{
PyObject *type = state->expr_context_type;
Py_INCREF(type);
cond = PyDict_SetItemString(List_annotations, "ctx", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(List_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->List_type, "_field_types",
List_annotations) == 0;
if (!cond) {
Py_DECREF(List_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->List_type, "__annotations__",
List_annotations) == 0;
if (!cond) {
Py_DECREF(List_annotations);
return 0;
}
Py_DECREF(List_annotations);
PyObject *Tuple_annotations = PyDict_New();
if (!Tuple_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(Tuple_annotations);
return 0;
}
cond = PyDict_SetItemString(Tuple_annotations, "elts", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Tuple_annotations);
return 0;
}
}
{
PyObject *type = state->expr_context_type;
Py_INCREF(type);
cond = PyDict_SetItemString(Tuple_annotations, "ctx", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Tuple_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Tuple_type, "_field_types",
Tuple_annotations) == 0;
if (!cond) {
Py_DECREF(Tuple_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Tuple_type, "__annotations__",
Tuple_annotations) == 0;
if (!cond) {
Py_DECREF(Tuple_annotations);
return 0;
}
Py_DECREF(Tuple_annotations);
PyObject *Slice_annotations = PyDict_New();
if (!Slice_annotations) return 0;
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
cond = PyDict_SetItemString(Slice_annotations, "lower", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
cond = PyDict_SetItemString(Slice_annotations, "upper", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
cond = PyDict_SetItemString(Slice_annotations, "step", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->Slice_type, "_field_types",
Slice_annotations) == 0;
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Slice_type, "__annotations__",
Slice_annotations) == 0;
if (!cond) {
Py_DECREF(Slice_annotations);
return 0;
}
Py_DECREF(Slice_annotations);
PyObject *Load_annotations = PyDict_New();
if (!Load_annotations) return 0;
cond = PyObject_SetAttrString(state->Load_type, "_field_types",
Load_annotations) == 0;
if (!cond) {
Py_DECREF(Load_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Load_type, "__annotations__",
Load_annotations) == 0;
if (!cond) {
Py_DECREF(Load_annotations);
return 0;
}
Py_DECREF(Load_annotations);
PyObject *Store_annotations = PyDict_New();
if (!Store_annotations) return 0;
cond = PyObject_SetAttrString(state->Store_type, "_field_types",
Store_annotations) == 0;
if (!cond) {
Py_DECREF(Store_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Store_type, "__annotations__",
Store_annotations) == 0;
if (!cond) {
Py_DECREF(Store_annotations);
return 0;
}
Py_DECREF(Store_annotations);
PyObject *Del_annotations = PyDict_New();
if (!Del_annotations) return 0;
cond = PyObject_SetAttrString(state->Del_type, "_field_types",
Del_annotations) == 0;
if (!cond) {
Py_DECREF(Del_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Del_type, "__annotations__",
Del_annotations) == 0;
if (!cond) {
Py_DECREF(Del_annotations);
return 0;
}
Py_DECREF(Del_annotations);
PyObject *And_annotations = PyDict_New();
if (!And_annotations) return 0;
cond = PyObject_SetAttrString(state->And_type, "_field_types",
And_annotations) == 0;
if (!cond) {
Py_DECREF(And_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->And_type, "__annotations__",
And_annotations) == 0;
if (!cond) {
Py_DECREF(And_annotations);
return 0;
}
Py_DECREF(And_annotations);
PyObject *Or_annotations = PyDict_New();
if (!Or_annotations) return 0;
cond = PyObject_SetAttrString(state->Or_type, "_field_types",
Or_annotations) == 0;
if (!cond) {
Py_DECREF(Or_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Or_type, "__annotations__",
Or_annotations) == 0;
if (!cond) {
Py_DECREF(Or_annotations);
return 0;
}
Py_DECREF(Or_annotations);
PyObject *Add_annotations = PyDict_New();
if (!Add_annotations) return 0;
cond = PyObject_SetAttrString(state->Add_type, "_field_types",
Add_annotations) == 0;
if (!cond) {
Py_DECREF(Add_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Add_type, "__annotations__",
Add_annotations) == 0;
if (!cond) {
Py_DECREF(Add_annotations);
return 0;
}
Py_DECREF(Add_annotations);
PyObject *Sub_annotations = PyDict_New();
if (!Sub_annotations) return 0;
cond = PyObject_SetAttrString(state->Sub_type, "_field_types",
Sub_annotations) == 0;
if (!cond) {
Py_DECREF(Sub_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Sub_type, "__annotations__",
Sub_annotations) == 0;
if (!cond) {
Py_DECREF(Sub_annotations);
return 0;
}
Py_DECREF(Sub_annotations);
PyObject *Mult_annotations = PyDict_New();
if (!Mult_annotations) return 0;
cond = PyObject_SetAttrString(state->Mult_type, "_field_types",
Mult_annotations) == 0;
if (!cond) {
Py_DECREF(Mult_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Mult_type, "__annotations__",
Mult_annotations) == 0;
if (!cond) {
Py_DECREF(Mult_annotations);
return 0;
}
Py_DECREF(Mult_annotations);
PyObject *MatMult_annotations = PyDict_New();
if (!MatMult_annotations) return 0;
cond = PyObject_SetAttrString(state->MatMult_type, "_field_types",
MatMult_annotations) == 0;
if (!cond) {
Py_DECREF(MatMult_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatMult_type, "__annotations__",
MatMult_annotations) == 0;
if (!cond) {
Py_DECREF(MatMult_annotations);
return 0;
}
Py_DECREF(MatMult_annotations);
PyObject *Div_annotations = PyDict_New();
if (!Div_annotations) return 0;
cond = PyObject_SetAttrString(state->Div_type, "_field_types",
Div_annotations) == 0;
if (!cond) {
Py_DECREF(Div_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Div_type, "__annotations__",
Div_annotations) == 0;
if (!cond) {
Py_DECREF(Div_annotations);
return 0;
}
Py_DECREF(Div_annotations);
PyObject *Mod_annotations = PyDict_New();
if (!Mod_annotations) return 0;
cond = PyObject_SetAttrString(state->Mod_type, "_field_types",
Mod_annotations) == 0;
if (!cond) {
Py_DECREF(Mod_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Mod_type, "__annotations__",
Mod_annotations) == 0;
if (!cond) {
Py_DECREF(Mod_annotations);
return 0;
}
Py_DECREF(Mod_annotations);
PyObject *Pow_annotations = PyDict_New();
if (!Pow_annotations) return 0;
cond = PyObject_SetAttrString(state->Pow_type, "_field_types",
Pow_annotations) == 0;
if (!cond) {
Py_DECREF(Pow_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Pow_type, "__annotations__",
Pow_annotations) == 0;
if (!cond) {
Py_DECREF(Pow_annotations);
return 0;
}
Py_DECREF(Pow_annotations);
PyObject *LShift_annotations = PyDict_New();
if (!LShift_annotations) return 0;
cond = PyObject_SetAttrString(state->LShift_type, "_field_types",
LShift_annotations) == 0;
if (!cond) {
Py_DECREF(LShift_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->LShift_type, "__annotations__",
LShift_annotations) == 0;
if (!cond) {
Py_DECREF(LShift_annotations);
return 0;
}
Py_DECREF(LShift_annotations);
PyObject *RShift_annotations = PyDict_New();
if (!RShift_annotations) return 0;
cond = PyObject_SetAttrString(state->RShift_type, "_field_types",
RShift_annotations) == 0;
if (!cond) {
Py_DECREF(RShift_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->RShift_type, "__annotations__",
RShift_annotations) == 0;
if (!cond) {
Py_DECREF(RShift_annotations);
return 0;
}
Py_DECREF(RShift_annotations);
PyObject *BitOr_annotations = PyDict_New();
if (!BitOr_annotations) return 0;
cond = PyObject_SetAttrString(state->BitOr_type, "_field_types",
BitOr_annotations) == 0;
if (!cond) {
Py_DECREF(BitOr_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->BitOr_type, "__annotations__",
BitOr_annotations) == 0;
if (!cond) {
Py_DECREF(BitOr_annotations);
return 0;
}
Py_DECREF(BitOr_annotations);
PyObject *BitXor_annotations = PyDict_New();
if (!BitXor_annotations) return 0;
cond = PyObject_SetAttrString(state->BitXor_type, "_field_types",
BitXor_annotations) == 0;
if (!cond) {
Py_DECREF(BitXor_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->BitXor_type, "__annotations__",
BitXor_annotations) == 0;
if (!cond) {
Py_DECREF(BitXor_annotations);
return 0;
}
Py_DECREF(BitXor_annotations);
PyObject *BitAnd_annotations = PyDict_New();
if (!BitAnd_annotations) return 0;
cond = PyObject_SetAttrString(state->BitAnd_type, "_field_types",
BitAnd_annotations) == 0;
if (!cond) {
Py_DECREF(BitAnd_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->BitAnd_type, "__annotations__",
BitAnd_annotations) == 0;
if (!cond) {
Py_DECREF(BitAnd_annotations);
return 0;
}
Py_DECREF(BitAnd_annotations);
PyObject *FloorDiv_annotations = PyDict_New();
if (!FloorDiv_annotations) return 0;
cond = PyObject_SetAttrString(state->FloorDiv_type, "_field_types",
FloorDiv_annotations) == 0;
if (!cond) {
Py_DECREF(FloorDiv_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->FloorDiv_type, "__annotations__",
FloorDiv_annotations) == 0;
if (!cond) {
Py_DECREF(FloorDiv_annotations);
return 0;
}
Py_DECREF(FloorDiv_annotations);
PyObject *Invert_annotations = PyDict_New();
if (!Invert_annotations) return 0;
cond = PyObject_SetAttrString(state->Invert_type, "_field_types",
Invert_annotations) == 0;
if (!cond) {
Py_DECREF(Invert_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Invert_type, "__annotations__",
Invert_annotations) == 0;
if (!cond) {
Py_DECREF(Invert_annotations);
return 0;
}
Py_DECREF(Invert_annotations);
PyObject *Not_annotations = PyDict_New();
if (!Not_annotations) return 0;
cond = PyObject_SetAttrString(state->Not_type, "_field_types",
Not_annotations) == 0;
if (!cond) {
Py_DECREF(Not_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Not_type, "__annotations__",
Not_annotations) == 0;
if (!cond) {
Py_DECREF(Not_annotations);
return 0;
}
Py_DECREF(Not_annotations);
PyObject *UAdd_annotations = PyDict_New();
if (!UAdd_annotations) return 0;
cond = PyObject_SetAttrString(state->UAdd_type, "_field_types",
UAdd_annotations) == 0;
if (!cond) {
Py_DECREF(UAdd_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->UAdd_type, "__annotations__",
UAdd_annotations) == 0;
if (!cond) {
Py_DECREF(UAdd_annotations);
return 0;
}
Py_DECREF(UAdd_annotations);
PyObject *USub_annotations = PyDict_New();
if (!USub_annotations) return 0;
cond = PyObject_SetAttrString(state->USub_type, "_field_types",
USub_annotations) == 0;
if (!cond) {
Py_DECREF(USub_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->USub_type, "__annotations__",
USub_annotations) == 0;
if (!cond) {
Py_DECREF(USub_annotations);
return 0;
}
Py_DECREF(USub_annotations);
PyObject *Eq_annotations = PyDict_New();
if (!Eq_annotations) return 0;
cond = PyObject_SetAttrString(state->Eq_type, "_field_types",
Eq_annotations) == 0;
if (!cond) {
Py_DECREF(Eq_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Eq_type, "__annotations__",
Eq_annotations) == 0;
if (!cond) {
Py_DECREF(Eq_annotations);
return 0;
}
Py_DECREF(Eq_annotations);
PyObject *NotEq_annotations = PyDict_New();
if (!NotEq_annotations) return 0;
cond = PyObject_SetAttrString(state->NotEq_type, "_field_types",
NotEq_annotations) == 0;
if (!cond) {
Py_DECREF(NotEq_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->NotEq_type, "__annotations__",
NotEq_annotations) == 0;
if (!cond) {
Py_DECREF(NotEq_annotations);
return 0;
}
Py_DECREF(NotEq_annotations);
PyObject *Lt_annotations = PyDict_New();
if (!Lt_annotations) return 0;
cond = PyObject_SetAttrString(state->Lt_type, "_field_types",
Lt_annotations) == 0;
if (!cond) {
Py_DECREF(Lt_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Lt_type, "__annotations__",
Lt_annotations) == 0;
if (!cond) {
Py_DECREF(Lt_annotations);
return 0;
}
Py_DECREF(Lt_annotations);
PyObject *LtE_annotations = PyDict_New();
if (!LtE_annotations) return 0;
cond = PyObject_SetAttrString(state->LtE_type, "_field_types",
LtE_annotations) == 0;
if (!cond) {
Py_DECREF(LtE_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->LtE_type, "__annotations__",
LtE_annotations) == 0;
if (!cond) {
Py_DECREF(LtE_annotations);
return 0;
}
Py_DECREF(LtE_annotations);
PyObject *Gt_annotations = PyDict_New();
if (!Gt_annotations) return 0;
cond = PyObject_SetAttrString(state->Gt_type, "_field_types",
Gt_annotations) == 0;
if (!cond) {
Py_DECREF(Gt_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Gt_type, "__annotations__",
Gt_annotations) == 0;
if (!cond) {
Py_DECREF(Gt_annotations);
return 0;
}
Py_DECREF(Gt_annotations);
PyObject *GtE_annotations = PyDict_New();
if (!GtE_annotations) return 0;
cond = PyObject_SetAttrString(state->GtE_type, "_field_types",
GtE_annotations) == 0;
if (!cond) {
Py_DECREF(GtE_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->GtE_type, "__annotations__",
GtE_annotations) == 0;
if (!cond) {
Py_DECREF(GtE_annotations);
return 0;
}
Py_DECREF(GtE_annotations);
PyObject *Is_annotations = PyDict_New();
if (!Is_annotations) return 0;
cond = PyObject_SetAttrString(state->Is_type, "_field_types",
Is_annotations) == 0;
if (!cond) {
Py_DECREF(Is_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->Is_type, "__annotations__",
Is_annotations) == 0;
if (!cond) {
Py_DECREF(Is_annotations);
return 0;
}
Py_DECREF(Is_annotations);
PyObject *IsNot_annotations = PyDict_New();
if (!IsNot_annotations) return 0;
cond = PyObject_SetAttrString(state->IsNot_type, "_field_types",
IsNot_annotations) == 0;
if (!cond) {
Py_DECREF(IsNot_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->IsNot_type, "__annotations__",
IsNot_annotations) == 0;
if (!cond) {
Py_DECREF(IsNot_annotations);
return 0;
}
Py_DECREF(IsNot_annotations);
PyObject *In_annotations = PyDict_New();
if (!In_annotations) return 0;
cond = PyObject_SetAttrString(state->In_type, "_field_types",
In_annotations) == 0;
if (!cond) {
Py_DECREF(In_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->In_type, "__annotations__",
In_annotations) == 0;
if (!cond) {
Py_DECREF(In_annotations);
return 0;
}
Py_DECREF(In_annotations);
PyObject *NotIn_annotations = PyDict_New();
if (!NotIn_annotations) return 0;
cond = PyObject_SetAttrString(state->NotIn_type, "_field_types",
NotIn_annotations) == 0;
if (!cond) {
Py_DECREF(NotIn_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->NotIn_type, "__annotations__",
NotIn_annotations) == 0;
if (!cond) {
Py_DECREF(NotIn_annotations);
return 0;
}
Py_DECREF(NotIn_annotations);
PyObject *comprehension_annotations = PyDict_New();
if (!comprehension_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(comprehension_annotations, "target", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(comprehension_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(comprehension_annotations, "iter", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(comprehension_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(comprehension_annotations);
return 0;
}
cond = PyDict_SetItemString(comprehension_annotations, "ifs", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(comprehension_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyLong_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(comprehension_annotations, "is_async",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(comprehension_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->comprehension_type, "_field_types",
comprehension_annotations) == 0;
if (!cond) {
Py_DECREF(comprehension_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->comprehension_type, "__annotations__",
comprehension_annotations) == 0;
if (!cond) {
Py_DECREF(comprehension_annotations);
return 0;
}
Py_DECREF(comprehension_annotations);
PyObject *ExceptHandler_annotations = PyDict_New();
if (!ExceptHandler_annotations) return 0;
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
cond = PyDict_SetItemString(ExceptHandler_annotations, "type", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
cond = PyDict_SetItemString(ExceptHandler_annotations, "name", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
cond = PyDict_SetItemString(ExceptHandler_annotations, "body", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->ExceptHandler_type, "_field_types",
ExceptHandler_annotations) == 0;
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->ExceptHandler_type, "__annotations__",
ExceptHandler_annotations) == 0;
if (!cond) {
Py_DECREF(ExceptHandler_annotations);
return 0;
}
Py_DECREF(ExceptHandler_annotations);
PyObject *arguments_annotations = PyDict_New();
if (!arguments_annotations) return 0;
{
PyObject *type = state->arg_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyDict_SetItemString(arguments_annotations, "posonlyargs", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
}
{
PyObject *type = state->arg_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyDict_SetItemString(arguments_annotations, "args", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
}
{
PyObject *type = state->arg_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyDict_SetItemString(arguments_annotations, "vararg", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
}
{
PyObject *type = state->arg_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyDict_SetItemString(arguments_annotations, "kwonlyargs", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyDict_SetItemString(arguments_annotations, "kw_defaults", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
}
{
PyObject *type = state->arg_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyDict_SetItemString(arguments_annotations, "kwarg", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyDict_SetItemString(arguments_annotations, "defaults", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->arguments_type, "_field_types",
arguments_annotations) == 0;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->arguments_type, "__annotations__",
arguments_annotations) == 0;
if (!cond) {
Py_DECREF(arguments_annotations);
return 0;
}
Py_DECREF(arguments_annotations);
PyObject *arg_annotations = PyDict_New();
if (!arg_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(arg_annotations, "arg", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arg_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(arg_annotations);
return 0;
}
cond = PyDict_SetItemString(arg_annotations, "annotation", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arg_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(arg_annotations);
return 0;
}
cond = PyDict_SetItemString(arg_annotations, "type_comment", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(arg_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->arg_type, "_field_types",
arg_annotations) == 0;
if (!cond) {
Py_DECREF(arg_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->arg_type, "__annotations__",
arg_annotations) == 0;
if (!cond) {
Py_DECREF(arg_annotations);
return 0;
}
Py_DECREF(arg_annotations);
PyObject *keyword_annotations = PyDict_New();
if (!keyword_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(keyword_annotations);
return 0;
}
cond = PyDict_SetItemString(keyword_annotations, "arg", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(keyword_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(keyword_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(keyword_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->keyword_type, "_field_types",
keyword_annotations) == 0;
if (!cond) {
Py_DECREF(keyword_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->keyword_type, "__annotations__",
keyword_annotations) == 0;
if (!cond) {
Py_DECREF(keyword_annotations);
return 0;
}
Py_DECREF(keyword_annotations);
PyObject *alias_annotations = PyDict_New();
if (!alias_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(alias_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(alias_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(alias_annotations);
return 0;
}
cond = PyDict_SetItemString(alias_annotations, "asname", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(alias_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->alias_type, "_field_types",
alias_annotations) == 0;
if (!cond) {
Py_DECREF(alias_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->alias_type, "__annotations__",
alias_annotations) == 0;
if (!cond) {
Py_DECREF(alias_annotations);
return 0;
}
Py_DECREF(alias_annotations);
PyObject *withitem_annotations = PyDict_New();
if (!withitem_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(withitem_annotations, "context_expr", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(withitem_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(withitem_annotations);
return 0;
}
cond = PyDict_SetItemString(withitem_annotations, "optional_vars",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(withitem_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->withitem_type, "_field_types",
withitem_annotations) == 0;
if (!cond) {
Py_DECREF(withitem_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->withitem_type, "__annotations__",
withitem_annotations) == 0;
if (!cond) {
Py_DECREF(withitem_annotations);
return 0;
}
Py_DECREF(withitem_annotations);
PyObject *match_case_annotations = PyDict_New();
if (!match_case_annotations) return 0;
{
PyObject *type = state->pattern_type;
Py_INCREF(type);
cond = PyDict_SetItemString(match_case_annotations, "pattern", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(match_case_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(match_case_annotations);
return 0;
}
cond = PyDict_SetItemString(match_case_annotations, "guard", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(match_case_annotations);
return 0;
}
}
{
PyObject *type = state->stmt_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(match_case_annotations);
return 0;
}
cond = PyDict_SetItemString(match_case_annotations, "body", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(match_case_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->match_case_type, "_field_types",
match_case_annotations) == 0;
if (!cond) {
Py_DECREF(match_case_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->match_case_type, "__annotations__",
match_case_annotations) == 0;
if (!cond) {
Py_DECREF(match_case_annotations);
return 0;
}
Py_DECREF(match_case_annotations);
PyObject *MatchValue_annotations = PyDict_New();
if (!MatchValue_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(MatchValue_annotations, "value", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchValue_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchValue_type, "_field_types",
MatchValue_annotations) == 0;
if (!cond) {
Py_DECREF(MatchValue_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchValue_type, "__annotations__",
MatchValue_annotations) == 0;
if (!cond) {
Py_DECREF(MatchValue_annotations);
return 0;
}
Py_DECREF(MatchValue_annotations);
PyObject *MatchSingleton_annotations = PyDict_New();
if (!MatchSingleton_annotations) return 0;
{
PyObject *type = (PyObject *)&PyBaseObject_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(MatchSingleton_annotations, "value", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchSingleton_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchSingleton_type, "_field_types",
MatchSingleton_annotations) == 0;
if (!cond) {
Py_DECREF(MatchSingleton_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchSingleton_type,
"__annotations__",
MatchSingleton_annotations) == 0;
if (!cond) {
Py_DECREF(MatchSingleton_annotations);
return 0;
}
Py_DECREF(MatchSingleton_annotations);
PyObject *MatchSequence_annotations = PyDict_New();
if (!MatchSequence_annotations) return 0;
{
PyObject *type = state->pattern_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchSequence_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchSequence_annotations, "patterns",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchSequence_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchSequence_type, "_field_types",
MatchSequence_annotations) == 0;
if (!cond) {
Py_DECREF(MatchSequence_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchSequence_type, "__annotations__",
MatchSequence_annotations) == 0;
if (!cond) {
Py_DECREF(MatchSequence_annotations);
return 0;
}
Py_DECREF(MatchSequence_annotations);
PyObject *MatchMapping_annotations = PyDict_New();
if (!MatchMapping_annotations) return 0;
{
PyObject *type = state->expr_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchMapping_annotations, "keys", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
}
{
PyObject *type = state->pattern_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchMapping_annotations, "patterns", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchMapping_annotations, "rest", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchMapping_type, "_field_types",
MatchMapping_annotations) == 0;
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchMapping_type, "__annotations__",
MatchMapping_annotations) == 0;
if (!cond) {
Py_DECREF(MatchMapping_annotations);
return 0;
}
Py_DECREF(MatchMapping_annotations);
PyObject *MatchClass_annotations = PyDict_New();
if (!MatchClass_annotations) return 0;
{
PyObject *type = state->expr_type;
Py_INCREF(type);
cond = PyDict_SetItemString(MatchClass_annotations, "cls", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
}
{
PyObject *type = state->pattern_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchClass_annotations, "patterns", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchClass_annotations, "kwd_attrs", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
}
{
PyObject *type = state->pattern_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchClass_annotations, "kwd_patterns",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchClass_type, "_field_types",
MatchClass_annotations) == 0;
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchClass_type, "__annotations__",
MatchClass_annotations) == 0;
if (!cond) {
Py_DECREF(MatchClass_annotations);
return 0;
}
Py_DECREF(MatchClass_annotations);
PyObject *MatchStar_annotations = PyDict_New();
if (!MatchStar_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchStar_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchStar_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchStar_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchStar_type, "_field_types",
MatchStar_annotations) == 0;
if (!cond) {
Py_DECREF(MatchStar_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchStar_type, "__annotations__",
MatchStar_annotations) == 0;
if (!cond) {
Py_DECREF(MatchStar_annotations);
return 0;
}
Py_DECREF(MatchStar_annotations);
PyObject *MatchAs_annotations = PyDict_New();
if (!MatchAs_annotations) return 0;
{
PyObject *type = state->pattern_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchAs_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchAs_annotations, "pattern", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchAs_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchAs_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchAs_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchAs_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchAs_type, "_field_types",
MatchAs_annotations) == 0;
if (!cond) {
Py_DECREF(MatchAs_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchAs_type, "__annotations__",
MatchAs_annotations) == 0;
if (!cond) {
Py_DECREF(MatchAs_annotations);
return 0;
}
Py_DECREF(MatchAs_annotations);
PyObject *MatchOr_annotations = PyDict_New();
if (!MatchOr_annotations) return 0;
{
PyObject *type = state->pattern_type;
type = Py_GenericAlias((PyObject *)&PyList_Type, type);
cond = type != NULL;
if (!cond) {
Py_DECREF(MatchOr_annotations);
return 0;
}
cond = PyDict_SetItemString(MatchOr_annotations, "patterns", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(MatchOr_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->MatchOr_type, "_field_types",
MatchOr_annotations) == 0;
if (!cond) {
Py_DECREF(MatchOr_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->MatchOr_type, "__annotations__",
MatchOr_annotations) == 0;
if (!cond) {
Py_DECREF(MatchOr_annotations);
return 0;
}
Py_DECREF(MatchOr_annotations);
PyObject *TypeIgnore_annotations = PyDict_New();
if (!TypeIgnore_annotations) return 0;
{
PyObject *type = (PyObject *)&PyLong_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(TypeIgnore_annotations, "lineno", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeIgnore_annotations);
return 0;
}
}
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(TypeIgnore_annotations, "tag", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeIgnore_annotations);
return 0;
}
}
cond = PyObject_SetAttrString(state->TypeIgnore_type, "_field_types",
TypeIgnore_annotations) == 0;
if (!cond) {
Py_DECREF(TypeIgnore_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->TypeIgnore_type, "__annotations__",
TypeIgnore_annotations) == 0;
if (!cond) {
Py_DECREF(TypeIgnore_annotations);
return 0;
}
Py_DECREF(TypeIgnore_annotations);
PyObject *TypeVar_annotations = PyDict_New();
if (!TypeVar_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(TypeVar_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeVar_annotations);
return 0;
}
}
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(TypeVar_annotations);
return 0;
}
cond = PyDict_SetItemString(TypeVar_annotations, "bound", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeVar_annotations);
return 0;
}
}
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(TypeVar_annotations);
return 0;
}
cond = PyDict_SetItemString(TypeVar_annotations, "default_value", type)
== 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeVar_annotations);
return 0;
}
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
cond = PyObject_SetAttrString(state->TypeVar_type, "_field_types",
TypeVar_annotations) == 0;
if (!cond) {
Py_DECREF(TypeVar_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->TypeVar_type, "__annotations__",
TypeVar_annotations) == 0;
if (!cond) {
Py_DECREF(TypeVar_annotations);
return 0;
}
Py_DECREF(TypeVar_annotations);
PyObject *ParamSpec_annotations = PyDict_New();
if (!ParamSpec_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(ParamSpec_annotations, "name", type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ParamSpec_annotations);
return 0;
}
}
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(ParamSpec_annotations);
return 0;
}
cond = PyDict_SetItemString(ParamSpec_annotations, "default_value",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(ParamSpec_annotations);
return 0;
}
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
cond = PyObject_SetAttrString(state->ParamSpec_type, "_field_types",
ParamSpec_annotations) == 0;
if (!cond) {
Py_DECREF(ParamSpec_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->ParamSpec_type, "__annotations__",
ParamSpec_annotations) == 0;
if (!cond) {
Py_DECREF(ParamSpec_annotations);
return 0;
}
Py_DECREF(ParamSpec_annotations);
PyObject *TypeVarTuple_annotations = PyDict_New();
if (!TypeVarTuple_annotations) return 0;
{
PyObject *type = (PyObject *)&PyUnicode_Type;
Py_INCREF(type);
cond = PyDict_SetItemString(TypeVarTuple_annotations, "name", type) ==
0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeVarTuple_annotations);
return 0;
}
}
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
{
PyObject *type = state->expr_type;
type = _Py_union_type_or(type, Py_None);
cond = type != NULL;
if (!cond) {
Py_DECREF(TypeVarTuple_annotations);
return 0;
}
cond = PyDict_SetItemString(TypeVarTuple_annotations, "default_value",
type) == 0;
Py_DECREF(type);
if (!cond) {
Py_DECREF(TypeVarTuple_annotations);
return 0;
}
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
cond = PyObject_SetAttrString(state->TypeVarTuple_type, "_field_types",
TypeVarTuple_annotations) == 0;
if (!cond) {
Py_DECREF(TypeVarTuple_annotations);
return 0;
}
cond = PyObject_SetAttrString(state->TypeVarTuple_type, "__annotations__",
TypeVarTuple_annotations) == 0;
if (!cond) {
Py_DECREF(TypeVarTuple_annotations);
return 0;
}
Py_DECREF(TypeVarTuple_annotations);
return 1;
}
Issue #29369: Use Py_IDENTIFIER in Python-ast.c
2017-01-25 09:33:43 -04:00
give the AST class a __dict__
2012-03-12 13:46:44 -03:00
typedef struct {
Try to fix compilation of Python-ast.c on Visual Studio 2008
2012-03-12 21:17:31 -03:00
PyObject_HEAD
give the AST class a __dict__
2012-03-12 13:46:44 -03:00
PyObject *dict;
} AST_object;
free AST's dict
2012-03-14 23:50:29 -03:00
static void
ast_dealloc(AST_object *self)
{
bpo-31095: fix potential crash during GC (GH-2974)
2017-08-24 02:55:17 -03:00
/* bpo-31095: UnTrack is needed before calling any callbacks */
Fix leaks in Python-ast.c (#16127)
2019-09-14 10:38:17 -03:00
PyTypeObject *tp = Py_TYPE(self);
bpo-31095: fix potential crash during GC (GH-2974)
2017-08-24 02:55:17 -03:00
PyObject_GC_UnTrack(self);
free AST's dict
2012-03-14 23:50:29 -03:00
Py_CLEAR(self->dict);
Fix leaks in Python-ast.c (#16127)
2019-09-14 10:38:17 -03:00
freefunc free_func = PyType_GetSlot(tp, Py_tp_free);
assert(free_func != NULL);
free_func(self);
Py_DECREF(tp);
free AST's dict
2012-03-14 23:50:29 -03:00
}
add gc support to the AST base type (closes #15293)
2012-07-08 15:03:46 -03:00
static int
ast_traverse(AST_object *self, visitproc visit, void *arg)
{
bpo-40217: Ensure Py_VISIT(Py_TYPE(self)) is always called for PyType_FromSpec types (reverts GH-19414) (GH-20264) Heap types now always visit the type in tp_traverse. See added docs for details. This reverts commit 0169d3003be3d072751dd14a5c84748ab63a249f. Automerge-Triggered-By: @encukou
2020-05-27 06:03:38 -03:00
Py_VISIT(Py_TYPE(self));
add gc support to the AST base type (closes #15293)
2012-07-08 15:03:46 -03:00
Py_VISIT(self->dict);
return 0;
}
bpo-33677: Fix signatures of tp_clear handlers for AST and deque. (GH-7196)
2018-05-31 01:34:34 -03:00
static int
add gc support to the AST base type (closes #15293)
2012-07-08 15:03:46 -03:00
ast_clear(AST_object *self)
{
Py_CLEAR(self->dict);
bpo-33677: Fix signatures of tp_clear handlers for AST and deque. (GH-7196)
2018-05-31 01:34:34 -03:00
return 0;
add gc support to the AST base type (closes #15293)
2012-07-08 15:03:46 -03:00
}
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
static int
ast_type_init(PyObject *self, PyObject *args, PyObject *kw)
{
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
struct ast_state *state = get_ast_state();
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
if (state == NULL) {
bpo-41204: Fix compiler warning in ast_type_init() (GH-21307)
2020-07-04 18:18:15 -03:00
return -1;
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
}
bpo-41204: Fix compiler warning in ast_type_init() (GH-21307)
2020-07-04 18:18:15 -03:00
Py_ssize_t i, numfields = 0;
int res = -1;
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
PyObject *key, *value, *fields, *remaining_fields = NULL;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), state->_fields, &fields) < 0) {
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
goto cleanup;
}
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
if (fields) {
numfields = PySequence_Size(fields);
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
if (numfields == -1) {
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
goto cleanup;
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
remaining_fields = PySet_New(fields);
}
else {
remaining_fields = PySet_New(NULL);
}
if (remaining_fields == NULL) {
goto cleanup;
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
}
bpo-29622: Make AST constructor to accept less than enough number of positional arguments (GH-249) bpo-29463 added optional "docstring" field to 4 AST types. While it is optional, it breaks backward compatibility because AST constructor requires number of positional argument is same to number of fields. AST types accepts empty arguments, and incomplete keyword arguments. But it's not big problem because field can be filled after creation, and checked when compiling. So stop requiring complete set of fields for positional arguments too.
2017-02-23 13:48:17 -04:00
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
res = 0; /* if no error occurs, this stays 0 to the end */
bpo-29622: Make AST constructor to accept less than enough number of positional arguments (GH-249) bpo-29463 added optional "docstring" field to 4 AST types. While it is optional, it breaks backward compatibility because AST constructor requires number of positional argument is same to number of fields. AST types accepts empty arguments, and incomplete keyword arguments. But it's not big problem because field can be filled after creation, and checked when compiling. So stop requiring complete set of fields for positional arguments too.
2017-02-23 13:48:17 -04:00
if (numfields < PyTuple_GET_SIZE(args)) {
PyErr_Format(PyExc_TypeError, "%.400s constructor takes at most "
"%zd positional argument%s",
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
_PyType_Name(Py_TYPE(self)),
bpo-29622: Make AST constructor to accept less than enough number of positional arguments (GH-249) bpo-29463 added optional "docstring" field to 4 AST types. While it is optional, it breaks backward compatibility because AST constructor requires number of positional argument is same to number of fields. AST types accepts empty arguments, and incomplete keyword arguments. But it's not big problem because field can be filled after creation, and checked when compiling. So stop requiring complete set of fields for positional arguments too.
2017-02-23 13:48:17 -04:00
numfields, numfields == 1 ? "" : "s");
res = -1;
goto cleanup;
}
for (i = 0; i < PyTuple_GET_SIZE(args); i++) {
/* cannot be reached when fields is NULL */
PyObject *name = PySequence_GetItem(fields, i);
if (!name) {
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
res = -1;
goto cleanup;
}
bpo-29622: Make AST constructor to accept less than enough number of positional arguments (GH-249) bpo-29463 added optional "docstring" field to 4 AST types. While it is optional, it breaks backward compatibility because AST constructor requires number of positional argument is same to number of fields. AST types accepts empty arguments, and incomplete keyword arguments. But it's not big problem because field can be filled after creation, and checked when compiling. So stop requiring complete set of fields for positional arguments too.
2017-02-23 13:48:17 -04:00
res = PyObject_SetAttr(self, name, PyTuple_GET_ITEM(args, i));
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
if (PySet_Discard(remaining_fields, name) < 0) {
res = -1;
Py_DECREF(name);
goto cleanup;
}
bpo-29622: Make AST constructor to accept less than enough number of positional arguments (GH-249) bpo-29463 added optional "docstring" field to 4 AST types. While it is optional, it breaks backward compatibility because AST constructor requires number of positional argument is same to number of fields. AST types accepts empty arguments, and incomplete keyword arguments. But it's not big problem because field can be filled after creation, and checked when compiling. So stop requiring complete set of fields for positional arguments too.
2017-02-23 13:48:17 -04:00
Py_DECREF(name);
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
if (res < 0) {
bpo-29622: Make AST constructor to accept less than enough number of positional arguments (GH-249) bpo-29463 added optional "docstring" field to 4 AST types. While it is optional, it breaks backward compatibility because AST constructor requires number of positional argument is same to number of fields. AST types accepts empty arguments, and incomplete keyword arguments. But it's not big problem because field can be filled after creation, and checked when compiling. So stop requiring complete set of fields for positional arguments too.
2017-02-23 13:48:17 -04:00
goto cleanup;
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
}
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
}
if (kw) {
i = 0; /* needed by PyDict_Next */
while (PyDict_Next(kw, &i, &key, &value)) {
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
int contains = PySequence_Contains(fields, key);
if (contains == -1) {
res = -1;
goto cleanup;
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
}
else if (contains == 1) {
int p = PySet_Discard(remaining_fields, key);
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
if (p == -1) {
res = -1;
goto cleanup;
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
if (p == 0) {
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
PyErr_Format(PyExc_TypeError,
"%.400s got multiple values for argument '%U'",
Py_TYPE(self)->tp_name, key);
res = -1;
goto cleanup;
}
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
else if (
PyUnicode_CompareWithASCIIString(key, "lineno") != 0 &&
PyUnicode_CompareWithASCIIString(key, "col_offset") != 0 &&
PyUnicode_CompareWithASCIIString(key, "end_lineno") != 0 &&
PyUnicode_CompareWithASCIIString(key, "end_col_offset") != 0
) {
if (PyErr_WarnFormat(
PyExc_DeprecationWarning, 1,
"%.400s.__init__ got an unexpected keyword argument '%U'. "
"Support for arbitrary keyword arguments is deprecated "
"and will be removed in Python 3.15.",
Py_TYPE(self)->tp_name, key
) < 0) {
res = -1;
goto cleanup;
}
}
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
res = PyObject_SetAttr(self, key, value);
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
if (res < 0) {
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
goto cleanup;
bpo-36290: Fix keytword collision handling in AST node constructors (GH-12382)
2020-05-24 18:12:57 -03:00
}
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
}
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
Py_ssize_t size = PySet_Size(remaining_fields);
PyObject *field_types = NULL, *remaining_list = NULL;
if (size > 0) {
gh-117266: Fix crashes on user-created AST subclasses (GH-117276) Fix crashes on user-created AST subclasses
2024-03-28 07:30:31 -03:00
if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), &_Py_ID(_field_types),
&field_types) < 0) {
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
res = -1;
goto cleanup;
}
gh-117266: Fix crashes on user-created AST subclasses (GH-117276) Fix crashes on user-created AST subclasses
2024-03-28 07:30:31 -03:00
if (field_types == NULL) {
gh-117486: Improve behavior for user-defined AST subclasses (#118212) Now, such classes will no longer require changes in Python 3.13 in the normal case. The test suite for robotframework passes with no DeprecationWarnings under this PR. I also added a new DeprecationWarning for the case where `_field_types` exists but is incomplete, since that seems likely to indicate a user mistake.
2024-05-06 19:57:27 -03:00
// Probably a user-defined subclass of AST that lacks _field_types.
// This will continue to work as it did before 3.13; i.e., attributes
// that are not passed in simply do not exist on the instance.
gh-117266: Fix crashes on user-created AST subclasses (GH-117276) Fix crashes on user-created AST subclasses
2024-03-28 07:30:31 -03:00
goto cleanup;
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
remaining_list = PySequence_List(remaining_fields);
if (!remaining_list) {
goto set_remaining_cleanup;
}
for (Py_ssize_t i = 0; i < size; i++) {
PyObject *name = PyList_GET_ITEM(remaining_list, i);
PyObject *type = PyDict_GetItemWithError(field_types, name);
if (!type) {
gh-117486: Improve behavior for user-defined AST subclasses (#118212) Now, such classes will no longer require changes in Python 3.13 in the normal case. The test suite for robotframework passes with no DeprecationWarnings under this PR. I also added a new DeprecationWarning for the case where `_field_types` exists but is incomplete, since that seems likely to indicate a user mistake.
2024-05-06 19:57:27 -03:00
if (PyErr_Occurred()) {
goto set_remaining_cleanup;
}
else {
if (PyErr_WarnFormat(
PyExc_DeprecationWarning, 1,
"Field '%U' is missing from %.400s._field_types. "
"This will become an error in Python 3.15.",
name, Py_TYPE(self)->tp_name
) < 0) {
goto set_remaining_cleanup;
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
}
}
gh-117486: Improve behavior for user-defined AST subclasses (#118212) Now, such classes will no longer require changes in Python 3.13 in the normal case. The test suite for robotframework passes with no DeprecationWarnings under this PR. I also added a new DeprecationWarning for the case where `_field_types` exists but is incomplete, since that seems likely to indicate a user mistake.
2024-05-06 19:57:27 -03:00
else if (_PyUnion_Check(type)) {
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
// optional field
// do nothing, we'll have set a None default on the class
}
else if (Py_IS_TYPE(type, &Py_GenericAliasType)) {
// list field
PyObject *empty = PyList_New(0);
if (!empty) {
goto set_remaining_cleanup;
}
res = PyObject_SetAttr(self, name, empty);
Py_DECREF(empty);
if (res < 0) {
goto set_remaining_cleanup;
}
}
gh-118851: Default ctx arguments to AST constructors to Load() (#118854) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2024-05-09 19:30:14 -03:00
else if (type == state->expr_context_type) {
// special case for expr_context: default to Load()
res = PyObject_SetAttr(self, name, state->Load_singleton);
if (res < 0) {
goto set_remaining_cleanup;
}
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
else {
// simple field (e.g., identifier)
if (PyErr_WarnFormat(
PyExc_DeprecationWarning, 1,
"%.400s.__init__ missing 1 required positional argument: '%U'. "
"This will become an error in Python 3.15.",
Py_TYPE(self)->tp_name, name
) < 0) {
gh-117486: Improve behavior for user-defined AST subclasses (#118212) Now, such classes will no longer require changes in Python 3.13 in the normal case. The test suite for robotframework passes with no DeprecationWarnings under this PR. I also added a new DeprecationWarning for the case where `_field_types` exists but is incomplete, since that seems likely to indicate a user mistake.
2024-05-06 19:57:27 -03:00
goto set_remaining_cleanup;
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
}
}
}
Py_DECREF(remaining_list);
Py_DECREF(field_types);
}
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
cleanup:
Py_XDECREF(fields);
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
Py_XDECREF(remaining_fields);
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
return res;
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
set_remaining_cleanup:
Py_XDECREF(remaining_list);
Py_XDECREF(field_types);
res = -1;
goto cleanup;
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
}
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
2008-03-31 02:29:39 -03:00
/* Pickling support */
static PyObject *
ast_type_reduce(PyObject *self, PyObject *unused)
{
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
struct ast_state *state = get_ast_state();
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
if (state == NULL) {
return NULL;
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
PyObject *dict = NULL, *fields = NULL, *remaining_fields = NULL,
*remaining_dict = NULL, *positional_args = NULL;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(self, state->__dict__, &dict) < 0) {
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
return NULL;
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
2008-03-31 02:29:39 -03:00
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
PyObject *result = NULL;
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
2008-03-31 02:29:39 -03:00
if (dict) {
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
// Serialize the fields as positional args if possible, because if we
// serialize them as a dict, during unpickling they are set only *after*
// the object is constructed, which will now trigger a DeprecationWarning
// if the AST type has required fields.
if (PyObject_GetOptionalAttr((PyObject*)Py_TYPE(self), state->_fields, &fields) < 0) {
goto cleanup;
}
if (fields) {
Py_ssize_t numfields = PySequence_Size(fields);
if (numfields == -1) {
Py_DECREF(dict);
goto cleanup;
}
remaining_dict = PyDict_Copy(dict);
Py_DECREF(dict);
if (!remaining_dict) {
goto cleanup;
}
positional_args = PyList_New(0);
if (!positional_args) {
goto cleanup;
}
for (Py_ssize_t i = 0; i < numfields; i++) {
PyObject *name = PySequence_GetItem(fields, i);
if (!name) {
goto cleanup;
}
gh-116437: Use new C API PyDict_Pop() to simplify the code (GH-116438)
2024-03-07 05:21:08 -04:00
PyObject *value;
int rc = PyDict_Pop(remaining_dict, name, &value);
Py_DECREF(name);
if (rc < 0) {
goto cleanup;
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
if (!value) {
break;
}
gh-116437: Use new C API PyDict_Pop() to simplify the code (GH-116438)
2024-03-07 05:21:08 -04:00
rc = PyList_Append(positional_args, value);
Py_DECREF(value);
if (rc < 0) {
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
goto cleanup;
}
}
PyObject *args_tuple = PyList_AsTuple(positional_args);
if (!args_tuple) {
goto cleanup;
}
result = Py_BuildValue("ONO", Py_TYPE(self), args_tuple,
remaining_dict);
}
else {
result = Py_BuildValue("O()N", Py_TYPE(self), dict);
}
}
else {
result = Py_BuildValue("O()", Py_TYPE(self));
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
2008-03-31 02:29:39 -03:00
}
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
cleanup:
Py_XDECREF(fields);
Py_XDECREF(remaining_fields);
Py_XDECREF(remaining_dict);
Py_XDECREF(positional_args);
return result;
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
2008-03-31 02:29:39 -03:00
}
bpo-38140: Make dict and weakref offsets opaque for C heap types (#16076) * Make dict and weakref offsets opaque for C heap types * Add news
2019-09-19 13:29:05 -03:00
static PyMemberDef ast_type_members[] = {
gh-106869: Use new PyMemberDef constant names (#106871) * Remove '#include "structmember.h"'. * If needed, add <stddef.h> to get offsetof() function. * Update Parser/asdl_c.py to regenerate Python/Python-ast.c. * Replace: * T_SHORT => Py_T_SHORT * T_INT => Py_T_INT * T_LONG => Py_T_LONG * T_FLOAT => Py_T_FLOAT * T_DOUBLE => Py_T_DOUBLE * T_STRING => Py_T_STRING * T_OBJECT => _Py_T_OBJECT * T_CHAR => Py_T_CHAR * T_BYTE => Py_T_BYTE * T_UBYTE => Py_T_UBYTE * T_USHORT => Py_T_USHORT * T_UINT => Py_T_UINT * T_ULONG => Py_T_ULONG * T_STRING_INPLACE => Py_T_STRING_INPLACE * T_BOOL => Py_T_BOOL * T_OBJECT_EX => Py_T_OBJECT_EX * T_LONGLONG => Py_T_LONGLONG * T_ULONGLONG => Py_T_ULONGLONG * T_PYSSIZET => Py_T_PYSSIZET * T_NONE => _Py_T_NONE * READONLY => Py_READONLY * PY_AUDIT_READ => Py_AUDIT_READ * READ_RESTRICTED => Py_AUDIT_READ * PY_WRITE_RESTRICTED => _Py_WRITE_RESTRICTED * RESTRICTED => (READ_RESTRICTED | _Py_WRITE_RESTRICTED)
2023-07-25 10:28:30 -03:00
{"__dictoffset__", Py_T_PYSSIZET, offsetof(AST_object, dict), Py_READONLY},
bpo-38140: Make dict and weakref offsets opaque for C heap types (#16076) * Make dict and weakref offsets opaque for C heap types * Add news
2019-09-19 13:29:05 -03:00
{NULL} /* Sentinel */
};
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
2008-03-31 02:29:39 -03:00
static PyMethodDef ast_type_methods[] = {
{"__reduce__", ast_type_reduce, METH_NOARGS, NULL},
{NULL}
};
give the AST class a __dict__
2012-03-12 13:46:44 -03:00
static PyGetSetDef ast_type_getsets[] = {
{"__dict__", PyObject_GenericGetDict, PyObject_GenericSetDict},
{NULL}
};
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
static PyType_Slot AST_type_slots[] = {
{Py_tp_dealloc, ast_dealloc},
{Py_tp_getattro, PyObject_GenericGetAttr},
{Py_tp_setattro, PyObject_GenericSetAttr},
{Py_tp_traverse, ast_traverse},
{Py_tp_clear, ast_clear},
bpo-38140: Make dict and weakref offsets opaque for C heap types (#16076) * Make dict and weakref offsets opaque for C heap types * Add news
2019-09-19 13:29:05 -03:00
{Py_tp_members, ast_type_members},
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
{Py_tp_methods, ast_type_methods},
{Py_tp_getset, ast_type_getsets},
{Py_tp_init, ast_type_init},
{Py_tp_alloc, PyType_GenericAlloc},
{Py_tp_new, PyType_GenericNew},
{Py_tp_free, PyObject_GC_Del},
{0, 0},
};
static PyType_Spec AST_type_spec = {
bpo-39999: Improve compatibility of the ast module. (GH-19056) * Re-add removed classes Suite, slice, Param, AugLoad and AugStore. * Add docstrings for dummy classes. * Add docstrings for attribute aliases. * Set __module__ to "ast" instead of "_ast".
2020-03-22 15:33:34 -03:00
"ast.AST",
give the AST class a __dict__
2012-03-12 13:46:44 -03:00
sizeof(AST_object),
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
0,
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE | Py_TPFLAGS_HAVE_GC,
AST_type_slots
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
};
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
static PyObject *
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
make_type(struct ast_state *state, const char *type, PyObject* base,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
const char* const* fields, int num_fields, const char *doc)
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
{
PyObject *fnames, *result;
int i;
Merged revisions 61440-61441,61443,61445-61448,61451-61452,61455-61457,61459-61464,61466-61467,61469-61470,61476-61477,61479,61481-61482,61485,61487,61490,61493-61494,61497,61499-61502,61505-61506,61508,61511-61514,61519,61521-61522,61530-61531,61533-61537,61541-61555,61557-61558,61561-61562,61566-61569,61572-61574,61578-61579,61583-61584,61588-61589,61592,61594,61598-61601,61603-61604,61607-61612,61617,61619-61620,61624,61626,61628-61630,61635-61638,61640-61643,61645,61648,61653-61655,61659-61662,61664,61666,61668-61671,61673,61675,61679-61680,61682,61685-61686,61689-61695,61697-61699,61701-61703,61706,61710,61713,61717,61723,61726-61730,61736,61738,61740,61742,61745-61752,61754-61760,61762-61764,61768,61770-61772,61774-61775,61784-61787,61789-61792,61794-61795,61797-61806,61808-61809,61811-61812,61814-61819,61824,61826-61833,61835-61840,61843-61845,61848,61850,61854-61862,61865-61866,61868,61872-61873,61876-61877,61883-61888,61890-61891,61893-61899,61901-61903,61905-61912,61914,61917,61920-61921,61927,61930,61932-61934,61939,61941-61942,61944-61951,61955,61960-61963,61980,61982-61983,61991,61994-61996,62001-62003,62008-62010,62016-62017,62022,62024,62027,62031-62034,62041,62045-62046,62048,62050-62051,62055-62066,62068-62074,62076-62078 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62048 | georg.brandl | 2008-03-29 23:53:55 -0700 (Sat, 29 Mar 2008) | 2 lines Adapt test_ast to the new ExceptHandler type. ........ r62050 | georg.brandl | 2008-03-30 00:09:22 -0700 (Sun, 30 Mar 2008) | 2 lines Convert test_ast to unittest and add a test for r62049. ........ r62051 | georg.brandl | 2008-03-30 12:00:49 -0700 (Sun, 30 Mar 2008) | 2 lines Make _fields attr for no fields consistent with _attributes attr. ........ r62059 | georg.brandl | 2008-03-30 13:20:39 -0700 (Sun, 30 Mar 2008) | 2 lines Make AST nodes pickleable. ........
2008-03-31 02:29:39 -03:00
fnames = PyTuple_New(num_fields);
if (!fnames) return NULL;
for (i = 0; i < num_fields; i++) {
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
PyObject *field = PyUnicode_InternFromString(fields[i]);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!field) {
Py_DECREF(fnames);
return NULL;
}
PyTuple_SET_ITEM(fnames, i, field);
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
result = PyObject_CallFunction((PyObject*)&PyType_Type, "s(O){OOOOOOOs}",
Issue #29369: Use Py_IDENTIFIER in Python-ast.c
2017-01-25 09:33:43 -04:00
type, base,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->_fields, fnames,
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
state->__match_args__, fnames,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->__module__,
state->ast,
state->__doc__, doc);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(fnames);
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
return result;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
}
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
static int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
add_attributes(struct ast_state *state, PyObject *type, const char * const *attrs, int num_fields)
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
{
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
2006-04-21 07:40:58 -03:00
int i, result;
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
PyObject *s, *l = PyTuple_New(num_fields);
Merged revisions 81465-81466,81468,81679,81735,81760,81868,82183 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81465 | georg.brandl | 2010-05-22 06:29:19 -0500 (Sat, 22 May 2010) | 2 lines Issue #3924: Ignore cookies with invalid "version" field in cookielib. ........ r81466 | georg.brandl | 2010-05-22 06:31:16 -0500 (Sat, 22 May 2010) | 1 line Underscore the name of an internal utility function. ........ r81468 | georg.brandl | 2010-05-22 06:43:25 -0500 (Sat, 22 May 2010) | 1 line #8635: document enumerate() start parameter in docstring. ........ r81679 | benjamin.peterson | 2010-06-03 16:21:03 -0500 (Thu, 03 Jun 2010) | 1 line use a set for membership testing ........ r81735 | michael.foord | 2010-06-05 06:46:59 -0500 (Sat, 05 Jun 2010) | 1 line Extract error message truncating into a method (unittest.TestCase._truncateMessage). ........ r81760 | michael.foord | 2010-06-05 14:38:42 -0500 (Sat, 05 Jun 2010) | 1 line Issue 8302. SkipTest exception is setUpClass or setUpModule is now reported as a skip rather than an error. ........ r81868 | benjamin.peterson | 2010-06-09 14:45:04 -0500 (Wed, 09 Jun 2010) | 1 line fix code formatting ........ r82183 | benjamin.peterson | 2010-06-23 15:29:26 -0500 (Wed, 23 Jun 2010) | 1 line cpython only gc tests ........
2010-06-27 18:45:24 -03:00
if (!l)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 81465-81466,81468,81679,81735,81760,81868,82183 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r81465 | georg.brandl | 2010-05-22 06:29:19 -0500 (Sat, 22 May 2010) | 2 lines Issue #3924: Ignore cookies with invalid "version" field in cookielib. ........ r81466 | georg.brandl | 2010-05-22 06:31:16 -0500 (Sat, 22 May 2010) | 1 line Underscore the name of an internal utility function. ........ r81468 | georg.brandl | 2010-05-22 06:43:25 -0500 (Sat, 22 May 2010) | 1 line #8635: document enumerate() start parameter in docstring. ........ r81679 | benjamin.peterson | 2010-06-03 16:21:03 -0500 (Thu, 03 Jun 2010) | 1 line use a set for membership testing ........ r81735 | michael.foord | 2010-06-05 06:46:59 -0500 (Sat, 05 Jun 2010) | 1 line Extract error message truncating into a method (unittest.TestCase._truncateMessage). ........ r81760 | michael.foord | 2010-06-05 14:38:42 -0500 (Sat, 05 Jun 2010) | 1 line Issue 8302. SkipTest exception is setUpClass or setUpModule is now reported as a skip rather than an error. ........ r81868 | benjamin.peterson | 2010-06-09 14:45:04 -0500 (Wed, 09 Jun 2010) | 1 line fix code formatting ........ r82183 | benjamin.peterson | 2010-06-23 15:29:26 -0500 (Wed, 23 Jun 2010) | 1 line cpython only gc tests ........
2010-06-27 18:45:24 -03:00
for (i = 0; i < num_fields; i++) {
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
s = PyUnicode_InternFromString(attrs[i]);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
if (!s) {
Py_DECREF(l);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
}
Merged revisions 62049,62054 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62049 | georg.brandl | 2008-03-30 00:01:47 -0700 (Sun, 30 Mar 2008) | 2 lines #2505: allow easier creation of AST nodes. ........ r62054 | georg.brandl | 2008-03-30 12:43:27 -0700 (Sun, 30 Mar 2008) | 2 lines Fix error message -- "expects either 0 or 0 arguments" ........
2008-03-31 01:42:11 -03:00
PyTuple_SET_ITEM(l, i, s);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
}
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
result = PyObject_SetAttr(type, state->_attributes, l);
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
2006-04-21 07:40:58 -03:00
Py_DECREF(l);
return result;
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
/* Conversion AST -> Python */
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_list(struct ast_state *state, struct validator *vstate, asdl_seq *seq,
PyObject* (*func)(struct ast_state *state, struct validator *vstate, void*))
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
{
use Py_ssize_t for ast sequence lengths
2012-05-15 14:10:27 -03:00
Py_ssize_t i, n = asdl_seq_LEN(seq);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
PyObject *result = PyList_New(n);
PyObject *value;
if (!result)
return NULL;
for (i = 0; i < n; i++) {
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = func(state, vstate, asdl_seq_GET_UNTYPED(seq, i));
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) {
Py_DECREF(result);
return NULL;
}
PyList_SET_ITEM(result, i, value);
}
return result;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_object(struct ast_state *Py_UNUSED(state), struct validator *Py_UNUSED(vstate), void *o)
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
{
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
PyObject *op = (PyObject*)o;
if (!op) {
op = Py_None;
}
return Py_NewRef(op);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
}
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
#define ast2obj_constant ast2obj_object
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
#define ast2obj_identifier ast2obj_object
#define ast2obj_string ast2obj_object
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
static PyObject* ast2obj_int(struct ast_state *Py_UNUSED(state), struct validator *Py_UNUSED(vstate), long b)
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
{
Cleanup: Replaced most PyInt_ aliases with PyLong_ and disabled the aliases in intobject.h
2007-12-02 10:31:20 -04:00
return PyLong_FromLong(b);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
/* Conversion Python -> AST */
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_object(struct ast_state *Py_UNUSED(state), PyObject* obj, PyObject** out, PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
if (obj == Py_None)
obj = NULL;
Issue #18552: Check return value of PyArena_AddPyObject() in obj2ast_object().
2013-07-26 19:33:13 -03:00
if (obj) {
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
if (_PyArena_AddPyObject(arena, obj) < 0) {
Issue #18552: Check return value of PyArena_AddPyObject() in obj2ast_object().
2013-07-26 19:33:13 -03:00
*out = NULL;
return -1;
}
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
*out = Py_NewRef(obj);
}
else {
*out = NULL;
Issue #18552: Check return value of PyArena_AddPyObject() in obj2ast_object().
2013-07-26 19:33:13 -03:00
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
return 0;
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_constant(struct ast_state *Py_UNUSED(state), PyObject* obj, PyObject** out, PyArena* arena)
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
{
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
if (_PyArena_AddPyObject(arena, obj) < 0) {
bpo-32892: Use ast.Constant instead of specific constant AST types. (GH-9445)
2018-09-27 11:42:37 -03:00
*out = NULL;
return -1;
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
}
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
*out = Py_NewRef(obj);
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
return 0;
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_identifier(struct ast_state *state, PyObject* obj, PyObject** out, PyArena* arena)
type check AST strings and identifiers This is related to a21829180423 as well as #12609 and #12610.
2011-07-22 12:50:23 -03:00
{
None is ok for identifiers but not strings
2011-07-22 13:09:07 -03:00
if (!PyUnicode_CheckExact(obj) && obj != Py_None) {
PyErr_SetString(PyExc_TypeError, "AST identifier must be of type str");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
type check AST strings and identifiers This is related to a21829180423 as well as #12609 and #12610.
2011-07-22 12:50:23 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
return obj2ast_object(state, obj, out, arena);
type check AST strings and identifiers This is related to a21829180423 as well as #12609 and #12610.
2011-07-22 12:50:23 -03:00
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_string(struct ast_state *state, PyObject* obj, PyObject** out, PyArena* arena)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
{
if (!PyUnicode_CheckExact(obj) && !PyBytes_CheckExact(obj)) {
PyErr_SetString(PyExc_TypeError, "AST string must be of type str");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
return obj2ast_object(state, obj, out, arena);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_int(struct ast_state* Py_UNUSED(state), PyObject* obj, int* out, PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
int i;
if (!PyLong_Check(obj)) {
Issue #13436: commit regenerated Python-ast.c
2011-11-22 16:52:30 -04:00
PyErr_Format(PyExc_ValueError, "invalid integer value: %R", obj);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
gh-108444: Remove _PyLong_AsInt() function (#108461) * Update Parser/asdl_c.py to regenerate Python/Python-ast.c. * Remove _PyLong_AsInt() alias to PyLong_AsInt().
2023-08-25 06:13:59 -03:00
i = PyLong_AsInt(obj);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
if (i == -1 && PyErr_Occurred())
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
*out = i;
return 0;
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int add_ast_fields(struct ast_state *state)
update Python-ast.c
2008-10-24 20:11:02 -03:00
{
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyObject *empty_tuple;
update Python-ast.c
2008-10-24 20:11:02 -03:00
empty_tuple = PyTuple_New(0);
if (!empty_tuple ||
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyObject_SetAttrString(state->AST_type, "_fields", empty_tuple) < 0 ||
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
PyObject_SetAttrString(state->AST_type, "__match_args__", empty_tuple) < 0 ||
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyObject_SetAttrString(state->AST_type, "_attributes", empty_tuple) < 0) {
update Python-ast.c
2008-10-24 20:11:02 -03:00
Py_XDECREF(empty_tuple);
return -1;
}
Py_DECREF(empty_tuple);
return 0;
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
static int
init_types(struct ast_state *state)
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
{
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
if (init_identifiers(state) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
}
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->AST_type = PyType_FromSpec(&AST_type_spec);
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
if (!state->AST_type) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
}
if (add_ast_fields(state) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->mod_type = make_type(state, "mod", state->AST_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"mod = Module(stmt* body, type_ignore* type_ignores)\n"
" | Interactive(stmt* body)\n"
" | Expression(expr body)\n"
" | FunctionType(expr* argtypes, expr returns)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->mod_type) return -1;
if (add_attributes(state, state->mod_type, NULL, 0) < 0) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Module_type = make_type(state, "Module", state->mod_type,
Module_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Module(stmt* body, type_ignore* type_ignores)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Module_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Interactive_type = make_type(state, "Interactive", state->mod_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Interactive_fields, 1,
"Interactive(stmt* body)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Interactive_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Expression_type = make_type(state, "Expression", state->mod_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Expression_fields, 1,
"Expression(expr body)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Expression_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->FunctionType_type = make_type(state, "FunctionType",
state->mod_type, FunctionType_fields,
2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"FunctionType(expr* argtypes, expr returns)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->FunctionType_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->stmt_type = make_type(state, "stmt", state->AST_type, NULL, 0,
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
"stmt = FunctionDef(identifier name, arguments args, stmt* body, expr* decorator_list, expr? returns, string? type_comment, type_param* type_params)\n"
" | AsyncFunctionDef(identifier name, arguments args, stmt* body, expr* decorator_list, expr? returns, string? type_comment, type_param* type_params)\n"
" | ClassDef(identifier name, expr* bases, keyword* keywords, stmt* body, expr* decorator_list, type_param* type_params)\n"
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
" | Return(expr? value)\n"
" | Delete(expr* targets)\n"
" | Assign(expr* targets, expr value, string? type_comment)\n"
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
" | TypeAlias(expr name, type_param* type_params, expr value)\n"
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
" | AugAssign(expr target, operator op, expr value)\n"
" | AnnAssign(expr target, expr annotation, expr? value, int simple)\n"
" | For(expr target, expr iter, stmt* body, stmt* orelse, string? type_comment)\n"
" | AsyncFor(expr target, expr iter, stmt* body, stmt* orelse, string? type_comment)\n"
" | While(expr test, stmt* body, stmt* orelse)\n"
" | If(expr test, stmt* body, stmt* orelse)\n"
" | With(withitem* items, stmt* body, string? type_comment)\n"
" | AsyncWith(withitem* items, stmt* body, string? type_comment)\n"
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
" | Match(expr subject, match_case* cases)\n"
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
" | Raise(expr? exc, expr? cause)\n"
" | Try(stmt* body, excepthandler* handlers, stmt* orelse, stmt* finalbody)\n"
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
" | TryStar(stmt* body, excepthandler* handlers, stmt* orelse, stmt* finalbody)\n"
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
" | Assert(expr test, expr? msg)\n"
" | Import(alias* names)\n"
" | ImportFrom(identifier? module, alias* names, int? level)\n"
" | Global(identifier* names)\n"
" | Nonlocal(identifier* names)\n"
" | Expr(expr value)\n"
" | Pass\n"
" | Break\n"
" | Continue");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->stmt_type) return -1;
if (add_attributes(state, state->stmt_type, stmt_attributes, 4) < 0) return
-1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->stmt_type, state->end_lineno, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->stmt_type, state->end_col_offset, Py_None) ==
-1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->FunctionDef_type = make_type(state, "FunctionDef", state->stmt_type,
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
FunctionDef_fields, 7,
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
"FunctionDef(identifier name, arguments args, stmt* body, expr* decorator_list, expr? returns, string? type_comment, type_param* type_params)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->FunctionDef_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->FunctionDef_type, state->returns, Py_None) ==
-1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->FunctionDef_type, state->type_comment, Py_None)
== -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->AsyncFunctionDef_type = make_type(state, "AsyncFunctionDef",
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->stmt_type,
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
AsyncFunctionDef_fields, 7,
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
"AsyncFunctionDef(identifier name, arguments args, stmt* body, expr* decorator_list, expr? returns, string? type_comment, type_param* type_params)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->AsyncFunctionDef_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->AsyncFunctionDef_type, state->returns, Py_None)
== -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->AsyncFunctionDef_type, state->type_comment,
Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->ClassDef_type = make_type(state, "ClassDef", state->stmt_type,
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
ClassDef_fields, 6,
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
"ClassDef(identifier name, expr* bases, keyword* keywords, stmt* body, expr* decorator_list, type_param* type_params)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->ClassDef_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Return_type = make_type(state, "Return", state->stmt_type,
Return_fields, 1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Return(expr? value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Return_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->Return_type, state->value, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Delete_type = make_type(state, "Delete", state->stmt_type,
Delete_fields, 1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Delete(expr* targets)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Delete_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Assign_type = make_type(state, "Assign", state->stmt_type,
Assign_fields, 3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Assign(expr* targets, expr value, string? type_comment)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Assign_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->Assign_type, state->type_comment, Py_None) ==
-1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
state->TypeAlias_type = make_type(state, "TypeAlias", state->stmt_type,
TypeAlias_fields, 3,
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
"TypeAlias(expr name, type_param* type_params, expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->TypeAlias_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->AugAssign_type = make_type(state, "AugAssign", state->stmt_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
AugAssign_fields, 3,
"AugAssign(expr target, operator op, expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->AugAssign_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->AnnAssign_type = make_type(state, "AnnAssign", state->stmt_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
AnnAssign_fields, 4,
"AnnAssign(expr target, expr annotation, expr? value, int simple)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->AnnAssign_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->AnnAssign_type, state->value, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->For_type = make_type(state, "For", state->stmt_type, For_fields, 5,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"For(expr target, expr iter, stmt* body, stmt* orelse, string? type_comment)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->For_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->For_type, state->type_comment, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->AsyncFor_type = make_type(state, "AsyncFor", state->stmt_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
AsyncFor_fields, 5,
"AsyncFor(expr target, expr iter, stmt* body, stmt* orelse, string? type_comment)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->AsyncFor_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->AsyncFor_type, state->type_comment, Py_None) ==
-1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->While_type = make_type(state, "While", state->stmt_type,
While_fields, 3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"While(expr test, stmt* body, stmt* orelse)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->While_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->If_type = make_type(state, "If", state->stmt_type, If_fields, 3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"If(expr test, stmt* body, stmt* orelse)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->If_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->With_type = make_type(state, "With", state->stmt_type, With_fields,
3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"With(withitem* items, stmt* body, string? type_comment)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->With_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->With_type, state->type_comment, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->AsyncWith_type = make_type(state, "AsyncWith", state->stmt_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
AsyncWith_fields, 3,
"AsyncWith(withitem* items, stmt* body, string? type_comment)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->AsyncWith_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->AsyncWith_type, state->type_comment, Py_None)
== -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
state->Match_type = make_type(state, "Match", state->stmt_type,
Match_fields, 2,
"Match(expr subject, match_case* cases)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Match_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Raise_type = make_type(state, "Raise", state->stmt_type,
Raise_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Raise(expr? exc, expr? cause)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Raise_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->Raise_type, state->exc, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->Raise_type, state->cause, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Try_type = make_type(state, "Try", state->stmt_type, Try_fields, 4,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Try(stmt* body, excepthandler* handlers, stmt* orelse, stmt* finalbody)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Try_type) return -1;
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
state->TryStar_type = make_type(state, "TryStar", state->stmt_type,
TryStar_fields, 4,
"TryStar(stmt* body, excepthandler* handlers, stmt* orelse, stmt* finalbody)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->TryStar_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Assert_type = make_type(state, "Assert", state->stmt_type,
Assert_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Assert(expr test, expr? msg)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Assert_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->Assert_type, state->msg, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Import_type = make_type(state, "Import", state->stmt_type,
Import_fields, 1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Import(alias* names)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Import_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->ImportFrom_type = make_type(state, "ImportFrom", state->stmt_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
ImportFrom_fields, 3,
"ImportFrom(identifier? module, alias* names, int? level)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->ImportFrom_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->ImportFrom_type, state->module, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->ImportFrom_type, state->level, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Global_type = make_type(state, "Global", state->stmt_type,
Global_fields, 1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Global(identifier* names)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Global_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Nonlocal_type = make_type(state, "Nonlocal", state->stmt_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Nonlocal_fields, 1,
"Nonlocal(identifier* names)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Nonlocal_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Expr_type = make_type(state, "Expr", state->stmt_type, Expr_fields,
1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Expr(expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Expr_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Pass_type = make_type(state, "Pass", state->stmt_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Pass");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Pass_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Break_type = make_type(state, "Break", state->stmt_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Break");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Break_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Continue_type = make_type(state, "Continue", state->stmt_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Continue");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Continue_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->expr_type = make_type(state, "expr", state->AST_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"expr = BoolOp(boolop op, expr* values)\n"
" | NamedExpr(expr target, expr value)\n"
" | BinOp(expr left, operator op, expr right)\n"
" | UnaryOp(unaryop op, expr operand)\n"
" | Lambda(arguments args, expr body)\n"
" | IfExp(expr test, expr body, expr orelse)\n"
" | Dict(expr* keys, expr* values)\n"
" | Set(expr* elts)\n"
" | ListComp(expr elt, comprehension* generators)\n"
" | SetComp(expr elt, comprehension* generators)\n"
" | DictComp(expr key, expr value, comprehension* generators)\n"
" | GeneratorExp(expr elt, comprehension* generators)\n"
" | Await(expr value)\n"
" | Yield(expr? value)\n"
" | YieldFrom(expr value)\n"
" | Compare(expr left, cmpop* ops, expr* comparators)\n"
" | Call(expr func, expr* args, keyword* keywords)\n"
bpo-46289: Make conversion of FormattedValue not optional on ASDL (GH-30467) Automerge-Triggered-By: GH:isidentical
2022-01-07 17:05:28 -04:00
" | FormattedValue(expr value, int conversion, expr? format_spec)\n"
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
" | JoinedStr(expr* values)\n"
" | Constant(constant value, string? kind)\n"
" | Attribute(expr value, identifier attr, expr_context ctx)\n"
" | Subscript(expr value, expr slice, expr_context ctx)\n"
" | Starred(expr value, expr_context ctx)\n"
" | Name(identifier id, expr_context ctx)\n"
" | List(expr* elts, expr_context ctx)\n"
" | Tuple(expr* elts, expr_context ctx)\n"
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
" | Slice(expr? lower, expr? upper, expr? step)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->expr_type) return -1;
if (add_attributes(state, state->expr_type, expr_attributes, 4) < 0) return
-1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->expr_type, state->end_lineno, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->expr_type, state->end_col_offset, Py_None) ==
-1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->BoolOp_type = make_type(state, "BoolOp", state->expr_type,
BoolOp_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"BoolOp(boolop op, expr* values)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BoolOp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->NamedExpr_type = make_type(state, "NamedExpr", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
NamedExpr_fields, 2,
"NamedExpr(expr target, expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->NamedExpr_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->BinOp_type = make_type(state, "BinOp", state->expr_type,
BinOp_fields, 3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"BinOp(expr left, operator op, expr right)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BinOp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->UnaryOp_type = make_type(state, "UnaryOp", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
UnaryOp_fields, 2,
"UnaryOp(unaryop op, expr operand)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->UnaryOp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Lambda_type = make_type(state, "Lambda", state->expr_type,
Lambda_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Lambda(arguments args, expr body)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Lambda_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->IfExp_type = make_type(state, "IfExp", state->expr_type,
IfExp_fields, 3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"IfExp(expr test, expr body, expr orelse)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->IfExp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Dict_type = make_type(state, "Dict", state->expr_type, Dict_fields,
2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Dict(expr* keys, expr* values)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Dict_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Set_type = make_type(state, "Set", state->expr_type, Set_fields, 1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Set(expr* elts)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Set_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->ListComp_type = make_type(state, "ListComp", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
ListComp_fields, 2,
"ListComp(expr elt, comprehension* generators)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->ListComp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->SetComp_type = make_type(state, "SetComp", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
SetComp_fields, 2,
"SetComp(expr elt, comprehension* generators)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->SetComp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->DictComp_type = make_type(state, "DictComp", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
DictComp_fields, 3,
"DictComp(expr key, expr value, comprehension* generators)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->DictComp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->GeneratorExp_type = make_type(state, "GeneratorExp",
state->expr_type, GeneratorExp_fields,
2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"GeneratorExp(expr elt, comprehension* generators)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->GeneratorExp_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Await_type = make_type(state, "Await", state->expr_type,
Await_fields, 1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Await(expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Await_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Yield_type = make_type(state, "Yield", state->expr_type,
Yield_fields, 1,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Yield(expr? value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Yield_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->Yield_type, state->value, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->YieldFrom_type = make_type(state, "YieldFrom", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
YieldFrom_fields, 1,
"YieldFrom(expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->YieldFrom_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Compare_type = make_type(state, "Compare", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Compare_fields, 3,
"Compare(expr left, cmpop* ops, expr* comparators)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Compare_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Call_type = make_type(state, "Call", state->expr_type, Call_fields,
3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Call(expr func, expr* args, keyword* keywords)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Call_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->FormattedValue_type = make_type(state, "FormattedValue",
state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
FormattedValue_fields, 3,
bpo-46289: Make conversion of FormattedValue not optional on ASDL (GH-30467) Automerge-Triggered-By: GH:isidentical
2022-01-07 17:05:28 -04:00
"FormattedValue(expr value, int conversion, expr? format_spec)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->FormattedValue_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->FormattedValue_type, state->format_spec,
Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->JoinedStr_type = make_type(state, "JoinedStr", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
JoinedStr_fields, 1,
"JoinedStr(expr* values)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->JoinedStr_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Constant_type = make_type(state, "Constant", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Constant_fields, 2,
"Constant(constant value, string? kind)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Constant_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->Constant_type, state->kind, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Attribute_type = make_type(state, "Attribute", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Attribute_fields, 3,
"Attribute(expr value, identifier attr, expr_context ctx)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Attribute_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Subscript_type = make_type(state, "Subscript", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Subscript_fields, 3,
"Subscript(expr value, expr slice, expr_context ctx)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Subscript_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Starred_type = make_type(state, "Starred", state->expr_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
Starred_fields, 2,
"Starred(expr value, expr_context ctx)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Starred_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Name_type = make_type(state, "Name", state->expr_type, Name_fields,
2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Name(identifier id, expr_context ctx)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Name_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->List_type = make_type(state, "List", state->expr_type, List_fields,
2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"List(expr* elts, expr_context ctx)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->List_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Tuple_type = make_type(state, "Tuple", state->expr_type,
Tuple_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Tuple(expr* elts, expr_context ctx)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Tuple_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Slice_type = make_type(state, "Slice", state->expr_type,
Slice_fields, 3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Slice(expr? lower, expr? upper, expr? step)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Slice_type) return -1;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
if (PyObject_SetAttr(state->Slice_type, state->lower, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
if (PyObject_SetAttr(state->Slice_type, state->upper, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
if (PyObject_SetAttr(state->Slice_type, state->step, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->expr_context_type = make_type(state, "expr_context",
state->AST_type, NULL, 0,
bpo-39988: Remove ast.AugLoad and ast.AugStore node classes. (GH-19038)
2020-03-17 18:41:08 -03:00
"expr_context = Load | Store | Del");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->expr_context_type) return -1;
if (add_attributes(state, state->expr_context_type, NULL, 0) < 0) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Load_type = make_type(state, "Load", state->expr_context_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Load");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Load_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Load_singleton = PyType_GenericNew((PyTypeObject *)state->Load_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Load_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Store_type = make_type(state, "Store", state->expr_context_type,
NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Store");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Store_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Store_singleton = PyType_GenericNew((PyTypeObject
*)state->Store_type, NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Store_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Del_type = make_type(state, "Del", state->expr_context_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Del");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Del_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Del_singleton = PyType_GenericNew((PyTypeObject *)state->Del_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Del_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->boolop_type = make_type(state, "boolop", state->AST_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"boolop = And | Or");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->boolop_type) return -1;
if (add_attributes(state, state->boolop_type, NULL, 0) < 0) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->And_type = make_type(state, "And", state->boolop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"And");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->And_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->And_singleton = PyType_GenericNew((PyTypeObject *)state->And_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->And_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Or_type = make_type(state, "Or", state->boolop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Or");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Or_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Or_singleton = PyType_GenericNew((PyTypeObject *)state->Or_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Or_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->operator_type = make_type(state, "operator", state->AST_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"operator = Add | Sub | Mult | MatMult | Div | Mod | Pow | LShift | RShift | BitOr | BitXor | BitAnd | FloorDiv");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->operator_type) return -1;
if (add_attributes(state, state->operator_type, NULL, 0) < 0) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Add_type = make_type(state, "Add", state->operator_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Add");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Add_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Add_singleton = PyType_GenericNew((PyTypeObject *)state->Add_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Add_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Sub_type = make_type(state, "Sub", state->operator_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Sub");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Sub_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Sub_singleton = PyType_GenericNew((PyTypeObject *)state->Sub_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Sub_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Mult_type = make_type(state, "Mult", state->operator_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Mult");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Mult_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Mult_singleton = PyType_GenericNew((PyTypeObject *)state->Mult_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Mult_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->MatMult_type = make_type(state, "MatMult", state->operator_type,
NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"MatMult");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatMult_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->MatMult_singleton = PyType_GenericNew((PyTypeObject
*)state->MatMult_type, NULL,
NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatMult_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Div_type = make_type(state, "Div", state->operator_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Div");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Div_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Div_singleton = PyType_GenericNew((PyTypeObject *)state->Div_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Div_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Mod_type = make_type(state, "Mod", state->operator_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Mod");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Mod_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Mod_singleton = PyType_GenericNew((PyTypeObject *)state->Mod_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Mod_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Pow_type = make_type(state, "Pow", state->operator_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Pow");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Pow_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Pow_singleton = PyType_GenericNew((PyTypeObject *)state->Pow_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Pow_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->LShift_type = make_type(state, "LShift", state->operator_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"LShift");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->LShift_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->LShift_singleton = PyType_GenericNew((PyTypeObject
*)state->LShift_type, NULL,
NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->LShift_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->RShift_type = make_type(state, "RShift", state->operator_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"RShift");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->RShift_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->RShift_singleton = PyType_GenericNew((PyTypeObject
*)state->RShift_type, NULL,
NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->RShift_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->BitOr_type = make_type(state, "BitOr", state->operator_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"BitOr");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BitOr_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->BitOr_singleton = PyType_GenericNew((PyTypeObject
*)state->BitOr_type, NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BitOr_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->BitXor_type = make_type(state, "BitXor", state->operator_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"BitXor");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BitXor_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->BitXor_singleton = PyType_GenericNew((PyTypeObject
*)state->BitXor_type, NULL,
NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BitXor_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->BitAnd_type = make_type(state, "BitAnd", state->operator_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"BitAnd");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BitAnd_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->BitAnd_singleton = PyType_GenericNew((PyTypeObject
*)state->BitAnd_type, NULL,
NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->BitAnd_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->FloorDiv_type = make_type(state, "FloorDiv", state->operator_type,
NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"FloorDiv");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->FloorDiv_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->FloorDiv_singleton = PyType_GenericNew((PyTypeObject
*)state->FloorDiv_type, NULL,
NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->FloorDiv_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->unaryop_type = make_type(state, "unaryop", state->AST_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"unaryop = Invert | Not | UAdd | USub");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->unaryop_type) return -1;
if (add_attributes(state, state->unaryop_type, NULL, 0) < 0) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Invert_type = make_type(state, "Invert", state->unaryop_type, NULL,
0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Invert");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Invert_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Invert_singleton = PyType_GenericNew((PyTypeObject
*)state->Invert_type, NULL,
NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Invert_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Not_type = make_type(state, "Not", state->unaryop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Not");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Not_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Not_singleton = PyType_GenericNew((PyTypeObject *)state->Not_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Not_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->UAdd_type = make_type(state, "UAdd", state->unaryop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"UAdd");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->UAdd_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->UAdd_singleton = PyType_GenericNew((PyTypeObject *)state->UAdd_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->UAdd_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->USub_type = make_type(state, "USub", state->unaryop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"USub");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->USub_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->USub_singleton = PyType_GenericNew((PyTypeObject *)state->USub_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->USub_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->cmpop_type = make_type(state, "cmpop", state->AST_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"cmpop = Eq | NotEq | Lt | LtE | Gt | GtE | Is | IsNot | In | NotIn");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->cmpop_type) return -1;
if (add_attributes(state, state->cmpop_type, NULL, 0) < 0) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Eq_type = make_type(state, "Eq", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Eq");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Eq_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Eq_singleton = PyType_GenericNew((PyTypeObject *)state->Eq_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Eq_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->NotEq_type = make_type(state, "NotEq", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"NotEq");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->NotEq_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->NotEq_singleton = PyType_GenericNew((PyTypeObject
*)state->NotEq_type, NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->NotEq_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Lt_type = make_type(state, "Lt", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Lt");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Lt_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Lt_singleton = PyType_GenericNew((PyTypeObject *)state->Lt_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Lt_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->LtE_type = make_type(state, "LtE", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"LtE");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->LtE_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->LtE_singleton = PyType_GenericNew((PyTypeObject *)state->LtE_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->LtE_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Gt_type = make_type(state, "Gt", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Gt");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Gt_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Gt_singleton = PyType_GenericNew((PyTypeObject *)state->Gt_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Gt_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->GtE_type = make_type(state, "GtE", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"GtE");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->GtE_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->GtE_singleton = PyType_GenericNew((PyTypeObject *)state->GtE_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->GtE_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->Is_type = make_type(state, "Is", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"Is");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Is_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->Is_singleton = PyType_GenericNew((PyTypeObject *)state->Is_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->Is_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->IsNot_type = make_type(state, "IsNot", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"IsNot");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->IsNot_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->IsNot_singleton = PyType_GenericNew((PyTypeObject
*)state->IsNot_type, NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->IsNot_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->In_type = make_type(state, "In", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"In");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->In_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->In_singleton = PyType_GenericNew((PyTypeObject *)state->In_type,
NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->In_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->NotIn_type = make_type(state, "NotIn", state->cmpop_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"NotIn");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->NotIn_type) return -1;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->NotIn_singleton = PyType_GenericNew((PyTypeObject
*)state->NotIn_type, NULL, NULL);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->NotIn_singleton) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->comprehension_type = make_type(state, "comprehension",
state->AST_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
comprehension_fields, 4,
"comprehension(expr target, expr iter, expr* ifs, int is_async)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->comprehension_type) return -1;
if (add_attributes(state, state->comprehension_type, NULL, 0) < 0) return
-1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->excepthandler_type = make_type(state, "excepthandler",
state->AST_type, NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"excepthandler = ExceptHandler(expr? type, identifier? name, stmt* body)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->excepthandler_type) return -1;
if (add_attributes(state, state->excepthandler_type,
excepthandler_attributes, 4) < 0) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->excepthandler_type, state->end_lineno, Py_None)
== -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->excepthandler_type, state->end_col_offset,
Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->ExceptHandler_type = make_type(state, "ExceptHandler",
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
state->excepthandler_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
ExceptHandler_fields, 3,
"ExceptHandler(expr? type, identifier? name, stmt* body)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->ExceptHandler_type) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->ExceptHandler_type, state->type, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->ExceptHandler_type, state->name, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->arguments_type = make_type(state, "arguments", state->AST_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
arguments_fields, 7,
"arguments(arg* posonlyargs, arg* args, arg? vararg, arg* kwonlyargs, expr* kw_defaults, arg? kwarg, expr* defaults)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->arguments_type) return -1;
if (add_attributes(state, state->arguments_type, NULL, 0) < 0) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->arguments_type, state->vararg, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->arguments_type, state->kwarg, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->arg_type = make_type(state, "arg", state->AST_type, arg_fields, 3,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"arg(identifier arg, expr? annotation, string? type_comment)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->arg_type) return -1;
if (add_attributes(state, state->arg_type, arg_attributes, 4) < 0) return
-1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->arg_type, state->annotation, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->arg_type, state->type_comment, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->arg_type, state->end_lineno, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->arg_type, state->end_col_offset, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->keyword_type = make_type(state, "keyword", state->AST_type,
keyword_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"keyword(identifier? arg, expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->keyword_type) return -1;
if (add_attributes(state, state->keyword_type, keyword_attributes, 4) < 0)
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->keyword_type, state->arg, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (PyObject_SetAttr(state->keyword_type, state->end_lineno, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (PyObject_SetAttr(state->keyword_type, state->end_col_offset, Py_None)
== -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->alias_type = make_type(state, "alias", state->AST_type,
alias_fields, 2,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"alias(identifier name, identifier? asname)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->alias_type) return -1;
if (add_attributes(state, state->alias_type, alias_attributes, 4) < 0)
return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->alias_type, state->asname, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (PyObject_SetAttr(state->alias_type, state->end_lineno, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (PyObject_SetAttr(state->alias_type, state->end_col_offset, Py_None) ==
-1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->withitem_type = make_type(state, "withitem", state->AST_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
withitem_fields, 2,
"withitem(expr context_expr, expr? optional_vars)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->withitem_type) return -1;
if (add_attributes(state, state->withitem_type, NULL, 0) < 0) return -1;
bpo-36287: Make ast.dump() not output optional fields and attributes with default values. (GH-18843) The default values for optional fields and attributes of AST nodes are now set as class attributes (e.g. Constant.kind is set to None).
2020-03-09 19:07:47 -03:00
if (PyObject_SetAttr(state->withitem_type, state->optional_vars, Py_None)
== -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
state->match_case_type = make_type(state, "match_case", state->AST_type,
match_case_fields, 3,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
"match_case(pattern pattern, expr? guard, stmt* body)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->match_case_type) return -1;
if (add_attributes(state, state->match_case_type, NULL, 0) < 0) return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (PyObject_SetAttr(state->match_case_type, state->guard, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->pattern_type = make_type(state, "pattern", state->AST_type, NULL, 0,
"pattern = MatchValue(expr value)\n"
" | MatchSingleton(constant value)\n"
" | MatchSequence(pattern* patterns)\n"
" | MatchMapping(expr* keys, pattern* patterns, identifier? rest)\n"
" | MatchClass(expr cls, pattern* patterns, identifier* kwd_attrs, pattern* kwd_patterns)\n"
" | MatchStar(identifier? name)\n"
" | MatchAs(pattern? pattern, identifier? name)\n"
" | MatchOr(pattern* patterns)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->pattern_type) return -1;
if (add_attributes(state, state->pattern_type, pattern_attributes, 4) < 0)
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchValue_type = make_type(state, "MatchValue",
state->pattern_type, MatchValue_fields,
1,
"MatchValue(expr value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchValue_type) return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchSingleton_type = make_type(state, "MatchSingleton",
state->pattern_type,
MatchSingleton_fields, 1,
"MatchSingleton(constant value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchSingleton_type) return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchSequence_type = make_type(state, "MatchSequence",
state->pattern_type,
MatchSequence_fields, 1,
"MatchSequence(pattern* patterns)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchSequence_type) return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchMapping_type = make_type(state, "MatchMapping",
state->pattern_type,
MatchMapping_fields, 3,
"MatchMapping(expr* keys, pattern* patterns, identifier? rest)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchMapping_type) return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (PyObject_SetAttr(state->MatchMapping_type, state->rest, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchClass_type = make_type(state, "MatchClass",
state->pattern_type, MatchClass_fields,
4,
"MatchClass(expr cls, pattern* patterns, identifier* kwd_attrs, pattern* kwd_patterns)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchClass_type) return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchStar_type = make_type(state, "MatchStar", state->pattern_type,
MatchStar_fields, 1,
"MatchStar(identifier? name)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchStar_type) return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (PyObject_SetAttr(state->MatchStar_type, state->name, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchAs_type = make_type(state, "MatchAs", state->pattern_type,
MatchAs_fields, 2,
"MatchAs(pattern? pattern, identifier? name)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchAs_type) return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (PyObject_SetAttr(state->MatchAs_type, state->pattern, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (PyObject_SetAttr(state->MatchAs_type, state->name, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
state->MatchOr_type = make_type(state, "MatchOr", state->pattern_type,
MatchOr_fields, 1,
"MatchOr(pattern* patterns)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->MatchOr_type) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->type_ignore_type = make_type(state, "type_ignore", state->AST_type,
NULL, 0,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
"type_ignore = TypeIgnore(int lineno, string tag)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->type_ignore_type) return -1;
if (add_attributes(state, state->type_ignore_type, NULL, 0) < 0) return -1;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
state->TypeIgnore_type = make_type(state, "TypeIgnore",
state->type_ignore_type,
bpo-39638: Keep ASDL signatures in the AST nodes (GH-18515)
2020-03-16 05:12:53 -03:00
TypeIgnore_fields, 2,
"TypeIgnore(int lineno, string tag)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->TypeIgnore_type) return -1;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
state->type_param_type = make_type(state, "type_param", state->AST_type,
NULL, 0,
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
"type_param = TypeVar(identifier name, expr? bound, expr? default_value)\n"
" | ParamSpec(identifier name, expr? default_value)\n"
" | TypeVarTuple(identifier name, expr? default_value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->type_param_type) return -1;
if (add_attributes(state, state->type_param_type, type_param_attributes, 4)
< 0) return -1;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
state->TypeVar_type = make_type(state, "TypeVar", state->type_param_type,
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
TypeVar_fields, 3,
"TypeVar(identifier name, expr? bound, expr? default_value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->TypeVar_type) return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (PyObject_SetAttr(state->TypeVar_type, state->bound, Py_None) == -1)
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
if (PyObject_SetAttr(state->TypeVar_type, state->default_value, Py_None) ==
-1)
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
state->ParamSpec_type = make_type(state, "ParamSpec",
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
state->type_param_type, ParamSpec_fields,
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
2,
"ParamSpec(identifier name, expr? default_value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->ParamSpec_type) return -1;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
if (PyObject_SetAttr(state->ParamSpec_type, state->default_value, Py_None)
== -1)
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
state->TypeVarTuple_type = make_type(state, "TypeVarTuple",
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
state->type_param_type,
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
TypeVarTuple_fields, 2,
"TypeVarTuple(identifier name, expr? default_value)");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
if (!state->TypeVarTuple_type) return -1;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
if (PyObject_SetAttr(state->TypeVarTuple_type, state->default_value,
Py_None) == -1)
return -1;
bpo-41796: Call _PyAST_Fini() earlier to fix a leak (GH-23131) Call _PyAST_Fini() on all interpreters, not only on the main interpreter. Also, call it ealier to fix a reference leak. Python types contain a reference to themselves in in their PyTypeObject.tp_mro member. _PyAST_Fini() must called before the last GC collection to destroy AST types. _PyInterpreterState_Clear() now calls _PyAST_Fini(). It now also calls _PyWarnings_Fini() on subinterpeters, not only on the main interpreter. Add an assertion in AST init_types() to ensure that the _ast module is no longer used after _PyAST_Fini() has been called.
2020-11-03 13:07:15 -04:00
gh-105858: Improve AST node constructors (#105880) Demonstration: >>> ast.FunctionDef.__annotations__ {'name': <class 'str'>, 'args': <class 'ast.arguments'>, 'body': list[ast.stmt], 'decorator_list': list[ast.expr], 'returns': ast.expr | None, 'type_comment': str | None, 'type_params': list[ast.type_param]} >>> ast.FunctionDef() <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'name'. This will become an error in Python 3.15. <stdin>:1: DeprecationWarning: FunctionDef.__init__ missing 1 required positional argument: 'args'. This will become an error in Python 3.15. <ast.FunctionDef object at 0x101959460> >>> node = ast.FunctionDef(name="foo", args=ast.arguments()) >>> node.decorator_list [] >>> ast.FunctionDef(whatever="you want", name="x", args=ast.arguments()) <stdin>:1: DeprecationWarning: FunctionDef.__init__ got an unexpected keyword argument 'whatever'. Support for arbitrary keyword arguments is deprecated and will be removed in Python 3.15. <ast.FunctionDef object at 0x1019581f0>
2024-02-27 22:13:03 -04:00
if (!add_ast_annotations(state)) {
return -1;
}
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return 0;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
}
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 15:14:20 -04:00
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_mod(struct ast_state *state, PyObject* obj, mod_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_stmt(struct ast_state *state, PyObject* obj, stmt_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_expr(struct ast_state *state, PyObject* obj, expr_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_expr_context(struct ast_state *state, PyObject* obj,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
expr_context_ty* out, PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_boolop(struct ast_state *state, PyObject* obj, boolop_ty*
out, PyArena* arena);
static int obj2ast_operator(struct ast_state *state, PyObject* obj,
operator_ty* out, PyArena* arena);
static int obj2ast_unaryop(struct ast_state *state, PyObject* obj, unaryop_ty*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
out, PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_cmpop(struct ast_state *state, PyObject* obj, cmpop_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_comprehension(struct ast_state *state, PyObject* obj,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
comprehension_ty* out, PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_excepthandler(struct ast_state *state, PyObject* obj,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
excepthandler_ty* out, PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_arguments(struct ast_state *state, PyObject* obj,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
arguments_ty* out, PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_arg(struct ast_state *state, PyObject* obj, arg_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_keyword(struct ast_state *state, PyObject* obj, keyword_ty*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
out, PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_alias(struct ast_state *state, PyObject* obj, alias_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_withitem(struct ast_state *state, PyObject* obj,
withitem_ty* out, PyArena* arena);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
static int obj2ast_match_case(struct ast_state *state, PyObject* obj,
match_case_ty* out, PyArena* arena);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
static int obj2ast_pattern(struct ast_state *state, PyObject* obj, pattern_ty*
out, PyArena* arena);
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
static int obj2ast_type_ignore(struct ast_state *state, PyObject* obj,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
type_ignore_ty* out, PyArena* arena);
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
static int obj2ast_type_param(struct ast_state *state, PyObject* obj,
type_param_ty* out, PyArena* arena);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
mod_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Module(asdl_stmt_seq * body, asdl_type_ignore_seq * type_ignores,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
mod_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (mod_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Module_kind;
p->v.Module.body = body;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.Module.type_ignores = type_ignores;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
mod_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Interactive(asdl_stmt_seq * body, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
mod_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (mod_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Interactive_kind;
p->v.Interactive.body = body;
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
mod_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Expression(expr_ty body, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
mod_ty p;
if (!body) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'body' is required for Expression");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (mod_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Expression_kind;
p->v.Expression.body = body;
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
mod_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_FunctionType(asdl_expr_seq * argtypes, expr_ty returns, PyArena *arena)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
{
mod_ty p;
if (!returns) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'returns' is required for FunctionType");
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (mod_ty)_PyArena_Malloc(arena, sizeof(*p));
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!p)
return NULL;
p->kind = FunctionType_kind;
p->v.FunctionType.argtypes = argtypes;
p->v.FunctionType.returns = returns;
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
_PyAST_FunctionDef(identifier name, arguments_ty args, asdl_stmt_seq * body,
asdl_expr_seq * decorator_list, expr_ty returns, string
type_comment, asdl_type_param_seq * type_params, int lineno,
int col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'name' is required for FunctionDef");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!args) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'args' is required for FunctionDef");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = FunctionDef_kind;
p->v.FunctionDef.name = name;
p->v.FunctionDef.args = args;
p->v.FunctionDef.body = body;
p->v.FunctionDef.decorator_list = decorator_list;
p->v.FunctionDef.returns = returns;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.FunctionDef.type_comment = type_comment;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
p->v.FunctionDef.type_params = type_params;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
stmt_ty
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
_PyAST_AsyncFunctionDef(identifier name, arguments_ty args, asdl_stmt_seq *
body, asdl_expr_seq * decorator_list, expr_ty returns,
string type_comment, asdl_type_param_seq * type_params,
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
{
stmt_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'name' is required for AsyncFunctionDef");
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return NULL;
}
if (!args) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'args' is required for AsyncFunctionDef");
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!p)
return NULL;
p->kind = AsyncFunctionDef_kind;
p->v.AsyncFunctionDef.name = name;
p->v.AsyncFunctionDef.args = args;
p->v.AsyncFunctionDef.body = body;
p->v.AsyncFunctionDef.decorator_list = decorator_list;
p->v.AsyncFunctionDef.returns = returns;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.AsyncFunctionDef.type_comment = type_comment;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
p->v.AsyncFunctionDef.type_params = type_params;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
_PyAST_ClassDef(identifier name, asdl_expr_seq * bases, asdl_keyword_seq *
keywords, asdl_stmt_seq * body, asdl_expr_seq * decorator_list,
asdl_type_param_seq * type_params, int lineno, int col_offset,
int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'name' is required for ClassDef");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = ClassDef_kind;
p->v.ClassDef.name = name;
p->v.ClassDef.bases = bases;
p->v.ClassDef.keywords = keywords;
p->v.ClassDef.body = body;
p->v.ClassDef.decorator_list = decorator_list;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
p->v.ClassDef.type_params = type_params;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Return(expr_ty value, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Return_kind;
p->v.Return.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Delete(asdl_expr_seq * targets, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Delete_kind;
p->v.Delete.targets = targets;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Assign(asdl_expr_seq * targets, expr_ty value, string type_comment, int
lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for Assign");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Assign_kind;
p->v.Assign.targets = targets;
p->v.Assign.value = value;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.Assign.type_comment = type_comment;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
stmt_ty
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
_PyAST_TypeAlias(expr_ty name, asdl_type_param_seq * type_params, expr_ty
value, int lineno, int col_offset, int end_lineno, int
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
end_col_offset, PyArena *arena)
{
stmt_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
"field 'name' is required for TypeAlias");
return NULL;
}
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field 'value' is required for TypeAlias");
return NULL;
}
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = TypeAlias_kind;
p->v.TypeAlias.name = name;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
p->v.TypeAlias.type_params = type_params;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
p->v.TypeAlias.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_AugAssign(expr_ty target, operator_ty op, expr_ty value, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'target' is required for AugAssign");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!op) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'op' is required for AugAssign");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for AugAssign");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = AugAssign_kind;
p->v.AugAssign.target = target;
p->v.AugAssign.op = op;
p->v.AugAssign.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_AnnAssign(expr_ty target, expr_ty annotation, expr_ty value, int simple,
int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
{
stmt_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'target' is required for AnnAssign");
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
return NULL;
}
if (!annotation) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'annotation' is required for AnnAssign");
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (!p)
return NULL;
p->kind = AnnAssign_kind;
p->v.AnnAssign.target = target;
p->v.AnnAssign.annotation = annotation;
p->v.AnnAssign.value = value;
p->v.AnnAssign.simple = simple;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_For(expr_ty target, expr_ty iter, asdl_stmt_seq * body, asdl_stmt_seq *
orelse, string type_comment, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'target' is required for For");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!iter) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'iter' is required for For");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = For_kind;
p->v.For.target = target;
p->v.For.iter = iter;
p->v.For.body = body;
p->v.For.orelse = orelse;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.For.type_comment = type_comment;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_AsyncFor(expr_ty target, expr_ty iter, asdl_stmt_seq * body,
asdl_stmt_seq * orelse, string type_comment, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
{
stmt_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'target' is required for AsyncFor");
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return NULL;
}
if (!iter) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'iter' is required for AsyncFor");
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!p)
return NULL;
p->kind = AsyncFor_kind;
p->v.AsyncFor.target = target;
p->v.AsyncFor.iter = iter;
p->v.AsyncFor.body = body;
p->v.AsyncFor.orelse = orelse;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.AsyncFor.type_comment = type_comment;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_While(expr_ty test, asdl_stmt_seq * body, asdl_stmt_seq * orelse, int
lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'test' is required for While");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = While_kind;
p->v.While.test = test;
p->v.While.body = body;
p->v.While.orelse = orelse;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_If(expr_ty test, asdl_stmt_seq * body, asdl_stmt_seq * orelse, int
lineno, int col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'test' is required for If");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = If_kind;
p->v.If.test = test;
p->v.If.body = body;
p->v.If.orelse = orelse;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 18:32:47 -04:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_With(asdl_withitem_seq * items, asdl_stmt_seq * body, string
type_comment, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 18:32:47 -04:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = With_kind;
p->v.With.items = items;
p->v.With.body = body;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.With.type_comment = type_comment;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
PEP 343 -- the with-statement. This was started by Mike Bland and completed by Guido (with help from Neal). This still needs a __future__ statement added; Thomas is working on Michael's patch for that aspect. There's a small amount of code cleanup and refactoring in ast.c, compile.c and ceval.c (I fixed the lltrace behavior when EXT_POP is used -- however I had to make lltrace a static global).
2006-02-27 18:32:47 -04:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_AsyncWith(asdl_withitem_seq * items, asdl_stmt_seq * body, string
type_comment, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
{
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!p)
return NULL;
p->kind = AsyncWith_kind;
p->v.AsyncWith.items = items;
p->v.AsyncWith.body = body;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->v.AsyncWith.type_comment = type_comment;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return p;
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Match(expr_ty subject, asdl_match_case_seq * cases, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
{
stmt_ty p;
if (!subject) {
PyErr_SetString(PyExc_ValueError,
"field 'subject' is required for Match");
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (!p)
return NULL;
p->kind = Match_kind;
p->v.Match.subject = subject;
p->v.Match.cases = cases;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Raise(expr_ty exc, expr_ty cause, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Raise_kind;
p->v.Raise.exc = exc;
p->v.Raise.cause = cause;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Try(asdl_stmt_seq * body, asdl_excepthandler_seq * handlers,
asdl_stmt_seq * orelse, asdl_stmt_seq * finalbody, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Try_kind;
p->v.Try.body = body;
p->v.Try.handlers = handlers;
p->v.Try.orelse = orelse;
p->v.Try.finalbody = finalbody;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
stmt_ty
_PyAST_TryStar(asdl_stmt_seq * body, asdl_excepthandler_seq * handlers,
asdl_stmt_seq * orelse, asdl_stmt_seq * finalbody, int lineno,
int col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
{
stmt_ty p;
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = TryStar_kind;
p->v.TryStar.body = body;
p->v.TryStar.handlers = handlers;
p->v.TryStar.orelse = orelse;
p->v.TryStar.finalbody = finalbody;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Assert(expr_ty test, expr_ty msg, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'test' is required for Assert");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Assert_kind;
p->v.Assert.test = test;
p->v.Assert.msg = msg;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Import(asdl_alias_seq * names, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Import_kind;
p->v.Import.names = names;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_ImportFrom(identifier module, asdl_alias_seq * names, int level, int
lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = ImportFrom_kind;
p->v.ImportFrom.module = module;
p->v.ImportFrom.names = names;
p->v.ImportFrom.level = level;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Global(asdl_identifier_seq * names, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Global_kind;
p->v.Global.names = names;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
Provisional implementation of PEP 3104. Add nonlocal_stmt to Grammar and Nonlocal node to AST. They both parallel the definitions for globals. The symbol table treats variables declared as nonlocal just like variables that are free implicitly. This change is missing the language spec changes, but makes some decisions about what the spec should say via the unittests. The PEP is silent on a number of decisions, so we should review those before claiming that nonlocal is complete. Thomas Wouters made the grammer and ast changes. Jeremy Hylton added the symbol table changes and the tests. Pete Shinners and Neal Norwitz helped review the code.
2007-02-27 02:50:52 -04:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Nonlocal(asdl_identifier_seq * names, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Provisional implementation of PEP 3104. Add nonlocal_stmt to Grammar and Nonlocal node to AST. They both parallel the definitions for globals. The symbol table treats variables declared as nonlocal just like variables that are free implicitly. This change is missing the language spec changes, but makes some decisions about what the spec should say via the unittests. The PEP is silent on a number of decisions, so we should review those before claiming that nonlocal is complete. Thomas Wouters made the grammer and ast changes. Jeremy Hylton added the symbol table changes and the tests. Pete Shinners and Neal Norwitz helped review the code.
2007-02-27 02:50:52 -04:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Nonlocal_kind;
p->v.Nonlocal.names = names;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Provisional implementation of PEP 3104. Add nonlocal_stmt to Grammar and Nonlocal node to AST. They both parallel the definitions for globals. The symbol table treats variables declared as nonlocal just like variables that are free implicitly. This change is missing the language spec changes, but makes some decisions about what the spec should say via the unittests. The PEP is silent on a number of decisions, so we should review those before claiming that nonlocal is complete. Thomas Wouters made the grammer and ast changes. Jeremy Hylton added the symbol table changes and the tests. Pete Shinners and Neal Norwitz helped review the code.
2007-02-27 02:50:52 -04:00
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Expr(expr_ty value, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for Expr");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Expr_kind;
p->v.Expr.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Pass(int lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Pass_kind;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Break(int lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Break_kind;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
stmt_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Continue(int lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (stmt_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Continue_kind;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_BoolOp(boolop_ty op, asdl_expr_seq * values, int lineno, int col_offset,
int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!op) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'op' is required for BoolOp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = BoolOp_kind;
p->v.BoolOp.op = op;
p->v.BoolOp.values = values;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_NamedExpr(expr_ty target, expr_ty value, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
{
expr_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'target' is required for NamedExpr");
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
return NULL;
}
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for NamedExpr");
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (!p)
return NULL;
p->kind = NamedExpr_kind;
p->v.NamedExpr.target = target;
p->v.NamedExpr.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_BinOp(expr_ty left, operator_ty op, expr_ty right, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!left) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'left' is required for BinOp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!op) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'op' is required for BinOp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!right) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'right' is required for BinOp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = BinOp_kind;
p->v.BinOp.left = left;
p->v.BinOp.op = op;
p->v.BinOp.right = right;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_UnaryOp(unaryop_ty op, expr_ty operand, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!op) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'op' is required for UnaryOp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!operand) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'operand' is required for UnaryOp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = UnaryOp_kind;
p->v.UnaryOp.op = op;
p->v.UnaryOp.operand = operand;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Lambda(arguments_ty args, expr_ty body, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!args) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'args' is required for Lambda");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!body) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'body' is required for Lambda");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Lambda_kind;
p->v.Lambda.args = args;
p->v.Lambda.body = body;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-26 20:24:13 -04:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_IfExp(expr_ty test, expr_ty body, expr_ty orelse, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-26 20:24:13 -04:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!test) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'test' is required for IfExp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!body) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'body' is required for IfExp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!orelse) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'orelse' is required for IfExp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = IfExp_kind;
p->v.IfExp.test = test;
p->v.IfExp.body = body;
p->v.IfExp.orelse = orelse;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
PEP 308 implementation, including minor refdocs and some testcases. It breaks the parser module, because it adds the if/else construct as well as two new grammar rules for backward compatibility. If no one else fixes parsermodule, I guess I'll go ahead and fix it later this week. The TeX code was checked with texcheck.py, but not rendered. There is actually a slight incompatibility: >>> (x for x in lambda:0) Traceback (most recent call last): File "<stdin>", line 1, in <module> TypeError: iteration over non-sequence changes into >>> (x for x in lambda: 0) File "<stdin>", line 1 (x for x in lambda: 0) ^ SyntaxError: invalid syntax Since there's no way the former version can be useful, it's probably a bugfix ;)
2006-02-26 20:24:13 -04:00
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Dict(asdl_expr_seq * keys, asdl_expr_seq * values, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Dict_kind;
p->v.Dict.keys = keys;
p->v.Dict.values = values;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
SF patch 1547796 by Georg Brandl -- set literals.
2006-08-28 12:27:34 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Set(asdl_expr_seq * elts, int lineno, int col_offset, int end_lineno,
int end_col_offset, PyArena *arena)
SF patch 1547796 by Georg Brandl -- set literals.
2006-08-28 12:27:34 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Set_kind;
p->v.Set.elts = elts;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
SF patch 1547796 by Georg Brandl -- set literals.
2006-08-28 12:27:34 -03:00
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_ListComp(expr_ty elt, asdl_comprehension_seq * generators, int lineno,
int col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!elt) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'elt' is required for ListComp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = ListComp_kind;
p->v.ListComp.elt = elt;
p->v.ListComp.generators = generators;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
Hide list comp variables and support set comprehensions
2007-04-15 09:05:43 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_SetComp(expr_ty elt, asdl_comprehension_seq * generators, int lineno,
int col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
Hide list comp variables and support set comprehensions
2007-04-15 09:05:43 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!elt) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'elt' is required for SetComp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = SetComp_kind;
p->v.SetComp.elt = elt;
p->v.SetComp.generators = generators;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Hide list comp variables and support set comprehensions
2007-04-15 09:05:43 -03:00
}
Merged revisions 56154-56264 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line Get this test working after converting map to return an iterator ................ r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines Merged revisions 56124-56201 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines Document smtp.SMTPAuthenticationError. ........ r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines Fix a few webbrowser.py problems. ........ r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines Remove duplicate sentence from alarm() doc. ........ r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines copy built files to the PCBuild directory, where tools like distutils or external build processes can find them. ........ r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines Many calls to tk.call involve an arglist containing a single tuple. Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG don't. Tcl's concatenation of args was affected; IDLE doesn't start. Modify Tkapp_Call() to unpack single tuple arglists. Bug 1733943 Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html ........ r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line Fix typo in comment ........ ................ r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line Get working with map returning an iterator (had to fix whitespace too) ................ r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines Clean up merge glitch or copy-paste error (the entire module was duplicated, except the first half even had some more copy-paste errors, referring to listcomps and genexps instead of setcomps) ................ r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines Dict comprehensions. Still needs doc changes (like many python-3000 features ;-). It generates bytecode similar to: x = {} for k, v in (generator here): x[k] = v except there is no tuple-packing and -unpacking involved. Trivial measurement suggests it's significantly faster than dict(generator here) (in the order of 2 to 3 times as fast) but I have not done extensive measurements. ................ r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................
2007-07-11 10:09:30 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_DictComp(expr_ty key, expr_ty value, asdl_comprehension_seq *
generators, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
Merged revisions 56154-56264 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line Get this test working after converting map to return an iterator ................ r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines Merged revisions 56124-56201 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines Document smtp.SMTPAuthenticationError. ........ r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines Fix a few webbrowser.py problems. ........ r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines Remove duplicate sentence from alarm() doc. ........ r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines copy built files to the PCBuild directory, where tools like distutils or external build processes can find them. ........ r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines Many calls to tk.call involve an arglist containing a single tuple. Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG don't. Tcl's concatenation of args was affected; IDLE doesn't start. Modify Tkapp_Call() to unpack single tuple arglists. Bug 1733943 Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html ........ r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line Fix typo in comment ........ ................ r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line Get working with map returning an iterator (had to fix whitespace too) ................ r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines Clean up merge glitch or copy-paste error (the entire module was duplicated, except the first half even had some more copy-paste errors, referring to listcomps and genexps instead of setcomps) ................ r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines Dict comprehensions. Still needs doc changes (like many python-3000 features ;-). It generates bytecode similar to: x = {} for k, v in (generator here): x[k] = v except there is no tuple-packing and -unpacking involved. Trivial measurement suggests it's significantly faster than dict(generator here) (in the order of 2 to 3 times as fast) but I have not done extensive measurements. ................ r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................
2007-07-11 10:09:30 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!key) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'key' is required for DictComp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for DictComp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = DictComp_kind;
p->v.DictComp.key = key;
p->v.DictComp.value = value;
p->v.DictComp.generators = generators;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merged revisions 56154-56264 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r56155 | neal.norwitz | 2007-07-03 08:59:08 +0300 (Tue, 03 Jul 2007) | 1 line Get this test working after converting map to return an iterator ................ r56202 | neal.norwitz | 2007-07-09 04:30:09 +0300 (Mon, 09 Jul 2007) | 37 lines Merged revisions 56124-56201 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r56129 | georg.brandl | 2007-06-30 04:01:01 -0700 (Sat, 30 Jun 2007) | 2 lines Document smtp.SMTPAuthenticationError. ........ r56137 | georg.brandl | 2007-07-01 01:11:35 -0700 (Sun, 01 Jul 2007) | 2 lines Fix a few webbrowser.py problems. ........ r56143 | georg.brandl | 2007-07-02 04:54:28 -0700 (Mon, 02 Jul 2007) | 2 lines Remove duplicate sentence from alarm() doc. ........ r56170 | mark.hammond | 2007-07-03 19:03:10 -0700 (Tue, 03 Jul 2007) | 3 lines copy built files to the PCBuild directory, where tools like distutils or external build processes can find them. ........ r56176 | kurt.kaiser | 2007-07-05 15:03:39 -0700 (Thu, 05 Jul 2007) | 10 lines Many calls to tk.call involve an arglist containing a single tuple. Calls using METH_OLDARGS unpack this tuple; calls using METH_VARARG don't. Tcl's concatenation of args was affected; IDLE doesn't start. Modify Tkapp_Call() to unpack single tuple arglists. Bug 1733943 Ref http://mail.python.org/pipermail/python-checkins/2007-May/060454.html ........ r56177 | neal.norwitz | 2007-07-05 21:13:39 -0700 (Thu, 05 Jul 2007) | 1 line Fix typo in comment ........ ................ r56251 | neal.norwitz | 2007-07-11 10:01:01 +0300 (Wed, 11 Jul 2007) | 1 line Get working with map returning an iterator (had to fix whitespace too) ................ r56255 | thomas.wouters | 2007-07-11 13:41:37 +0300 (Wed, 11 Jul 2007) | 6 lines Clean up merge glitch or copy-paste error (the entire module was duplicated, except the first half even had some more copy-paste errors, referring to listcomps and genexps instead of setcomps) ................ r56256 | thomas.wouters | 2007-07-11 15:16:01 +0300 (Wed, 11 Jul 2007) | 14 lines Dict comprehensions. Still needs doc changes (like many python-3000 features ;-). It generates bytecode similar to: x = {} for k, v in (generator here): x[k] = v except there is no tuple-packing and -unpacking involved. Trivial measurement suggests it's significantly faster than dict(generator here) (in the order of 2 to 3 times as fast) but I have not done extensive measurements. ................ r56263 | guido.van.rossum | 2007-07-11 15:36:26 +0300 (Wed, 11 Jul 2007) | 3 lines Patch 1724999 by Ali Gholami Rudi -- avoid complaints about dict size change during iter in destroy call. ................
2007-07-11 10:09:30 -03:00
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_GeneratorExp(expr_ty elt, asdl_comprehension_seq * generators, int
lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!elt) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'elt' is required for GeneratorExp");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = GeneratorExp_kind;
p->v.GeneratorExp.elt = elt;
p->v.GeneratorExp.generators = generators;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Await(expr_ty value, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
{
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for Await");
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!p)
return NULL;
p->kind = Await_kind;
p->v.Await.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Yield(expr_ty value, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Yield_kind;
p->v.Yield.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
make YieldFrom its own distinct from Yield (closes #13780)
2012-01-14 09:58:23 -04:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_YieldFrom(expr_ty value, int lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
make YieldFrom its own distinct from Yield (closes #13780)
2012-01-14 09:58:23 -04:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for YieldFrom");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = YieldFrom_kind;
p->v.YieldFrom.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
make YieldFrom its own distinct from Yield (closes #13780)
2012-01-14 09:58:23 -04:00
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Compare(expr_ty left, asdl_int_seq * ops, asdl_expr_seq * comparators,
int lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!left) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'left' is required for Compare");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Compare_kind;
p->v.Compare.left = left;
p->v.Compare.ops = ops;
p->v.Compare.comparators = comparators;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Call(expr_ty func, asdl_expr_seq * args, asdl_keyword_seq * keywords,
int lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!func) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'func' is required for Call");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Call_kind;
p->v.Call.func = func;
p->v.Call.args = args;
p->v.Call.keywords = keywords;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_FormattedValue(expr_ty value, int conversion, expr_ty format_spec, int
lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
{
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for FormattedValue");
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!p)
return NULL;
p->kind = FormattedValue_kind;
p->v.FormattedValue.value = value;
p->v.FormattedValue.conversion = conversion;
p->v.FormattedValue.format_spec = format_spec;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
return p;
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_JoinedStr(asdl_expr_seq * values, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
{
expr_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!p)
return NULL;
p->kind = JoinedStr_kind;
p->v.JoinedStr.values = values;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
return p;
}
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Constant(constant value, string kind, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
{
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for Constant");
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
if (!p)
return NULL;
p->kind = Constant_kind;
p->v.Constant.value = value;
bpo-36280: Add Constant.kind field (GH-12295) The value is a string for string and byte literals, None otherwise. It is 'u' for u"..." literals, 'b' for b"..." literals, '' for "..." literals. The 'r' (raw) prefix is ignored. Does not apply to f-strings. This appears sufficient to make mypy capable of using the stdlib ast module instead of typed_ast (assuming a mypy patch I'm working on). WIP: I need to make the tests pass. @ilevkivskyi @serhiy-storchaka https://bugs.python.org/issue36280
2019-03-13 17:00:46 -03:00
p->v.Constant.kind = kind;
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
return p;
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Attribute(expr_ty value, identifier attr, expr_context_ty ctx, int
lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for Attribute");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!attr) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'attr' is required for Attribute");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'ctx' is required for Attribute");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Attribute_kind;
p->v.Attribute.value = value;
p->v.Attribute.attr = attr;
p->v.Attribute.ctx = ctx;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Subscript(expr_ty value, expr_ty slice, expr_context_ty ctx, int lineno,
int col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for Subscript");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!slice) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'slice' is required for Subscript");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'ctx' is required for Subscript");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Subscript_kind;
p->v.Subscript.value = value;
p->v.Subscript.slice = slice;
p->v.Subscript.ctx = ctx;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
Merged revisions 55225-55227,55229-55269 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55238 | guido.van.rossum | 2007-05-10 16:46:05 -0700 (Thu, 10 May 2007) | 9 lines Merged revisions 55227 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines Fix a bug in test_c_api() that caused a negative refcount. ........ ................ r55246 | neal.norwitz | 2007-05-11 00:01:52 -0700 (Fri, 11 May 2007) | 1 line Remove commands.getstatus() it is obsolete. ................ r55248 | neal.norwitz | 2007-05-11 00:29:05 -0700 (Fri, 11 May 2007) | 2 lines Remove bsddb185 support. ................ r55249 | neal.norwitz | 2007-05-11 00:29:50 -0700 (Fri, 11 May 2007) | 1 line Remove bsddb185 module too ................ r55250 | neal.norwitz | 2007-05-11 00:32:13 -0700 (Fri, 11 May 2007) | 1 line bsddb185: Gotta remove from the file checked in, not Setup ................ r55251 | neal.norwitz | 2007-05-11 00:53:26 -0700 (Fri, 11 May 2007) | 1 line Remove obsolete IRIX modules (as much as I could find, there is probably more) ................ r55252 | neal.norwitz | 2007-05-11 00:55:35 -0700 (Fri, 11 May 2007) | 1 line Remove SGI turd. ................ r55254 | georg.brandl | 2007-05-11 03:11:01 -0700 (Fri, 11 May 2007) | 2 lines Add a case for set comprehensions to the "cannot assign to" switch. ................ r55255 | georg.brandl | 2007-05-11 03:11:25 -0700 (Fri, 11 May 2007) | 2 lines Fix wrong imports. ................ r55261 | georg.brandl | 2007-05-11 07:37:48 -0700 (Fri, 11 May 2007) | 2 lines Remove removed tex files. ................ r55262 | georg.brandl | 2007-05-11 08:28:41 -0700 (Fri, 11 May 2007) | 2 lines Commit PEP 3132 implementation. ................ r55264 | georg.brandl | 2007-05-11 08:50:19 -0700 (Fri, 11 May 2007) | 2 lines Check in the inevitable AST version number and format Py_ssize_t with %zd. ................ r55265 | neal.norwitz | 2007-05-11 09:12:22 -0700 (Fri, 11 May 2007) | 1 line Remove mention of os.popen* and popen2.* since these will be removed. ................ r55266 | neal.norwitz | 2007-05-11 09:19:57 -0700 (Fri, 11 May 2007) | 1 line Get doc to build again (almost, the doc is fine) ................ r55267 | neal.norwitz | 2007-05-11 09:21:02 -0700 (Fri, 11 May 2007) | 1 line Really get doc to build (remove use of string module) ................ r55269 | neal.norwitz | 2007-05-11 09:29:43 -0700 (Fri, 11 May 2007) | 1 line Add some notes to cleanup later ................
2007-05-11 13:50:42 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Starred(expr_ty value, expr_context_ty ctx, int lineno, int col_offset,
int end_lineno, int end_col_offset, PyArena *arena)
Merged revisions 55225-55227,55229-55269 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55238 | guido.van.rossum | 2007-05-10 16:46:05 -0700 (Thu, 10 May 2007) | 9 lines Merged revisions 55227 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines Fix a bug in test_c_api() that caused a negative refcount. ........ ................ r55246 | neal.norwitz | 2007-05-11 00:01:52 -0700 (Fri, 11 May 2007) | 1 line Remove commands.getstatus() it is obsolete. ................ r55248 | neal.norwitz | 2007-05-11 00:29:05 -0700 (Fri, 11 May 2007) | 2 lines Remove bsddb185 support. ................ r55249 | neal.norwitz | 2007-05-11 00:29:50 -0700 (Fri, 11 May 2007) | 1 line Remove bsddb185 module too ................ r55250 | neal.norwitz | 2007-05-11 00:32:13 -0700 (Fri, 11 May 2007) | 1 line bsddb185: Gotta remove from the file checked in, not Setup ................ r55251 | neal.norwitz | 2007-05-11 00:53:26 -0700 (Fri, 11 May 2007) | 1 line Remove obsolete IRIX modules (as much as I could find, there is probably more) ................ r55252 | neal.norwitz | 2007-05-11 00:55:35 -0700 (Fri, 11 May 2007) | 1 line Remove SGI turd. ................ r55254 | georg.brandl | 2007-05-11 03:11:01 -0700 (Fri, 11 May 2007) | 2 lines Add a case for set comprehensions to the "cannot assign to" switch. ................ r55255 | georg.brandl | 2007-05-11 03:11:25 -0700 (Fri, 11 May 2007) | 2 lines Fix wrong imports. ................ r55261 | georg.brandl | 2007-05-11 07:37:48 -0700 (Fri, 11 May 2007) | 2 lines Remove removed tex files. ................ r55262 | georg.brandl | 2007-05-11 08:28:41 -0700 (Fri, 11 May 2007) | 2 lines Commit PEP 3132 implementation. ................ r55264 | georg.brandl | 2007-05-11 08:50:19 -0700 (Fri, 11 May 2007) | 2 lines Check in the inevitable AST version number and format Py_ssize_t with %zd. ................ r55265 | neal.norwitz | 2007-05-11 09:12:22 -0700 (Fri, 11 May 2007) | 1 line Remove mention of os.popen* and popen2.* since these will be removed. ................ r55266 | neal.norwitz | 2007-05-11 09:19:57 -0700 (Fri, 11 May 2007) | 1 line Get doc to build again (almost, the doc is fine) ................ r55267 | neal.norwitz | 2007-05-11 09:21:02 -0700 (Fri, 11 May 2007) | 1 line Really get doc to build (remove use of string module) ................ r55269 | neal.norwitz | 2007-05-11 09:29:43 -0700 (Fri, 11 May 2007) | 1 line Add some notes to cleanup later ................
2007-05-11 13:50:42 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for Starred");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'ctx' is required for Starred");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Starred_kind;
p->v.Starred.value = value;
p->v.Starred.ctx = ctx;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merged revisions 55225-55227,55229-55269 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ................ r55238 | guido.van.rossum | 2007-05-10 16:46:05 -0700 (Thu, 10 May 2007) | 9 lines Merged revisions 55227 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r55227 | guido.van.rossum | 2007-05-10 10:20:15 -0700 (Thu, 10 May 2007) | 2 lines Fix a bug in test_c_api() that caused a negative refcount. ........ ................ r55246 | neal.norwitz | 2007-05-11 00:01:52 -0700 (Fri, 11 May 2007) | 1 line Remove commands.getstatus() it is obsolete. ................ r55248 | neal.norwitz | 2007-05-11 00:29:05 -0700 (Fri, 11 May 2007) | 2 lines Remove bsddb185 support. ................ r55249 | neal.norwitz | 2007-05-11 00:29:50 -0700 (Fri, 11 May 2007) | 1 line Remove bsddb185 module too ................ r55250 | neal.norwitz | 2007-05-11 00:32:13 -0700 (Fri, 11 May 2007) | 1 line bsddb185: Gotta remove from the file checked in, not Setup ................ r55251 | neal.norwitz | 2007-05-11 00:53:26 -0700 (Fri, 11 May 2007) | 1 line Remove obsolete IRIX modules (as much as I could find, there is probably more) ................ r55252 | neal.norwitz | 2007-05-11 00:55:35 -0700 (Fri, 11 May 2007) | 1 line Remove SGI turd. ................ r55254 | georg.brandl | 2007-05-11 03:11:01 -0700 (Fri, 11 May 2007) | 2 lines Add a case for set comprehensions to the "cannot assign to" switch. ................ r55255 | georg.brandl | 2007-05-11 03:11:25 -0700 (Fri, 11 May 2007) | 2 lines Fix wrong imports. ................ r55261 | georg.brandl | 2007-05-11 07:37:48 -0700 (Fri, 11 May 2007) | 2 lines Remove removed tex files. ................ r55262 | georg.brandl | 2007-05-11 08:28:41 -0700 (Fri, 11 May 2007) | 2 lines Commit PEP 3132 implementation. ................ r55264 | georg.brandl | 2007-05-11 08:50:19 -0700 (Fri, 11 May 2007) | 2 lines Check in the inevitable AST version number and format Py_ssize_t with %zd. ................ r55265 | neal.norwitz | 2007-05-11 09:12:22 -0700 (Fri, 11 May 2007) | 1 line Remove mention of os.popen* and popen2.* since these will be removed. ................ r55266 | neal.norwitz | 2007-05-11 09:19:57 -0700 (Fri, 11 May 2007) | 1 line Get doc to build again (almost, the doc is fine) ................ r55267 | neal.norwitz | 2007-05-11 09:21:02 -0700 (Fri, 11 May 2007) | 1 line Really get doc to build (remove use of string module) ................ r55269 | neal.norwitz | 2007-05-11 09:29:43 -0700 (Fri, 11 May 2007) | 1 line Add some notes to cleanup later ................
2007-05-11 13:50:42 -03:00
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Name(identifier id, expr_context_ty ctx, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!id) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'id' is required for Name");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'ctx' is required for Name");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Name_kind;
p->v.Name.id = id;
p->v.Name.ctx = ctx;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_List(asdl_expr_seq * elts, expr_context_ty ctx, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'ctx' is required for List");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = List_kind;
p->v.List.elts = elts;
p->v.List.ctx = ctx;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Tuple(asdl_expr_seq * elts, expr_context_ty ctx, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty p;
if (!ctx) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'ctx' is required for Tuple");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Tuple_kind;
p->v.Tuple.elts = elts;
p->v.Tuple.ctx = ctx;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
expr_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_Slice(expr_ty lower, expr_ty upper, expr_ty step, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
expr_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (expr_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = Slice_kind;
p->v.Slice.lower = lower;
p->v.Slice.upper = upper;
p->v.Slice.step = step;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
comprehension_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_comprehension(expr_ty target, expr_ty iter, asdl_expr_seq * ifs, int
is_async, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
comprehension_ty p;
if (!target) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'target' is required for comprehension");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
if (!iter) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'iter' is required for comprehension");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (comprehension_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->target = target;
p->iter = iter;
p->ifs = ifs;
Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 14:36:01 -03:00
p->is_async = is_async;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
excepthandler_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_ExceptHandler(expr_ty type, identifier name, asdl_stmt_seq * body, int
lineno, int col_offset, int end_lineno, int
end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
excepthandler_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (excepthandler_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->kind = ExceptHandler_kind;
p->v.ExceptHandler.type = type;
p->v.ExceptHandler.name = name;
p->v.ExceptHandler.body = body;
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
arguments_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_arguments(asdl_arg_seq * posonlyargs, asdl_arg_seq * args, arg_ty
vararg, asdl_arg_seq * kwonlyargs, asdl_expr_seq *
kw_defaults, arg_ty kwarg, asdl_expr_seq * defaults, PyArena
*arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
arguments_ty p;
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (arguments_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
p->posonlyargs = posonlyargs;
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
p->args = args;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
p->vararg = vararg;
p->kwonlyargs = kwonlyargs;
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
p->kw_defaults = kw_defaults;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
p->kwarg = kwarg;
p->defaults = defaults;
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
arg_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_arg(identifier arg, expr_ty annotation, string type_comment, int lineno,
int col_offset, int end_lineno, int end_col_offset, PyArena *arena)
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
arg_ty p;
if (!arg) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'arg' is required for arg");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (arg_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->arg = arg;
p->annotation = annotation;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
p->type_comment = type_comment;
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when compiling AST from Python objects.
2015-11-06 12:01:48 -04:00
p->lineno = lineno;
p->col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
}
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
keyword_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_keyword(identifier arg, expr_ty value, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
keyword_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'value' is required for keyword");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (keyword_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->arg = arg;
p->value = value;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
alias_ty
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
_PyAST_alias(identifier name, identifier asname, int lineno, int col_offset,
int end_lineno, int end_col_offset, PyArena *arena)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
alias_ty p;
if (!name) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'name' is required for alias");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (alias_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->name = name;
p->asname = asname;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return p;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
withitem_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_withitem(expr_ty context_expr, expr_ty optional_vars, PyArena *arena)
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
withitem_ty p;
if (!context_expr) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'context_expr' is required for withitem");
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (withitem_ty)_PyArena_Malloc(arena, sizeof(*p));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!p)
return NULL;
p->context_expr = context_expr;
p->optional_vars = optional_vars;
return p;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
match_case_ty
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
_PyAST_match_case(pattern_ty pattern, expr_ty guard, asdl_stmt_seq * body,
PyArena *arena)
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
{
match_case_ty p;
if (!pattern) {
PyErr_SetString(PyExc_ValueError,
"field 'pattern' is required for match_case");
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (match_case_ty)_PyArena_Malloc(arena, sizeof(*p));
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (!p)
return NULL;
p->pattern = pattern;
p->guard = guard;
p->body = body;
return p;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
pattern_ty
_PyAST_MatchValue(expr_ty value, int lineno, int col_offset, int end_lineno,
int end_col_offset, PyArena *arena)
{
pattern_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field 'value' is required for MatchValue");
return NULL;
}
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchValue_kind;
p->v.MatchValue.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
pattern_ty
_PyAST_MatchSingleton(constant value, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
{
pattern_ty p;
if (!value) {
PyErr_SetString(PyExc_ValueError,
"field 'value' is required for MatchSingleton");
return NULL;
}
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchSingleton_kind;
p->v.MatchSingleton.value = value;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
pattern_ty
_PyAST_MatchSequence(asdl_pattern_seq * patterns, int lineno, int col_offset,
int end_lineno, int end_col_offset, PyArena *arena)
{
pattern_ty p;
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchSequence_kind;
p->v.MatchSequence.patterns = patterns;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
pattern_ty
_PyAST_MatchMapping(asdl_expr_seq * keys, asdl_pattern_seq * patterns,
identifier rest, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
{
pattern_ty p;
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchMapping_kind;
p->v.MatchMapping.keys = keys;
p->v.MatchMapping.patterns = patterns;
p->v.MatchMapping.rest = rest;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
pattern_ty
_PyAST_MatchClass(expr_ty cls, asdl_pattern_seq * patterns, asdl_identifier_seq
* kwd_attrs, asdl_pattern_seq * kwd_patterns, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
{
pattern_ty p;
if (!cls) {
PyErr_SetString(PyExc_ValueError,
"field 'cls' is required for MatchClass");
return NULL;
}
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchClass_kind;
p->v.MatchClass.cls = cls;
p->v.MatchClass.patterns = patterns;
p->v.MatchClass.kwd_attrs = kwd_attrs;
p->v.MatchClass.kwd_patterns = kwd_patterns;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
pattern_ty
_PyAST_MatchStar(identifier name, int lineno, int col_offset, int end_lineno,
int end_col_offset, PyArena *arena)
{
pattern_ty p;
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchStar_kind;
p->v.MatchStar.name = name;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
pattern_ty
_PyAST_MatchAs(pattern_ty pattern, identifier name, int lineno, int col_offset,
int end_lineno, int end_col_offset, PyArena *arena)
{
pattern_ty p;
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchAs_kind;
p->v.MatchAs.pattern = pattern;
p->v.MatchAs.name = name;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
pattern_ty
_PyAST_MatchOr(asdl_pattern_seq * patterns, int lineno, int col_offset, int
end_lineno, int end_col_offset, PyArena *arena)
{
pattern_ty p;
p = (pattern_ty)_PyArena_Malloc(arena, sizeof(*p));
if (!p)
return NULL;
p->kind = MatchOr_kind;
p->v.MatchOr.patterns = patterns;
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
type_ignore_ty
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
_PyAST_TypeIgnore(int lineno, string tag, PyArena *arena)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
{
type_ignore_ty p;
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
if (!tag) {
PyErr_SetString(PyExc_ValueError,
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
"field 'tag' is required for TypeIgnore");
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
return NULL;
}
bpo-43244: Remove the pyarena.h header (GH-25007) Remove the pyarena.h header file with functions: * PyArena_New() * PyArena_Free() * PyArena_Malloc() * PyArena_AddPyObject() These functions were undocumented, excluded from the limited C API, and were only used internally by the compiler. Add pycore_pyarena.h header. Rename functions: * PyArena_New() => _PyArena_New() * PyArena_Free() => _PyArena_Free() * PyArena_Malloc() => _PyArena_Malloc() * PyArena_AddPyObject() => _PyArena_AddPyObject()
2021-03-23 22:23:01 -03:00
p = (type_ignore_ty)_PyArena_Malloc(arena, sizeof(*p));
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!p)
return NULL;
p->kind = TypeIgnore_kind;
p->v.TypeIgnore.lineno = lineno;
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
p->v.TypeIgnore.tag = tag;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
return p;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
_PyAST_TypeVar(identifier name, expr_ty bound, expr_ty default_value, int
lineno, int col_offset, int end_lineno, int end_col_offset,
PyArena *arena)
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
{
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty p;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!name) {
PyErr_SetString(PyExc_ValueError,
"field 'name' is required for TypeVar");
return NULL;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
p = (type_param_ty)_PyArena_Malloc(arena, sizeof(*p));
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!p)
return NULL;
p->kind = TypeVar_kind;
p->v.TypeVar.name = name;
p->v.TypeVar.bound = bound;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
p->v.TypeVar.default_value = default_value;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
_PyAST_ParamSpec(identifier name, expr_ty default_value, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena *arena)
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
{
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty p;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!name) {
PyErr_SetString(PyExc_ValueError,
"field 'name' is required for ParamSpec");
return NULL;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
p = (type_param_ty)_PyArena_Malloc(arena, sizeof(*p));
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!p)
return NULL;
p->kind = ParamSpec_kind;
p->v.ParamSpec.name = name;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
p->v.ParamSpec.default_value = default_value;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
_PyAST_TypeVarTuple(identifier name, expr_ty default_value, int lineno, int
col_offset, int end_lineno, int end_col_offset, PyArena
*arena)
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
{
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty p;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!name) {
PyErr_SetString(PyExc_ValueError,
"field 'name' is required for TypeVarTuple");
return NULL;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
p = (type_param_ty)_PyArena_Malloc(arena, sizeof(*p));
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!p)
return NULL;
p->kind = TypeVarTuple_kind;
p->v.TypeVarTuple.name = name;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
p->v.TypeVarTuple.default_value = default_value;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
p->lineno = lineno;
p->col_offset = col_offset;
p->end_lineno = end_lineno;
p->end_col_offset = end_col_offset;
return p;
}
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 15:14:20 -04:00
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_mod(struct ast_state *state, struct validator *vstate, void* _o)
Whoops, checkin consistent versions of *all* files to stop polluting a bunch of names
2005-11-13 15:14:20 -04:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
mod_ty o = (mod_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
switch (o->kind) {
case Module_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Module_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Module.body,
ast2obj_stmt);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Fix memory leak on attributes.
2006-03-01 20:31:27 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.Module.type_ignores,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
ast2obj_type_ignore);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_ignores, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case Interactive_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Interactive_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Interactive.body,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 18:49:05 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Fix memory leak on attributes.
2006-03-01 20:31:27 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case Expression_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Expression_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Expression.body);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Fix memory leak on attributes.
2006-03-01 20:31:27 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
case FunctionType_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->FunctionType_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.FunctionType.argtypes,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_expr);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->argtypes, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.FunctionType.returns);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->returns, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_stmt(struct ast_state *state, struct validator *vstate, void* _o)
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
stmt_ty o = (stmt_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
switch (o->kind) {
case FunctionDef_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->FunctionDef_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.FunctionDef.name);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->name, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Fix memory leak on attributes.
2006-03-01 20:31:27 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_arguments(state, vstate, o->v.FunctionDef.args);
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 18:49:05 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->args, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Fix memory leak on attributes.
2006-03-01 20:31:27 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.FunctionDef.body,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Fix memory leak on attributes.
2006-03-01 20:31:27 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.FunctionDef.decorator_list,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
ast2obj_expr);
Patch #1440601: Add col_offset attribute to AST nodes.
2006-03-01 18:49:05 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->decorator_list, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Fix memory leak on attributes.
2006-03-01 20:31:27 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.FunctionDef.returns);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->returns, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.FunctionDef.type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.FunctionDef.type_params,
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
ast2obj_type_param);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->type_params, value) == -1)
goto failed;
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
case AsyncFunctionDef_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->AsyncFunctionDef_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.AsyncFunctionDef.name);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->name, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_arguments(state, vstate, o->v.AsyncFunctionDef.args);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->args, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.AsyncFunctionDef.body,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
(asdl_seq*)o->v.AsyncFunctionDef.decorator_list,
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
ast2obj_expr);
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->decorator_list, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AsyncFunctionDef.returns);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->returns, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.AsyncFunctionDef.type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
(asdl_seq*)o->v.AsyncFunctionDef.type_params,
ast2obj_type_param);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->type_params, value) == -1)
goto failed;
Py_DECREF(value);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case ClassDef_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->ClassDef_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.ClassDef.name);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->name, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.ClassDef.bases,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->bases, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.ClassDef.keywords,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_keyword);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->keywords, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.ClassDef.body,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.ClassDef.decorator_list,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->decorator_list, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.ClassDef.type_params,
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
ast2obj_type_param);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->type_params, value) == -1)
goto failed;
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case Return_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Return_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Return.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Delete_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Delete_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Delete.targets,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->targets, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Assign_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Assign_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Assign.targets,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->targets, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Assign.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.Assign.type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
case TypeAlias_kind:
tp = (PyTypeObject *)state->TypeAlias_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.TypeAlias.name);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->name, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.TypeAlias.type_params,
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
ast2obj_type_param);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
if (PyObject_SetAttr(result, state->type_params, value) == -1)
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.TypeAlias.value);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->value, value) == -1)
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case AugAssign_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->AugAssign_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AugAssign.target);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->target, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_operator(state, vstate, o->v.AugAssign.op);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->op, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AugAssign.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
case AnnAssign_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->AnnAssign_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AnnAssign.target);
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->target, value) == -1)
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AnnAssign.annotation);
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->annotation, value) == -1)
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AnnAssign.value);
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->v.AnnAssign.simple);
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->simple, value) == -1)
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case For_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->For_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.For.target);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->target, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.For.iter);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->iter, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.For.body,
ast2obj_stmt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.For.orelse,
ast2obj_stmt);
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
2006-04-21 07:40:58 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->orelse, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
2006-04-21 07:40:58 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.For.type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
case AsyncFor_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->AsyncFor_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AsyncFor.target);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->target, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.AsyncFor.iter);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->iter, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.AsyncFor.body,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.AsyncFor.orelse,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->orelse, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.AsyncFor.type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case While_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->While_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.While.test);
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
2006-04-21 07:40:58 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->test, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Merge p3yk branch with the trunk up to revision 45595. This breaks a fair number of tests, all because of the codecs/_multibytecodecs issue described here (it's not a Py3K issue, just something Py3K discovers): http://mail.python.org/pipermail/python-dev/2006-April/064051.html Hye-Shik Chang promised to look for a fix, so no need to fix it here. The tests that are expected to break are: test_codecencodings_cn test_codecencodings_hk test_codecencodings_jp test_codecencodings_kr test_codecencodings_tw test_codecs test_multibytecodec This merge fixes an actual test failure (test_weakref) in this branch, though, so I believe merging is the right thing to do anyway.
2006-04-21 07:40:58 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.While.body,
ast2obj_stmt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.While.orelse,
ast2obj_stmt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->orelse, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case If_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->If_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.If.test);
Jiwon Seo's PEP 3102 implementation. See SF#1549670. The compiler package has not yet been updated.
2006-10-27 20:31:49 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->test, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Jiwon Seo's PEP 3102 implementation. See SF#1549670. The compiler package has not yet been updated.
2006-10-27 20:31:49 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.If.body,
ast2obj_stmt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.If.orelse,
ast2obj_stmt);
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->orelse, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case With_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->With_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.With.items,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_withitem);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->items, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.With.body,
ast2obj_stmt);
Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........
2007-05-15 15:46:22 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........
2007-05-15 15:46:22 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.With.type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
case AsyncWith_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->AsyncWith_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.AsyncWith.items,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_withitem);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->items, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.AsyncWith.body,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.AsyncWith.type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
break;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
case Match_kind:
tp = (PyTypeObject *)state->Match_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Match.subject);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->subject, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Match.cases,
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
ast2obj_match_case);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->cases, value) == -1)
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Raise_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Raise_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Raise.exc);
Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........
2007-05-15 15:46:22 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->exc, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........
2007-05-15 15:46:22 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Raise.cause);
unify some ast.argument's attrs; change Attribute column offset (closes #16795) Patch from Sven Brauch.
2013-03-18 14:48:58 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->cause, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
unify some ast.argument's attrs; change Attribute column offset (closes #16795) Patch from Sven Brauch.
2013-03-18 14:48:58 -03:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case Try_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Try_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Try.body,
ast2obj_stmt);
unify some ast.argument's attrs; change Attribute column offset (closes #16795) Patch from Sven Brauch.
2013-03-18 14:48:58 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
unify some ast.argument's attrs; change Attribute column offset (closes #16795) Patch from Sven Brauch.
2013-03-18 14:48:58 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Try.handlers,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_excepthandler);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->handlers, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Try.orelse,
ast2obj_stmt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->orelse, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Try.finalbody,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->finalbody, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
case TryStar_kind:
tp = (PyTypeObject *)state->TryStar_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.TryStar.body,
ast2obj_stmt);
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->body, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.TryStar.handlers,
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
ast2obj_excepthandler);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->handlers, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.TryStar.orelse,
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->orelse, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.TryStar.finalbody,
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
ast2obj_stmt);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->finalbody, value) == -1)
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Assert_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Assert_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Assert.test);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->test, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Assert.msg);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->msg, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Import_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Import_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Import.names,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_alias);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->names, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case ImportFrom_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->ImportFrom_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.ImportFrom.module);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->module, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.ImportFrom.names,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_alias);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->names, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->v.ImportFrom.level);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->level, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Global_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Global_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Global.names,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_identifier);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->names, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Nonlocal_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Nonlocal_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Nonlocal.names,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_identifier);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->names, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Expr_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Expr_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Expr.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case Pass_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Pass_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
break;
case Break_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Break_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
break;
case Continue_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Continue_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
break;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->lineno, value) < 0)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
}
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_expr(struct ast_state *state, struct validator *vstate, void* _o)
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty o = (expr_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
switch (o->kind) {
case BoolOp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->BoolOp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_boolop(state, vstate, o->v.BoolOp.op);
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->op, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.BoolOp.values,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_expr);
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->values, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
case NamedExpr_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->NamedExpr_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.NamedExpr.target);
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->target, value) == -1)
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.NamedExpr.value);
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case BinOp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->BinOp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.BinOp.left);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->left, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_operator(state, vstate, o->v.BinOp.op);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->op, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.BinOp.right);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->right, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case UnaryOp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->UnaryOp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_unaryop(state, vstate, o->v.UnaryOp.op);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->op, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.UnaryOp.operand);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->operand, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Lambda_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Lambda_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_arguments(state, vstate, o->v.Lambda.args);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->args, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Lambda.body);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case IfExp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->IfExp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.IfExp.test);
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->test, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.IfExp.body);
Jiwon Seo's PEP 3102 implementation. See SF#1549670. The compiler package has not yet been updated.
2006-10-27 20:31:49 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Jiwon Seo's PEP 3102 implementation. See SF#1549670. The compiler package has not yet been updated.
2006-10-27 20:31:49 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.IfExp.orelse);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->orelse, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case Dict_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Dict_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Dict.keys,
ast2obj_expr);
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->keys, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
PEP 3107 - Function Annotations thanks to Tony Lownds
2006-12-28 02:47:50 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Dict.values,
ast2obj_expr);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->values, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case Set_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Set_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Set.elts,
ast2obj_expr);
Jiwon Seo's PEP 3102 implementation. See SF#1549670. The compiler package has not yet been updated.
2006-10-27 20:31:49 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->elts, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Jiwon Seo's PEP 3102 implementation. See SF#1549670. The compiler package has not yet been updated.
2006-10-27 20:31:49 -03:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case ListComp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->ListComp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.ListComp.elt);
Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........
2007-05-15 15:46:22 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->elt, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........
2007-05-15 15:46:22 -03:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.ListComp.generators,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
ast2obj_comprehension);
Merged revisions 55328-55341 via svnmerge from svn+ssh://pythondev@svn.python.org/python/branches/p3yk ........ r55329 | brett.cannon | 2007-05-14 16:36:56 -0700 (Mon, 14 May 2007) | 3 lines Implement the removal of tuple parameter unpacking (PEP 3113). Thanks, Tony Lownds for the patch. ........ r55331 | neal.norwitz | 2007-05-14 16:40:30 -0700 (Mon, 14 May 2007) | 1 line Update to use Python 3.0 ........ r55332 | brett.cannon | 2007-05-14 16:47:18 -0700 (Mon, 14 May 2007) | 2 lines Mention PEP 3113. And thanks to Tony Lownds for the PEP 3113 patch. ........ r55333 | neal.norwitz | 2007-05-14 16:57:06 -0700 (Mon, 14 May 2007) | 1 line Fix exception printing (no more exceptions module) ........ r55334 | neal.norwitz | 2007-05-14 17:11:10 -0700 (Mon, 14 May 2007) | 1 line Remove popen* functions from os ........ r55335 | neal.norwitz | 2007-05-14 18:03:38 -0700 (Mon, 14 May 2007) | 1 line Get rid of most of popen. There are still some uses I need to cleanup. ........ r55336 | neal.norwitz | 2007-05-14 21:11:34 -0700 (Mon, 14 May 2007) | 1 line Remove a few more remnants of the compiler package ........ r55337 | neal.norwitz | 2007-05-14 22:28:27 -0700 (Mon, 14 May 2007) | 1 line Get test_[cx]pickle working on 64-bit platforms (avoid overflow int/long) ........
2007-05-15 15:46:22 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->generators, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case SetComp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->SetComp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.SetComp.elt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->elt, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.SetComp.generators,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
ast2obj_comprehension);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->generators, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case DictComp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->DictComp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.DictComp.key);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->key, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.DictComp.value);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.DictComp.generators,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
ast2obj_comprehension);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->generators, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case GeneratorExp_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->GeneratorExp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.GeneratorExp.elt);
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->elt, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.GeneratorExp.generators,
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
ast2obj_comprehension);
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->generators, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
case Await_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Await_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Await.value);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Yield_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Yield_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Yield.value);
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
Py_DECREF(value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
break;
case YieldFrom_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->YieldFrom_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.YieldFrom.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Compare_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Compare_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Compare.left);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->left, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
{
Py_ssize_t i, n = asdl_seq_LEN(o->v.Compare.ops);
value = PyList_New(n);
if (!value) goto failed;
for(i = 0; i < n; i++)
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
PyList_SET_ITEM(value, i, ast2obj_cmpop(state, vstate, (cmpop_ty)asdl_seq_GET(o->v.Compare.ops, i)));
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ops, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.Compare.comparators, ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->comparators, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Call_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Call_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Call.func);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->func, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Call.args,
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->args, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Call.keywords,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_keyword);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->keywords, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
case FormattedValue_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->FormattedValue_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.FormattedValue.value);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->v.FormattedValue.conversion);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->conversion, value) == -1)
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.FormattedValue.format_spec);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->format_spec, value) == -1)
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
goto failed;
Py_DECREF(value);
break;
case JoinedStr_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->JoinedStr_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.JoinedStr.values,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_expr);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->values, value) == -1)
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
goto failed;
Py_DECREF(value);
break;
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
case Constant_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Constant_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_constant(state, vstate, o->v.Constant.value);
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.Constant.kind);
bpo-36280: Add Constant.kind field (GH-12295) The value is a string for string and byte literals, None otherwise. It is 'u' for u"..." literals, 'b' for b"..." literals, '' for "..." literals. The 'r' (raw) prefix is ignored. Does not apply to f-strings. This appears sufficient to make mypy capable of using the stdlib ast module instead of typed_ast (assuming a mypy patch I'm working on). WIP: I need to make the tests pass. @ilevkivskyi @serhiy-storchaka https://bugs.python.org/issue36280
2019-03-13 17:00:46 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->kind, value) == -1)
bpo-36280: Add Constant.kind field (GH-12295) The value is a string for string and byte literals, None otherwise. It is 'u' for u"..." literals, 'b' for b"..." literals, '' for "..." literals. The 'r' (raw) prefix is ignored. Does not apply to f-strings. This appears sufficient to make mypy capable of using the stdlib ast module instead of typed_ast (assuming a mypy patch I'm working on). WIP: I need to make the tests pass. @ilevkivskyi @serhiy-storchaka https://bugs.python.org/issue36280
2019-03-13 17:00:46 -03:00
goto failed;
Py_DECREF(value);
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Attribute_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Attribute_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Attribute.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.Attribute.attr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->attr, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr_context(state, vstate, o->v.Attribute.ctx);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ctx, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Subscript_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Subscript_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Subscript.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Subscript.slice);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->slice, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr_context(state, vstate, o->v.Subscript.ctx);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ctx, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Starred_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Starred_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Starred.value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr_context(state, vstate, o->v.Starred.ctx);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ctx, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Name_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Name_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.Name.id);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->id, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr_context(state, vstate, o->v.Name.ctx);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ctx, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case List_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->List_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.List.elts,
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->elts, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr_context(state, vstate, o->v.List.ctx);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ctx, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
case Tuple_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Tuple_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.Tuple.elts,
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->elts, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr_context(state, vstate, o->v.Tuple.ctx);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ctx, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
case Slice_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->Slice_type;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Slice.lower);
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->lower, value) == -1)
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Slice.upper);
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->upper, value) == -1)
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.Slice.step);
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->step, value) == -1)
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
goto failed;
Py_DECREF(value);
break;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->lineno, value) < 0)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
PyObject* ast2obj_expr_context(struct ast_state *state, struct validator
*vstate, expr_context_ty o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
switch(o) {
case Load:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Load_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Store:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Store_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Del:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Del_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
Py_UNREACHABLE();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
PyObject* ast2obj_boolop(struct ast_state *state, struct validator *vstate,
boolop_ty o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
switch(o) {
case And:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->And_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Or:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Or_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
Py_UNREACHABLE();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
PyObject* ast2obj_operator(struct ast_state *state, struct validator *vstate,
operator_ty o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
switch(o) {
case Add:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Add_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Sub:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Sub_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Mult:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Mult_singleton);
PEP 465: a dedicated infix operator for matrix multiplication (closes #21176)
2014-04-10 00:55:56 -03:00
case MatMult:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->MatMult_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Div:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Div_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Mod:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Mod_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Pow:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Pow_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case LShift:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->LShift_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case RShift:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->RShift_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case BitOr:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->BitOr_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case BitXor:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->BitXor_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case BitAnd:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->BitAnd_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case FloorDiv:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->FloorDiv_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
Py_UNREACHABLE();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
PyObject* ast2obj_unaryop(struct ast_state *state, struct validator *vstate,
unaryop_ty o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
switch(o) {
case Invert:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Invert_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Not:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Not_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case UAdd:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->UAdd_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case USub:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->USub_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
Py_UNREACHABLE();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
PyObject* ast2obj_cmpop(struct ast_state *state, struct validator *vstate,
cmpop_ty o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
switch(o) {
case Eq:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Eq_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case NotEq:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->NotEq_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Lt:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Lt_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case LtE:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->LtE_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Gt:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Gt_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case GtE:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->GtE_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case Is:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->Is_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case IsNot:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->IsNot_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case In:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->In_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
case NotIn:
gh-99300: Use Py_NewRef() in Python/ directory (#99317) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in C files of the Python/ directory. Update Parser/asdl_c.py to regenerate Python/Python-ast.c.
2022-11-10 06:23:36 -04:00
return Py_NewRef(state->NotIn_singleton);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-40528: Improve and clear several aspects of the ASDL definition code for the AST (GH-19952)
2020-05-06 11:29:32 -03:00
Py_UNREACHABLE();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_comprehension(struct ast_state *state, struct validator *vstate, void*
_o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
comprehension_ty o = (comprehension_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->comprehension_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) return NULL;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->target);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->target, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->iter);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->iter, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->ifs, ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->ifs, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->is_async);
Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 14:36:01 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->is_async, value) == -1)
Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 14:36:01 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_excepthandler(struct ast_state *state, struct validator *vstate, void*
_o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
excepthandler_ty o = (excepthandler_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
switch (o->kind) {
case ExceptHandler_kind:
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->ExceptHandler_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.ExceptHandler.type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.ExceptHandler.name);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->name, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.ExceptHandler.body,
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ast2obj_stmt);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->body, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
break;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->lineno, value) < 0)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_arguments(struct ast_state *state, struct validator *vstate, void* _o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
arguments_ty o = (arguments_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->arguments_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) return NULL;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->posonlyargs, ast2obj_arg);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->posonlyargs, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->args, ast2obj_arg);
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->args, value) == -1)
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_arg(state, vstate, o->vararg);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->vararg, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->kwonlyargs, ast2obj_arg);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->kwonlyargs, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->kw_defaults,
ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->kw_defaults, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_arg(state, vstate, o->kwarg);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->kwarg, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->defaults, ast2obj_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->defaults, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_arg(struct ast_state *state, struct validator *vstate, void* _o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
arg_ty o = (arg_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->arg_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) return NULL;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->arg);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->arg, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->annotation);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->annotation, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->type_comment);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->type_comment, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->lineno, value) < 0)
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_keyword(struct ast_state *state, struct validator *vstate, void* _o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
keyword_ty o = (keyword_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->keyword_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) return NULL;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->arg);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->arg, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->value);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->lineno, value) < 0)
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_alias(struct ast_state *state, struct validator *vstate, void* _o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
alias_ty o = (alias_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->alias_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) return NULL;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->name);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->name, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->asname);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->asname, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->lineno, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_withitem(struct ast_state *state, struct validator *vstate, void* _o)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
{
withitem_ty o = (withitem_ty)_o;
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!o) {
Issue #28999: Use Py_RETURN_NONE, Py_RETURN_TRUE and Py_RETURN_FALSE wherever possible. Patch is writen with Coccinelle.
2017-01-23 03:47:21 -04:00
Py_RETURN_NONE;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = (PyTypeObject *)state->withitem_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!result) return NULL;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->context_expr);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->context_expr, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->optional_vars);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (!value) goto failed;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (PyObject_SetAttr(result, state->optional_vars, value) == -1)
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_match_case(struct ast_state *state, struct validator *vstate, void* _o)
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
{
match_case_ty o = (match_case_ty)_o;
PyObject *result = NULL, *value = NULL;
PyTypeObject *tp;
if (!o) {
Py_RETURN_NONE;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
tp = (PyTypeObject *)state->match_case_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) return NULL;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_pattern(state, vstate, o->pattern);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->pattern, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->guard);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->guard, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->body, ast2obj_stmt);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->body, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_pattern(struct ast_state *state, struct validator *vstate, void* _o)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
pattern_ty o = (pattern_ty)_o;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
PyObject *result = NULL, *value = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyTypeObject *tp;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!o) {
Py_RETURN_NONE;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
switch (o->kind) {
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
case MatchValue_kind:
tp = (PyTypeObject *)state->MatchValue_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
result = PyType_GenericNew(tp, NULL, NULL);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.MatchValue.value);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (!value) goto failed;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
Py_DECREF(value);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
break;
case MatchSingleton_kind:
tp = (PyTypeObject *)state->MatchSingleton_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_constant(state, vstate, o->v.MatchSingleton.value);
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
if (!value) goto failed;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (PyObject_SetAttr(result, state->value, value) == -1)
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
goto failed;
Py_DECREF(value);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
break;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
case MatchSequence_kind:
tp = (PyTypeObject *)state->MatchSequence_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.MatchSequence.patterns,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
ast2obj_pattern);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->patterns, value) == -1)
goto failed;
Py_DECREF(value);
break;
case MatchMapping_kind:
tp = (PyTypeObject *)state->MatchMapping_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.MatchMapping.keys,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
ast2obj_expr);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->keys, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.MatchMapping.patterns,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
ast2obj_pattern);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->patterns, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.MatchMapping.rest);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->rest, value) == -1)
goto failed;
Py_DECREF(value);
break;
case MatchClass_kind:
tp = (PyTypeObject *)state->MatchClass_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.MatchClass.cls);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->cls, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.MatchClass.patterns,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
ast2obj_pattern);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->patterns, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.MatchClass.kwd_attrs,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
ast2obj_identifier);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->kwd_attrs, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate,
(asdl_seq*)o->v.MatchClass.kwd_patterns,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
ast2obj_pattern);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->kwd_patterns, value) == -1)
goto failed;
Py_DECREF(value);
break;
case MatchStar_kind:
tp = (PyTypeObject *)state->MatchStar_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.MatchStar.name);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->name, value) == -1)
goto failed;
Py_DECREF(value);
break;
case MatchAs_kind:
tp = (PyTypeObject *)state->MatchAs_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_pattern(state, vstate, o->v.MatchAs.pattern);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->pattern, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.MatchAs.name);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->name, value) == -1)
goto failed;
Py_DECREF(value);
break;
case MatchOr_kind:
tp = (PyTypeObject *)state->MatchOr_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_list(state, vstate, (asdl_seq*)o->v.MatchOr.patterns,
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
ast2obj_pattern);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->patterns, value) == -1)
goto failed;
Py_DECREF(value);
break;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->lineno, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_type_ignore(struct ast_state *state, struct validator *vstate, void* _o)
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
{
type_ignore_ty o = (type_ignore_ty)_o;
PyObject *result = NULL, *value = NULL;
PyTypeObject *tp;
if (!o) {
Py_RETURN_NONE;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
switch (o->kind) {
case TypeIgnore_kind:
tp = (PyTypeObject *)state->TypeIgnore_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->v.TypeIgnore.lineno);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->lineno, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_string(state, vstate, o->v.TypeIgnore.tag);
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->tag, value) == -1)
goto failed;
Py_DECREF(value);
break;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
PyObject*
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
ast2obj_type_param(struct ast_state *state, struct validator *vstate, void* _o)
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
{
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty o = (type_param_ty)_o;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
PyObject *result = NULL, *value = NULL;
PyTypeObject *tp;
if (!o) {
Py_RETURN_NONE;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (++vstate->recursion_depth > vstate->recursion_limit) {
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
PyErr_SetString(PyExc_RecursionError,
"maximum recursion depth exceeded during ast construction");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
switch (o->kind) {
case TypeVar_kind:
tp = (PyTypeObject *)state->TypeVar_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.TypeVar.name);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->name, value) == -1)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_expr(state, vstate, o->v.TypeVar.bound);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->bound, value) == -1)
goto failed;
Py_DECREF(value);
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
value = ast2obj_expr(state, vstate, o->v.TypeVar.default_value);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->default_value, value) == -1)
goto failed;
Py_DECREF(value);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
break;
case ParamSpec_kind:
tp = (PyTypeObject *)state->ParamSpec_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.ParamSpec.name);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->name, value) == -1)
goto failed;
Py_DECREF(value);
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
value = ast2obj_expr(state, vstate, o->v.ParamSpec.default_value);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->default_value, value) == -1)
goto failed;
Py_DECREF(value);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
break;
case TypeVarTuple_kind:
tp = (PyTypeObject *)state->TypeVarTuple_type;
result = PyType_GenericNew(tp, NULL, NULL);
if (!result) goto failed;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_identifier(state, vstate, o->v.TypeVarTuple.name);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->name, value) == -1)
goto failed;
Py_DECREF(value);
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
value = ast2obj_expr(state, vstate, o->v.TypeVarTuple.default_value);
if (!value) goto failed;
if (PyObject_SetAttr(result, state->default_value, value) == -1)
goto failed;
Py_DECREF(value);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
break;
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->lineno);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->lineno, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->col_offset);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->col_offset, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_lineno);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->end_lineno, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
value = ast2obj_int(state, vstate, o->end_col_offset);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (!value) goto failed;
if (PyObject_SetAttr(result, state->end_col_offset, value) < 0)
goto failed;
Py_DECREF(value);
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
return result;
failed:
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate->recursion_depth--;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
Py_XDECREF(value);
Py_XDECREF(result);
return NULL;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int
obj2ast_mod(struct ast_state *state, PyObject* obj, mod_ty* out, PyArena* arena)
{
int isinstance;
PyObject *tmp = NULL;
PyObject *tp;
if (obj == Py_None) {
*out = NULL;
return 0;
}
tp = state->Module_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
asdl_stmt_seq* body;
asdl_type_ignore_seq* type_ignores;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Module field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Module' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Module field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_ignores, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Module field \"type_ignores\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
type_ignores = _Py_asdl_type_ignore_seq_new(len, arena);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (type_ignores == NULL) goto failed;
for (i = 0; i < len; i++) {
type_ignore_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Module' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_type_ignore(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Module field \"type_ignores\" changed size during iteration");
goto failed;
}
asdl_seq_SET(type_ignores, i, val);
}
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Module(body, type_ignores, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Interactive_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Interactive field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Interactive' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Interactive field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Interactive(body, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Expression_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty body;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Expression");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Expression' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &body, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Expression(body, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->FunctionType_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* argtypes;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
expr_ty returns;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->argtypes, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "FunctionType field \"argtypes\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
argtypes = _Py_asdl_expr_seq_new(len, arena);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (argtypes == NULL) goto failed;
for (i = 0; i < len; i++) {
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionType' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "FunctionType field \"argtypes\" changed size during iteration");
goto failed;
}
asdl_seq_SET(argtypes, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->returns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"returns\" missing from FunctionType");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionType' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &returns, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_FunctionType(argtypes, returns, arena);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (*out == NULL) goto failed;
return 0;
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyErr_Format(PyExc_TypeError, "expected some sort of mod, but got %R", obj);
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_stmt(struct ast_state *state, PyObject* obj, stmt_ty* out, PyArena*
arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int isinstance;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject *tmp = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int lineno;
int col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
int end_lineno;
int end_col_offset;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (obj == Py_None) {
*out = NULL;
return 0;
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from stmt");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'stmt' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from stmt");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'stmt' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_lineno = lineno;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'stmt' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'stmt' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->FunctionDef_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
identifier name;
arguments_ty args;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
asdl_expr_seq* decorator_list;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty returns;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
asdl_type_param_seq* type_params;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from FunctionDef");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &name, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->args, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from FunctionDef");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arguments(state, tmp, &args, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "FunctionDef field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->decorator_list, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "FunctionDef field \"decorator_list\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
decorator_list = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (decorator_list == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"decorator_list\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(decorator_list, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->returns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
returns = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &returns, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_params, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "FunctionDef field \"type_params\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
type_params = _Py_asdl_type_param_seq_new(len, arena);
if (type_params == NULL) goto failed;
for (i = 0; i < len; i++) {
type_param_ty val;
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
if (_Py_EnterRecursiveCall(" while traversing 'FunctionDef' node")) {
goto failed;
}
res = obj2ast_type_param(state, tmp2, &val, arena);
_Py_LeaveRecursiveCall();
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "FunctionDef field \"type_params\" changed size during iteration");
goto failed;
}
asdl_seq_SET(type_params, i, val);
}
Py_CLEAR(tmp);
}
*out = _PyAST_FunctionDef(name, args, body, decorator_list, returns,
type_comment, type_params, lineno,
col_offset, end_lineno, end_col_offset,
arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->AsyncFunctionDef_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
if (isinstance) {
identifier name;
arguments_ty args;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
asdl_expr_seq* decorator_list;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
expr_ty returns;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
asdl_type_param_seq* type_params;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from AsyncFunctionDef");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &name, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->args, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from AsyncFunctionDef");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arguments(state, tmp, &args, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "AsyncFunctionDef field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->decorator_list, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "AsyncFunctionDef field \"decorator_list\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
decorator_list = _Py_asdl_expr_seq_new(len, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (decorator_list == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"decorator_list\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(decorator_list, i, val);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->returns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
returns = NULL;
}
else {
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &returns, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFunctionDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_params, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "AsyncFunctionDef field \"type_params\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
type_params = _Py_asdl_type_param_seq_new(len, arena);
if (type_params == NULL) goto failed;
for (i = 0; i < len; i++) {
type_param_ty val;
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFunctionDef' node")) {
goto failed;
}
res = obj2ast_type_param(state, tmp2, &val, arena);
_Py_LeaveRecursiveCall();
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFunctionDef field \"type_params\" changed size during iteration");
goto failed;
}
asdl_seq_SET(type_params, i, val);
}
Py_CLEAR(tmp);
}
*out = _PyAST_AsyncFunctionDef(name, args, body, decorator_list,
returns, type_comment, type_params,
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
lineno, col_offset, end_lineno,
end_col_offset, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->ClassDef_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
identifier name;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* bases;
asdl_keyword_seq* keywords;
asdl_stmt_seq* body;
asdl_expr_seq* decorator_list;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
asdl_type_param_seq* type_params;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from ClassDef");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ClassDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &name, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->bases, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "ClassDef field \"bases\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
bases = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (bases == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ClassDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"bases\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(bases, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->keywords, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "ClassDef field \"keywords\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
keywords = _Py_asdl_keyword_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (keywords == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
keyword_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ClassDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_keyword(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"keywords\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(keywords, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "ClassDef field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ClassDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->decorator_list, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "ClassDef field \"decorator_list\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
decorator_list = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (decorator_list == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ClassDef' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"decorator_list\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(decorator_list, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_params, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
gh-104799: Move location of type_params AST fields (#104828) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-26 09:54:37 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "ClassDef field \"type_params\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
type_params = _Py_asdl_type_param_seq_new(len, arena);
if (type_params == NULL) goto failed;
for (i = 0; i < len; i++) {
type_param_ty val;
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
if (_Py_EnterRecursiveCall(" while traversing 'ClassDef' node")) {
goto failed;
}
res = obj2ast_type_param(state, tmp2, &val, arena);
_Py_LeaveRecursiveCall();
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ClassDef field \"type_params\" changed size during iteration");
goto failed;
}
asdl_seq_SET(type_params, i, val);
}
Py_CLEAR(tmp);
}
*out = _PyAST_ClassDef(name, bases, keywords, body, decorator_list,
type_params, lineno, col_offset, end_lineno,
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Return_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
value = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Return' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Return(value, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Delete_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* targets;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->targets, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Delete field \"targets\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
targets = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (targets == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Delete' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Delete field \"targets\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(targets, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Delete(targets, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Assign_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* targets;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_ty value;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->targets, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Assign field \"targets\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
targets = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (targets == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Assign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Assign field \"targets\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(targets, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Assign");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Assign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Assign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Assign(targets, value, type_comment, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
tp = state->TypeAlias_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (isinstance) {
expr_ty name;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
asdl_type_param_seq* type_params;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from TypeAlias");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'TypeAlias' node")) {
goto failed;
}
res = obj2ast_expr(state, tmp, &name, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_params, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
PyErr_Format(PyExc_TypeError, "TypeAlias field \"type_params\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_params = _Py_asdl_type_param_seq_new(len, arena);
if (type_params == NULL) goto failed;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
for (i = 0; i < len; i++) {
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
type_param_ty val;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
if (_Py_EnterRecursiveCall(" while traversing 'TypeAlias' node")) {
goto failed;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
res = obj2ast_type_param(state, tmp2, &val, arena);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
_Py_LeaveRecursiveCall();
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
PyErr_SetString(PyExc_RuntimeError, "TypeAlias field \"type_params\" changed size during iteration");
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
goto failed;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
asdl_seq_SET(type_params, i, val);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from TypeAlias");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'TypeAlias' node")) {
goto failed;
}
res = obj2ast_expr(state, tmp, &value, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
*out = _PyAST_TypeAlias(name, type_params, value, lineno, col_offset,
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
end_lineno, end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->AugAssign_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty target;
operator_ty op;
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->target, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from AugAssign");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AugAssign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &target, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->op, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from AugAssign");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AugAssign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_operator(state, tmp, &op, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from AugAssign");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AugAssign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_AugAssign(target, op, value, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->AnnAssign_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
}
if (isinstance) {
expr_ty target;
expr_ty annotation;
expr_ty value;
int simple;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->target, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from AnnAssign");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AnnAssign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &target, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->annotation, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"annotation\" missing from AnnAssign");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AnnAssign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &annotation, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
value = NULL;
}
else {
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AnnAssign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->simple, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"simple\" missing from AnnAssign");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AnnAssign' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &simple, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_AnnAssign(target, annotation, value, simple, lineno,
col_offset, end_lineno, end_col_offset, arena);
Issue #27985: Implement PEP 526 -- Syntax for Variable Annotations. Patch by Ivan Levkivskyi.
2016-09-09 00:50:03 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->For_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty target;
expr_ty iter;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
asdl_stmt_seq* orelse;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->target, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from For");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'For' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &target, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->iter, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"iter\" missing from For");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'For' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &iter, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "For field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'For' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "For field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->orelse, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "For field \"orelse\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
orelse = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'For' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "For field \"orelse\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(orelse, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'For' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_For(target, iter, body, orelse, type_comment, lineno,
col_offset, end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->AsyncFor_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
if (isinstance) {
expr_ty target;
expr_ty iter;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
asdl_stmt_seq* orelse;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->target, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from AsyncFor");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFor' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &target, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->iter, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"iter\" missing from AsyncFor");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFor' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &iter, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "AsyncFor field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFor' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->orelse, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "AsyncFor field \"orelse\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
orelse = _Py_asdl_stmt_seq_new(len, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFor' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncFor field \"orelse\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(orelse, i, val);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncFor' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_AsyncFor(target, iter, body, orelse, type_comment,
lineno, col_offset, end_lineno, end_col_offset,
arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->While_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty test;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
asdl_stmt_seq* orelse;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->test, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from While");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'While' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &test, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "While field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'While' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "While field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->orelse, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "While field \"orelse\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
orelse = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'While' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "While field \"orelse\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(orelse, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_While(test, body, orelse, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->If_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty test;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
asdl_stmt_seq* orelse;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->test, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from If");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'If' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &test, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "If field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'If' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "If field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->orelse, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "If field \"orelse\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
orelse = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'If' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "If field \"orelse\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(orelse, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_If(test, body, orelse, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->With_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_withitem_seq* items;
asdl_stmt_seq* body;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->items, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "With field \"items\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
items = _Py_asdl_withitem_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (items == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
withitem_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'With' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_withitem(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "With field \"items\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(items, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "With field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'With' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "With field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'With' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_With(items, body, type_comment, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->AsyncWith_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_withitem_seq* items;
asdl_stmt_seq* body;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->items, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "AsyncWith field \"items\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
items = _Py_asdl_withitem_seq_new(len, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (items == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
withitem_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncWith' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_withitem(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"items\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(items, i, val);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "AsyncWith field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncWith' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "AsyncWith field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'AsyncWith' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_AsyncWith(items, body, type_comment, lineno, col_offset,
end_lineno, end_col_offset, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
tp = state->Match_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
if (isinstance) {
expr_ty subject;
asdl_match_case_seq* cases;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->subject, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"subject\" missing from Match");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Match' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
res = obj2ast_expr(state, tmp, &subject, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->cases, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "Match field \"cases\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
cases = _Py_asdl_match_case_seq_new(len, arena);
if (cases == NULL) goto failed;
for (i = 0; i < len; i++) {
match_case_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Match' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
res = obj2ast_match_case(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Match field \"cases\" changed size during iteration");
goto failed;
}
asdl_seq_SET(cases, i, val);
}
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Match(subject, cases, lineno, col_offset, end_lineno,
end_col_offset, arena);
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Raise_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty exc;
expr_ty cause;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->exc, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
exc = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Raise' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &exc, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->cause, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
cause = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Raise' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &cause, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Raise(exc, cause, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Try_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
asdl_excepthandler_seq* handlers;
asdl_stmt_seq* orelse;
asdl_stmt_seq* finalbody;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Try field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Try' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->handlers, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Try field \"handlers\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
handlers = _Py_asdl_excepthandler_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (handlers == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
excepthandler_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Try' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_excepthandler(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"handlers\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(handlers, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->orelse, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Try field \"orelse\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
orelse = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Try' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"orelse\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(orelse, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->finalbody, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Try field \"finalbody\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
finalbody = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (finalbody == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Try' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Try field \"finalbody\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(finalbody, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Try(body, handlers, orelse, finalbody, lineno,
col_offset, end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
tp = state->TryStar_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
if (isinstance) {
asdl_stmt_seq* body;
asdl_excepthandler_seq* handlers;
asdl_stmt_seq* orelse;
asdl_stmt_seq* finalbody;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "TryStar field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
body = _Py_asdl_stmt_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'TryStar' node")) {
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
goto failed;
}
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "TryStar field \"body\" changed size during iteration");
goto failed;
}
asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->handlers, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "TryStar field \"handlers\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
handlers = _Py_asdl_excepthandler_seq_new(len, arena);
if (handlers == NULL) goto failed;
for (i = 0; i < len; i++) {
excepthandler_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'TryStar' node")) {
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
goto failed;
}
res = obj2ast_excepthandler(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "TryStar field \"handlers\" changed size during iteration");
goto failed;
}
asdl_seq_SET(handlers, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->orelse, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "TryStar field \"orelse\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
orelse = _Py_asdl_stmt_seq_new(len, arena);
if (orelse == NULL) goto failed;
for (i = 0; i < len; i++) {
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'TryStar' node")) {
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
goto failed;
}
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "TryStar field \"orelse\" changed size during iteration");
goto failed;
}
asdl_seq_SET(orelse, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->finalbody, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "TryStar field \"finalbody\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
finalbody = _Py_asdl_stmt_seq_new(len, arena);
if (finalbody == NULL) goto failed;
for (i = 0; i < len; i++) {
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'TryStar' node")) {
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
goto failed;
}
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "TryStar field \"finalbody\" changed size during iteration");
goto failed;
}
asdl_seq_SET(finalbody, i, val);
}
Py_CLEAR(tmp);
}
*out = _PyAST_TryStar(body, handlers, orelse, finalbody, lineno,
col_offset, end_lineno, end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Assert_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty test;
expr_ty msg;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->test, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from Assert");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Assert' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &test, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->msg, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
msg = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Assert' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &msg, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Assert(test, msg, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Import_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_alias_seq* names;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->names, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Import field \"names\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
names = _Py_asdl_alias_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
alias_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Import' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_alias(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Import field \"names\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(names, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Import(names, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->ImportFrom_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
identifier module;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_alias_seq* names;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int level;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->module, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
module = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ImportFrom' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &module, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->names, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "ImportFrom field \"names\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
names = _Py_asdl_alias_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
alias_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ImportFrom' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_alias(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ImportFrom field \"names\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(names, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->level, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
level = 0;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ImportFrom' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &level, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_ImportFrom(module, names, level, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Global_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_identifier_seq* names;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->names, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Global field \"names\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
names = _Py_asdl_identifier_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
identifier val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Global' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Global field \"names\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(names, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Global(names, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Nonlocal_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_identifier_seq* names;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->names, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Nonlocal field \"names\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
names = _Py_asdl_identifier_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (names == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
identifier val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Nonlocal' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Nonlocal field \"names\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(names, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Nonlocal(names, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Expr_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty value;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Expr");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Expr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Expr(value, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Pass_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Pass(lineno, col_offset, end_lineno, end_col_offset,
arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Break_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Break(lineno, col_offset, end_lineno, end_col_offset,
arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Continue_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Continue(lineno, col_offset, end_lineno, end_col_offset,
arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyErr_Format(PyExc_TypeError, "expected some sort of stmt, but got %R", obj);
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_expr(struct ast_state *state, PyObject* obj, expr_ty* out, PyArena*
arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int isinstance;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject *tmp = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int lineno;
int col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
int end_lineno;
int end_col_offset;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (obj == Py_None) {
*out = NULL;
return 0;
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from expr");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'expr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from expr");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'expr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_lineno = lineno;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'expr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'expr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->BoolOp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
boolop_ty op;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* values;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->op, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from BoolOp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'BoolOp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_boolop(state, tmp, &op, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->values, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "BoolOp field \"values\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
values = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (values == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'BoolOp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "BoolOp field \"values\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(values, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_BoolOp(op, values, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->NamedExpr_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
}
if (isinstance) {
expr_ty target;
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->target, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from NamedExpr");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'NamedExpr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &target, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from NamedExpr");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'NamedExpr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_NamedExpr(target, value, lineno, col_offset, end_lineno,
end_col_offset, arena);
bpo-35224: PEP 572 Implementation (#10497) * Add tokenization of := - Add token to Include/token.h. Add token to documentation in Doc/library/token.rst. - Run `./python Lib/token.py` to regenerate Lib/token.py. - Update Parser/tokenizer.c: add case to handle `:=`. * Add initial usage of := in grammar. * Update Python.asdl to match the grammar updates. Regenerated Include/Python-ast.h and Python/Python-ast.c * Update AST and compiler files in Python/ast.c and Python/compile.c. Basic functionality, this isn't scoped properly * Regenerate Lib/symbol.py using `./python Lib/symbol.py` * Tests - Fix failing tests in test_parser.py due to changes in token numbers for internal representation * Tests - Add simple test for := token * Tests - Add simple tests for named expressions using expr and suite * Tests - Update number of levels for nested expressions to prevent stack overflow * Update symbol table to handle NamedExpr * Update Grammar to allow assignment expressions in if statements. Regenerate Python/graminit.c accordingly using `make regen-grammar` * Tests - Add additional tests for named expressions in RoundtripLegalSyntaxTestCase, based on examples and information directly from PEP 572 Note: failing tests are currently commented out (4 out of 24 tests currently fail) * Tests - Add temporary syntax test failure tests in test_parser.py Note: There is an outstanding TODO for this -- syntax tests need to be moved to a different file (presumably test_syntax.py), but this is covering what needs to be tested at the moment, and it's more convenient to run a single test for the time being * Add support for allowing assignment expressions as function argument annotations. Uncomment tests for these cases because they all pass now! * Tests - Move existing syntax tests out of test_parser.py and into test_named_expressions.py. Refactor syntax tests to use unittest * Add TargetScopeError exception to extend SyntaxError Note: This simply creates the TargetScopeError exception, it is not yet used anywhere * Tests - Update tests per PEP 572 Continue refactoring test suite: The named expression test suite now checks for any invalid cases that throw exceptions (no longer limited to SyntaxErrors), assignment tests to ensure that variables are properly assigned, and scope tests to ensure that variable availability and values are correct Note: - There are still tests that are marked to skip, as they are not yet implemented - There are approximately 300 lines of the PEP that have not yet been addressed, though these may be deferred * Documentation - Small updates to XXX/todo comments - Remove XXX from child description in ast.c - Add comment with number of previously supported nested expressions for 3.7.X in test_parser.py * Fix assert in seq_for_testlist() * Cleanup - Denote "Not implemented -- No keyword args" on failing test case. Fix PEP8 error for blank lines at beginning of test classes in test_parser.py * Tests - Wrap all file opens in `with...as` to ensure files are closed * WIP: handle f(a := 1) * Tests and Cleanup - No longer skips keyword arg test. Keyword arg test now uses a simpler test case and does not rely on an external file. Remove print statements from ast.c * Tests - Refactor last remaining test case that relied on on external file to use a simpler test case without the dependency * Tests - Add better description of remaning skipped tests. Add test checking scope when using assignment expression in a function argument * Tests - Add test for nested comprehension, testing value and scope. Fix variable name in skipped comprehension scope test * Handle restriction of LHS for named expressions - can only assign to LHS of type NAME. Specifically, restrict assignment to tuples This adds an alternative set_context specifically for named expressions, set_namedexpr_context. Thus, context is now set differently for standard assignment versus assignment for named expressions in order to handle restrictions. * Tests - Update negative test case for assigning to lambda to match new error message. Add negative test case for assigning to tuple * Tests - Reorder test cases to group invalid syntax cases and named assignment target errors * Tests - Update test case for named expression in function argument - check that result and variable are set correctly * Todo - Add todo for TargetScopeError based on Guido's comment (https://github.com/python/cpython/commit/2b3acd37bdfc2d35e5094228c6684050d2aa8b0a#r30472562) * Tests - Add named expression tests for assignment operator in function arguments Note: One of two tests are skipped, as function arguments are currently treating an assignment expression inside of parenthesis as one child, which does not properly catch the named expression, nor does it count arguments properly * Add NamedStore to expr_context. Regenerate related code with `make regen-ast` * Add usage of NamedStore to ast_for_named_expr in ast.c. Update occurances of checking for Store to also handle NamedStore where appropriate * Add ste_comprehension to _symtable_entry to track if the namespace is a comprehension. Initialize ste_comprehension to 0. Set set_comprehension to 1 in symtable_handle_comprehension * s/symtable_add_def/symtable_add_def_helper. Add symtable_add_def to handle grabbing st->st_cur and passing it to symtable_add_def_helper. This now allows us to call the original code from symtable_add_def by instead calling symtable_add_def_helper with a different ste. * Refactor symtable_record_directive to take lineno and col_offset as arguments instead of stmt_ty. This allows symtable_record_directive to be used for stmt_ty and expr_ty * Handle elevating scope for named expressions in comprehensions. * Handle error for usage of named expression inside a class block * Tests - No longer skip scope tests. Add additional scope tests * Cleanup - Update error message for named expression within a comprehension within a class. Update comments. Add assert for symtable_extend_namedexpr_scope to validate that we always find at least a ModuleScope if we don't find a Class or FunctionScope * Cleanup - Add missing case for NamedStore in expr_context_name. Remove unused var in set_namedexpr_content * Refactor - Consolidate set_context and set_namedexpr_context to reduce duplicated code. Special cases for named expressions are handled by checking if ctx is NamedStore * Cleanup - Add additional use cases for ast_for_namedexpr in usage comment. Fix multiple blank lines in test_named_expressions * Tests - Remove unnecessary test case. Renumber test case function names * Remove TargetScopeError for now. Will add back if needed * Cleanup - Small comment nit for consistency * Handle positional argument check with named expression * Add TargetScopeError exception definition. Add documentation for TargetScopeError in c-api docs. Throw TargetScopeError instead of SyntaxError when using a named expression in a comprehension within a class scope * Increase stack size for parser by 200. This is a minimal change (approx. 5kb) and should not have an impact on any systems. Update parser test to allow 99 nested levels again * Add TargetScopeError to exception_hierarchy.txt for test_baseexception.py_ * Tests - Major update for named expression tests, both in test_named_expressions and test_parser - Add test for TargetScopeError - Add tests for named expressions in comprehension scope and edge cases - Add tests for named expressions in function arguments (declarations and call sites) - Reorganize tests to group them more logically * Cleanup - Remove unnecessary comment * Cleanup - Comment nitpicks * Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0) - Add check for LHS types to detect a parenthesis then a name (see note) - Add test for this scenario - Update tests for changed error message for named assignment to a tuple (also, see note) Note: This caused issues with the previous error handling for named assignment to a LHS that contained an expression, such as a tuple. Thus, the check for the LHS of a named expression must be changed to be more specific if we wish to maintain the previous error messages * Cleanup - Wrap lines more strictly in test file * Revert "Explicitly disallow assignment expressions to a name inside parentheses, e.g.: ((x) := 0)" This reverts commit f1531400ca7d7a2d148830c8ac703f041740896d. * Add NEWS.d entry * Tests - Fix error in test_pickle.test_exceptions by adding TargetScopeError to list of exceptions * Tests - Update error message tests to reflect improved messaging convention (s/can't/cannot) * Remove cases that cannot be reached in compile.c. Small linting update. * Update Grammar/Tokens to add COLONEQUAL. Regenerate all files * Update TargetScopeError PRE_INIT and POST_INIT, as this was purposefully left out when fixing rebase conflicts * Add NamedStore back and regenerate files * Pass along line number and end col info for named expression * Simplify News entry * Fix compiler warning and explicity mark fallthrough
2019-01-24 19:49:56 -04:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->BinOp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty left;
operator_ty op;
expr_ty right;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->left, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"left\" missing from BinOp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'BinOp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &left, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->op, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from BinOp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'BinOp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_operator(state, tmp, &op, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->right, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"right\" missing from BinOp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'BinOp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &right, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_BinOp(left, op, right, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->UnaryOp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
unaryop_ty op;
expr_ty operand;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->op, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"op\" missing from UnaryOp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'UnaryOp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_unaryop(state, tmp, &op, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->operand, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"operand\" missing from UnaryOp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'UnaryOp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &operand, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_UnaryOp(op, operand, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Lambda_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
arguments_ty args;
expr_ty body;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->args, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"args\" missing from Lambda");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Lambda' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arguments(state, tmp, &args, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from Lambda");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Lambda' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &body, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Lambda(args, body, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->IfExp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty test;
expr_ty body;
expr_ty orelse;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->test, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"test\" missing from IfExp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'IfExp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &test, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"body\" missing from IfExp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'IfExp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &body, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->orelse, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"orelse\" missing from IfExp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'IfExp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &orelse, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_IfExp(test, body, orelse, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Dict_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* keys;
asdl_expr_seq* values;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->keys, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Dict field \"keys\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
keys = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (keys == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Dict' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Dict field \"keys\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(keys, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->values, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Dict field \"values\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
values = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (values == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Dict' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Dict field \"values\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(values, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
make YieldFrom its own distinct from Yield (closes #13780)
2012-01-14 09:58:23 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Dict(keys, values, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Set_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* elts;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->elts, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Set field \"elts\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
elts = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (elts == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Set' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Set field \"elts\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(elts, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Set(elts, lineno, col_offset, end_lineno, end_col_offset,
arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->ListComp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty elt;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_comprehension_seq* generators;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->elt, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from ListComp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ListComp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &elt, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->generators, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "ListComp field \"generators\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
generators = _Py_asdl_comprehension_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
comprehension_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ListComp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_comprehension(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ListComp field \"generators\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(generators, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_ListComp(elt, generators, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->SetComp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty elt;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_comprehension_seq* generators;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->elt, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from SetComp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'SetComp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &elt, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->generators, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "SetComp field \"generators\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
generators = _Py_asdl_comprehension_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
comprehension_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'SetComp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_comprehension(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "SetComp field \"generators\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(generators, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_SetComp(elt, generators, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->DictComp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty key;
expr_ty value;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_comprehension_seq* generators;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->key, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"key\" missing from DictComp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'DictComp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &key, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from DictComp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'DictComp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->generators, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "DictComp field \"generators\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
generators = _Py_asdl_comprehension_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
comprehension_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'DictComp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_comprehension(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "DictComp field \"generators\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(generators, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_DictComp(key, value, generators, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->GeneratorExp_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty elt;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_comprehension_seq* generators;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->elt, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"elt\" missing from GeneratorExp");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'GeneratorExp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &elt, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->generators, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "GeneratorExp field \"generators\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
generators = _Py_asdl_comprehension_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (generators == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
comprehension_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'GeneratorExp' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_comprehension(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "GeneratorExp field \"generators\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(generators, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_GeneratorExp(elt, generators, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Await_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
}
if (isinstance) {
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Await");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Await' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Await(value, lineno, col_offset, end_lineno,
end_col_offset, arena);
PEP 0492 -- Coroutines with async and await syntax. Issue #24017.
2015-05-11 23:57:16 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Yield_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
value = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Yield' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Yield(value, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->YieldFrom_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from YieldFrom");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'YieldFrom' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_YieldFrom(value, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Compare_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty left;
asdl_int_seq* ops;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* comparators;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->left, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"left\" missing from Compare");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Compare' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &left, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ops, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Compare field \"ops\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
Issue #4555: All exported C symbols are now prefixed with either "Py" or "_Py". ("make smelly" now clean)
2013-10-12 17:52:43 -03:00
ops = _Py_asdl_int_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (ops == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
cmpop_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Compare' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_cmpop(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Compare field \"ops\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(ops, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->comparators, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Compare field \"comparators\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
comparators = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (comparators == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Compare' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Compare field \"comparators\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(comparators, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Compare(left, ops, comparators, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Call_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty func;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* args;
asdl_keyword_seq* keywords;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->func, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"func\" missing from Call");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Call' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &func, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->args, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Call field \"args\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
args = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (args == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Call' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Call field \"args\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(args, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->keywords, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Call field \"keywords\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
keywords = _Py_asdl_keyword_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (keywords == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
keyword_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Call' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_keyword(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Call field \"keywords\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(keywords, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Call(func, args, keywords, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->FormattedValue_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
}
if (isinstance) {
expr_ty value;
int conversion;
expr_ty format_spec;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from FormattedValue");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FormattedValue' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->conversion, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
}
bpo-46289: Make conversion of FormattedValue not optional on ASDL (GH-30467) Automerge-Triggered-By: GH:isidentical
2022-01-07 17:05:28 -04:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"conversion\" missing from FormattedValue");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FormattedValue' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &conversion, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->format_spec, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
format_spec = NULL;
}
else {
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'FormattedValue' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &format_spec, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_FormattedValue(value, conversion, format_spec, lineno,
col_offset, end_lineno, end_col_offset,
arena);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->JoinedStr_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* values;
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->values, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "JoinedStr field \"values\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
values = _Py_asdl_expr_seq_new(len, arena);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (values == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'JoinedStr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:55:49 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "JoinedStr field \"values\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(values, i, val);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
}
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_JoinedStr(values, lineno, col_offset, end_lineno,
end_col_offset, arena);
Issue #24965: Implement PEP 498 "Literal String Interpolation". Documentation is still needed, I'll open an issue for that.
2015-09-19 15:51:32 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Constant_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
}
if (isinstance) {
constant value;
bpo-36280: Add Constant.kind field (GH-12295) The value is a string for string and byte literals, None otherwise. It is 'u' for u"..." literals, 'b' for b"..." literals, '' for "..." literals. The 'r' (raw) prefix is ignored. Does not apply to f-strings. This appears sufficient to make mypy capable of using the stdlib ast module instead of typed_ast (assuming a mypy patch I'm working on). WIP: I need to make the tests pass. @ilevkivskyi @serhiy-storchaka https://bugs.python.org/issue36280
2019-03-13 17:00:46 -03:00
string kind;
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Constant");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Constant' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_constant(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->kind, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36280: Add Constant.kind field (GH-12295) The value is a string for string and byte literals, None otherwise. It is 'u' for u"..." literals, 'b' for b"..." literals, '' for "..." literals. The 'r' (raw) prefix is ignored. Does not apply to f-strings. This appears sufficient to make mypy capable of using the stdlib ast module instead of typed_ast (assuming a mypy patch I'm working on). WIP: I need to make the tests pass. @ilevkivskyi @serhiy-storchaka https://bugs.python.org/issue36280
2019-03-13 17:00:46 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
kind = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Constant' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &kind, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-36280: Add Constant.kind field (GH-12295) The value is a string for string and byte literals, None otherwise. It is 'u' for u"..." literals, 'b' for b"..." literals, '' for "..." literals. The 'r' (raw) prefix is ignored. Does not apply to f-strings. This appears sufficient to make mypy capable of using the stdlib ast module instead of typed_ast (assuming a mypy patch I'm working on). WIP: I need to make the tests pass. @ilevkivskyi @serhiy-storchaka https://bugs.python.org/issue36280
2019-03-13 17:00:46 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Constant(value, kind, lineno, col_offset, end_lineno,
end_col_offset, arena);
Add ast.Constant Issue #26146: Add a new kind of AST node: ast.Constant. It can be used by external AST optimizers, but the compiler does not emit directly such node. An optimizer can replace the following AST nodes with ast.Constant: * ast.NameConstant: None, False, True * ast.Num: int, float, complex * ast.Str: str * ast.Bytes: bytes * ast.Tuple if items are constants too: tuple * frozenset Update code to accept ast.Constant instead of ast.Num and/or ast.Str: * compiler * docstrings * ast.literal_eval() * Tools/parser/unparse.py
2016-01-25 19:40:57 -04:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Attribute_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty value;
identifier attr;
expr_context_ty ctx;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Attribute");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Attribute' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->attr, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"attr\" missing from Attribute");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Attribute' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &attr, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ctx, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Attribute");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Attribute' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr_context(state, tmp, &ctx, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Attribute(value, attr, ctx, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Subscript_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty value;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
expr_ty slice;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_context_ty ctx;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Subscript");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Subscript' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->slice, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"slice\" missing from Subscript");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Subscript' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &slice, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ctx, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Subscript");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Subscript' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr_context(state, tmp, &ctx, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Subscript(value, slice, ctx, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Starred_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty value;
expr_context_ty ctx;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from Starred");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Starred' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ctx, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Starred");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Starred' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr_context(state, tmp, &ctx, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Starred(value, ctx, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Name_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
identifier id;
expr_context_ty ctx;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->id, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"id\" missing from Name");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Name' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &id, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ctx, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Name");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Name' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr_context(state, tmp, &ctx, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Name(id, ctx, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->List_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* elts;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_context_ty ctx;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->elts, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "List field \"elts\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
elts = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (elts == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'List' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "List field \"elts\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(elts, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ctx, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from List");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'List' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr_context(state, tmp, &ctx, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_List(elts, ctx, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Tuple_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* elts;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
expr_context_ty ctx;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->elts, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "Tuple field \"elts\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
elts = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (elts == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Tuple' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "Tuple field \"elts\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(elts, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ctx, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"ctx\" missing from Tuple");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Tuple' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr_context(state, tmp, &ctx, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Tuple(elts, ctx, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->Slice_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty lower;
expr_ty upper;
expr_ty step;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lower, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
lower = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Slice' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &lower, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->upper, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
upper = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Slice' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &upper, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->step, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
step = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'Slice' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &step, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_Slice(lower, upper, step, lineno, col_offset, end_lineno,
end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
PyErr_Format(PyExc_TypeError, "expected some sort of expr, but got %R", obj);
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_expr_context(struct ast_state *state, PyObject* obj, expr_context_ty*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
out, PyArena* arena)
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
{
int isinstance;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Load_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
*out = Load;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Store_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
*out = Store;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Del_type);
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
}
if (isinstance) {
*out = Del;
return 0;
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
PyErr_Format(PyExc_TypeError, "expected some sort of expr_context, but got %R", obj);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_boolop(struct ast_state *state, PyObject* obj, boolop_ty* out, PyArena*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int isinstance;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->And_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = And;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Or_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Or;
return 0;
}
PyErr_Format(PyExc_TypeError, "expected some sort of boolop, but got %R", obj);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_operator(struct ast_state *state, PyObject* obj, operator_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int isinstance;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Add_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Add;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Sub_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Sub;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Mult_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Mult;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->MatMult_type);
PEP 465: a dedicated infix operator for matrix multiplication (closes #21176)
2014-04-10 00:55:56 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
PEP 465: a dedicated infix operator for matrix multiplication (closes #21176)
2014-04-10 00:55:56 -03:00
}
if (isinstance) {
*out = MatMult;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Div_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Div;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Mod_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Mod;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Pow_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Pow;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->LShift_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = LShift;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->RShift_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = RShift;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->BitOr_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = BitOr;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->BitXor_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = BitXor;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->BitAnd_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = BitAnd;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->FloorDiv_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = FloorDiv;
return 0;
}
PyErr_Format(PyExc_TypeError, "expected some sort of operator, but got %R", obj);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_unaryop(struct ast_state *state, PyObject* obj, unaryop_ty* out,
PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int isinstance;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Invert_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Invert;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Not_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Not;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->UAdd_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = UAdd;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->USub_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = USub;
return 0;
}
PyErr_Format(PyExc_TypeError, "expected some sort of unaryop, but got %R", obj);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_cmpop(struct ast_state *state, PyObject* obj, cmpop_ty* out, PyArena*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int isinstance;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Eq_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Eq;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->NotEq_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = NotEq;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Lt_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Lt;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->LtE_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = LtE;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Gt_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Gt;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->GtE_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = GtE;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->Is_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = Is;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->IsNot_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = IsNot;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->In_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = In;
return 0;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
isinstance = PyObject_IsInstance(obj, state->NotIn_type);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
*out = NotIn;
return 0;
}
PyErr_Format(PyExc_TypeError, "expected some sort of cmpop, but got %R", obj);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_comprehension(struct ast_state *state, PyObject* obj, comprehension_ty*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
out, PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject* tmp = NULL;
expr_ty target;
expr_ty iter;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* ifs;
Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 14:36:01 -03:00
int is_async;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->target, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"target\" missing from comprehension");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'comprehension' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &target, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->iter, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"iter\" missing from comprehension");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'comprehension' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &iter, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->ifs, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "comprehension field \"ifs\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
ifs = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (ifs == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'comprehension' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "comprehension field \"ifs\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(ifs, i, val);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->is_async, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"is_async\" missing from comprehension");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 14:36:01 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'comprehension' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &is_async, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #28008: Implement PEP 530 -- asynchronous comprehensions.
2016-09-09 14:36:01 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_comprehension(target, iter, ifs, is_async, arena);
GH-105588: Add missing error checks to some obj2ast_* converters (GH-105589)
2023-06-15 19:45:13 -03:00
if (*out == NULL) goto failed;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return 0;
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_excepthandler(struct ast_state *state, PyObject* obj, excepthandler_ty*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
out, PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int isinstance;
Merged revisions 62047 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62047 | georg.brandl | 2008-03-29 23:40:17 -0700 (Sat, 29 Mar 2008) | 2 lines Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. ........
2008-03-31 02:14:30 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject *tmp = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyObject *tp;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int lineno;
int col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
int end_lineno;
int end_col_offset;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (obj == Py_None) {
*out = NULL;
return 0;
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from excepthandler");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'excepthandler' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from excepthandler");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'excepthandler' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_lineno = lineno;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'excepthandler' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'excepthandler' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
tp = state->ExceptHandler_type;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
isinstance = PyObject_IsInstance(obj, tp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
if (isinstance) {
expr_ty type;
identifier name;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_stmt_seq* body;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ExceptHandler' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &type, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
name = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ExceptHandler' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &name, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "ExceptHandler field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
body = _Py_asdl_stmt_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'ExceptHandler' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "ExceptHandler field \"body\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(body, i, val);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
Merged revisions 62047 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62047 | georg.brandl | 2008-03-29 23:40:17 -0700 (Sat, 29 Mar 2008) | 2 lines Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. ........
2008-03-31 02:14:30 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_ExceptHandler(type, name, body, lineno, col_offset,
end_lineno, end_col_offset, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (*out == NULL) goto failed;
return 0;
}
Merged revisions 62047 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62047 | georg.brandl | 2008-03-29 23:40:17 -0700 (Sat, 29 Mar 2008) | 2 lines Patch #2511: Give the "excepthandler" AST item proper attributes by making it a Sum. ........
2008-03-31 02:14:30 -03:00
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyErr_Format(PyExc_TypeError, "expected some sort of excepthandler, but got %R", obj);
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_arguments(struct ast_state *state, PyObject* obj, arguments_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject* tmp = NULL;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_arg_seq* posonlyargs;
asdl_arg_seq* args;
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
arg_ty vararg;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_arg_seq* kwonlyargs;
asdl_expr_seq* kw_defaults;
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
arg_ty kwarg;
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
asdl_expr_seq* defaults;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->posonlyargs, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "arguments field \"posonlyargs\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
posonlyargs = _Py_asdl_arg_seq_new(len, arena);
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
if (posonlyargs == NULL) goto failed;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
arg_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arguments' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arg(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
PyErr_SetString(PyExc_RuntimeError, "arguments field \"posonlyargs\" changed size during iteration");
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
goto failed;
}
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
asdl_seq_SET(posonlyargs, i, val);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->args, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "arguments field \"args\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
args = _Py_asdl_arg_seq_new(len, arena);
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
if (args == NULL) goto failed;
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
for (i = 0; i < len; i++) {
arg_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arguments' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arg(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
PyErr_SetString(PyExc_RuntimeError, "arguments field \"args\" changed size during iteration");
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
goto failed;
}
bpo-37593: Swap the positions of posonlyargs and args in the constructor of ast.parameters nodes (GH-14778) https://bugs.python.org/issue37593
2019-07-14 20:32:18 -03:00
asdl_seq_SET(args, i, val);
bpo-36540: PEP 570 -- Implementation (GH-12701) This commit contains the implementation of PEP570: Python positional-only parameters. * Update Grammar/Grammar with new typedarglist and varargslist * Regenerate grammar files * Update and regenerate AST related files * Update code object * Update marshal.c * Update compiler and symtable * Regenerate importlib files * Update callable objects * Implement positional-only args logic in ceval.c * Regenerate frozen data * Update standard library to account for positional-only args * Add test file for positional-only args * Update other test files to account for positional-only args * Add News entry * Update inspect module and related tests
2019-04-29 09:36:57 -03:00
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->vararg, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
vararg = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arguments' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arg(state, tmp, &vararg, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->kwonlyargs, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "arguments field \"kwonlyargs\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
kwonlyargs = _Py_asdl_arg_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (kwonlyargs == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
arg_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arguments' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arg(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "arguments field \"kwonlyargs\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(kwonlyargs, i, val);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->kw_defaults, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "arguments field \"kw_defaults\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
kw_defaults = _Py_asdl_expr_seq_new(len, arena);
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
if (kw_defaults == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arguments' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
(Merge 3.3) According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:01:35 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "arguments field \"kw_defaults\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(kw_defaults, i, val);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->kwarg, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
kwarg = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arguments' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_arg(state, tmp, &kwarg, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->defaults, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyErr_Format(PyExc_TypeError, "arguments field \"defaults\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
goto failed;
}
len = PyList_GET_SIZE(tmp);
bpo-41746: Add type information to asdl_seq objects (GH-22223) * Add new capability to the PEG parser to type variable assignments. For instance: ``` | a[asdl_stmt_seq*]=';'.small_stmt+ [';'] NEWLINE { a } ``` * Add new sequence types from the asdl definition (automatically generated) * Make `asdl_seq` type a generic aliasing pointer type. * Create a new `asdl_generic_seq` for the generic case using `void*`. * The old `asdl_seq_GET`/`ast_seq_SET` macros now are typed. * New `asdl_seq_GET_UNTYPED`/`ast_seq_SET_UNTYPED` macros for dealing with generic sequences. * Changes all possible `asdl_seq` types to use specific versions everywhere.
2020-09-16 15:42:00 -03:00
defaults = _Py_asdl_expr_seq_new(len, arena);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (defaults == NULL) goto failed;
for (i = 0; i < len; i++) {
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arguments' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
Py_DECREF(tmp2);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Issue #24098: Fixed possible crash when AST is changed in process of compiling it.
2016-10-07 15:51:28 -03:00
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "arguments field \"defaults\" changed size during iteration");
goto failed;
}
Fix a shadow-compatible-local warning (#2180) Change the shadowing naming, 'value' (Python-ast.c:4652), to 'val' to prevent the variables from being misused.
2017-08-04 14:53:12 -03:00
asdl_seq_SET(defaults, i, val);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_arguments(posonlyargs, args, vararg, kwonlyargs, kw_defaults,
kwarg, defaults, arena);
GH-105588: Add missing error checks to some obj2ast_* converters (GH-105589)
2023-06-15 19:45:13 -03:00
if (*out == NULL) goto failed;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return 0;
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_arg(struct ast_state *state, PyObject* obj, arg_ty* out, PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject* tmp = NULL;
identifier arg;
expr_ty annotation;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
string type_comment;
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when compiling AST from Python objects.
2015-11-06 12:01:48 -04:00
int lineno;
int col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
int end_lineno;
int end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->arg, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"arg\" missing from arg");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arg' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &arg, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->annotation, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
annotation = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arg' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &annotation, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->type_comment, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
type_comment = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arg' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &type_comment, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from arg");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when compiling AST from Python objects.
2015-11-06 12:01:48 -04:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arg' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when compiling AST from Python objects.
2015-11-06 12:01:48 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when compiling AST from Python objects.
2015-11-06 12:01:48 -04:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from arg");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when compiling AST from Python objects.
2015-11-06 12:01:48 -04:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arg' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
Issue #25555: Fix parser and AST: fill lineno and col_offset of "arg" node when compiling AST from Python objects.
2015-11-06 12:01:48 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_lineno = lineno;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arg' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_col_offset = col_offset;
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'arg' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-33416: Add end positions to Python AST (GH-11605) The majority of this PR is tediously passing `end_lineno` and `end_col_offset` everywhere. Here are non-trivial points: * It is not possible to reconstruct end positions in AST "on the fly", some information is lost after an AST node is constructed, so we need two more attributes for every AST node `end_lineno` and `end_col_offset`. * I add end position information to both CST and AST. Although it may be technically possible to avoid adding end positions to CST, the code becomes more cumbersome and less efficient. * Since the end position is not known for non-leaf CST nodes while the next token is added, this requires a bit of extra care (see `_PyNode_FinalizeEndPos`). Unless I made some mistake, the algorithm should be linear. * For statements, I "trim" the end position of suites to not include the terminal newlines and dedent (this seems to be what people would expect), for example in ```python class C: pass pass ``` the end line and end column for the class definition is (2, 8). * For `end_col_offset` I use the common Python convention for indexing, for example for `pass` the `end_col_offset` is 4 (not 3), so that `[0:4]` gives one the source code that corresponds to the node. * I added a helper function `ast.get_source_segment()`, to get source text segment corresponding to a given AST node. It is also useful for testing. An (inevitable) downside of this PR is that AST now takes almost 25% more memory. I think however it is probably justified by the benefits.
2019-01-22 07:18:22 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_arg(arg, annotation, type_comment, lineno, col_offset,
end_lineno, end_col_offset, arena);
GH-105588: Add missing error checks to some obj2ast_* converters (GH-105589)
2023-06-15 19:45:13 -03:00
if (*out == NULL) goto failed;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return 0;
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_keyword(struct ast_state *state, PyObject* obj, keyword_ty* out,
PyArena* arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject* tmp = NULL;
identifier arg;
expr_ty value;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
int lineno;
int col_offset;
int end_lineno;
int end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->arg, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
arg = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'keyword' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &arg, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from keyword");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'keyword' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from keyword");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'keyword' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from keyword");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'keyword' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_lineno = lineno;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'keyword' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_col_offset = col_offset;
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'keyword' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &end_col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-40141: Add line and column information to ast.keyword nodes (GH-19283)
2020-04-01 20:47:39 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_keyword(arg, value, lineno, col_offset, end_lineno,
end_col_offset, arena);
GH-105588: Add missing error checks to some obj2ast_* converters (GH-105589)
2023-06-15 19:45:13 -03:00
if (*out == NULL) goto failed;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return 0;
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_alias(struct ast_state *state, PyObject* obj, alias_ty* out, PyArena*
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
arena)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject* tmp = NULL;
identifier name;
identifier asname;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
int lineno;
int col_offset;
int end_lineno;
int end_col_offset;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from alias");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'alias' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &name, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->asname, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
asname = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'alias' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_identifier(state, tmp, &asname, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from alias");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'alias' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from alias");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'alias' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
res = obj2ast_int(state, tmp, &col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_lineno = lineno;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'alias' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
res = obj2ast_int(state, tmp, &end_lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
gh-92597: Ensure that AST nodes without explicit end positions can be compiled (GH-93359)
2022-05-31 20:00:47 -03:00
end_col_offset = col_offset;
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'alias' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
res = obj2ast_int(state, tmp, &end_col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43798: Add source location attributes to alias (GH-25324) * Add source location attributes to alias. * Move alias star construction to pegen helper. Co-authored-by: blurb-it[bot] <43283697+blurb-it[bot]@users.noreply.github.com> Co-authored-by: Pablo Galindo <Pablogsal@gmail.com>
2021-04-10 17:56:28 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_alias(name, asname, lineno, col_offset, end_lineno,
end_col_offset, arena);
GH-105588: Add missing error checks to some obj2ast_* converters (GH-105589)
2023-06-15 19:45:13 -03:00
if (*out == NULL) goto failed;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return 0;
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
int
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
obj2ast_withitem(struct ast_state *state, PyObject* obj, withitem_ty* out,
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyArena* arena)
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
{
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
PyObject* tmp = NULL;
expr_ty context_expr;
expr_ty optional_vars;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->context_expr, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"context_expr\" missing from withitem");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'withitem' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &context_expr, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->optional_vars, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-32571: Avoid raising unneeded AttributeError and silencing it in C code (GH-5222) Add two new private APIs: _PyObject_LookupAttr() and _PyObject_LookupAttrId()
2018-01-25 04:49:40 -04:00
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
optional_vars = NULL;
}
else {
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'withitem' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_expr(state, tmp, &optional_vars, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
if (res != 0) goto failed;
Parser/asdl_c.py: use Py_CLEAR()
2013-07-26 19:03:47 -03:00
Py_CLEAR(tmp);
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_withitem(context_expr, optional_vars, arena);
GH-105588: Add missing error checks to some obj2ast_* converters (GH-105589)
2023-06-15 19:45:13 -03:00
if (*out == NULL) goto failed;
According to the PEP 7, C code must "use 4-space indents" Replace 8 spaces with 4.
2013-07-26 19:00:36 -03:00
return 0;
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
reflect with statements with multiple items in the AST (closes #12106)
2011-05-27 15:58:08 -03:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
int
obj2ast_match_case(struct ast_state *state, PyObject* obj, match_case_ty* out,
PyArena* arena)
{
PyObject* tmp = NULL;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
pattern_ty pattern;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
expr_ty guard;
asdl_stmt_seq* body;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->pattern, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"pattern\" missing from match_case");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'match_case' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_pattern(state, tmp, &pattern, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->guard, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
guard = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'match_case' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
res = obj2ast_expr(state, tmp, &guard, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->body, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "match_case field \"body\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
body = _Py_asdl_stmt_seq_new(len, arena);
if (body == NULL) goto failed;
for (i = 0; i < len; i++) {
stmt_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'match_case' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
res = obj2ast_stmt(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "match_case field \"body\" changed size during iteration");
goto failed;
}
asdl_seq_SET(body, i, val);
}
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_match_case(pattern, guard, body, arena);
GH-105588: Add missing error checks to some obj2ast_* converters (GH-105589)
2023-06-15 19:45:13 -03:00
if (*out == NULL) goto failed;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
return 0;
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
}
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
int
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
obj2ast_pattern(struct ast_state *state, PyObject* obj, pattern_ty* out,
PyArena* arena)
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
{
int isinstance;
PyObject *tmp = NULL;
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
PyObject *tp;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int lineno;
int col_offset;
int end_lineno;
int end_col_offset;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (obj == Py_None) {
*out = NULL;
return 0;
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from pattern");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'pattern' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from pattern");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'pattern' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_int(state, tmp, &col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"end_lineno\" missing from pattern");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'pattern' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_int(state, tmp, &end_lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"end_col_offset\" missing from pattern");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'pattern' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_int(state, tmp, &end_col_offset, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
tp = state->MatchValue_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
expr_ty value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from MatchValue");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchValue' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_expr(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_MatchValue(value, lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
tp = state->MatchSingleton_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
constant value;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->value, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"value\" missing from MatchSingleton");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchSingleton' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_constant(state, tmp, &value, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_MatchSingleton(value, lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
tp = state->MatchSequence_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
asdl_pattern_seq* patterns;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->patterns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "MatchSequence field \"patterns\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
patterns = _Py_asdl_pattern_seq_new(len, arena);
if (patterns == NULL) goto failed;
for (i = 0; i < len; i++) {
pattern_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchSequence' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_pattern(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "MatchSequence field \"patterns\" changed size during iteration");
goto failed;
}
asdl_seq_SET(patterns, i, val);
}
Py_CLEAR(tmp);
}
*out = _PyAST_MatchSequence(patterns, lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
tp = state->MatchMapping_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
asdl_expr_seq* keys;
asdl_pattern_seq* patterns;
identifier rest;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->keys, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "MatchMapping field \"keys\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
keys = _Py_asdl_expr_seq_new(len, arena);
if (keys == NULL) goto failed;
for (i = 0; i < len; i++) {
expr_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchMapping' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_expr(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "MatchMapping field \"keys\" changed size during iteration");
goto failed;
}
asdl_seq_SET(keys, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->patterns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "MatchMapping field \"patterns\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
patterns = _Py_asdl_pattern_seq_new(len, arena);
if (patterns == NULL) goto failed;
for (i = 0; i < len; i++) {
pattern_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchMapping' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_pattern(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "MatchMapping field \"patterns\" changed size during iteration");
goto failed;
}
asdl_seq_SET(patterns, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->rest, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
rest = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchMapping' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_identifier(state, tmp, &rest, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_MatchMapping(keys, patterns, rest, lineno, col_offset,
end_lineno, end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
tp = state->MatchClass_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
expr_ty cls;
asdl_pattern_seq* patterns;
asdl_identifier_seq* kwd_attrs;
asdl_pattern_seq* kwd_patterns;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->cls, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"cls\" missing from MatchClass");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchClass' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_expr(state, tmp, &cls, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->patterns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "MatchClass field \"patterns\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
patterns = _Py_asdl_pattern_seq_new(len, arena);
if (patterns == NULL) goto failed;
for (i = 0; i < len; i++) {
pattern_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchClass' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_pattern(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "MatchClass field \"patterns\" changed size during iteration");
goto failed;
}
asdl_seq_SET(patterns, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->kwd_attrs, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "MatchClass field \"kwd_attrs\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
kwd_attrs = _Py_asdl_identifier_seq_new(len, arena);
if (kwd_attrs == NULL) goto failed;
for (i = 0; i < len; i++) {
identifier val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchClass' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_identifier(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "MatchClass field \"kwd_attrs\" changed size during iteration");
goto failed;
}
asdl_seq_SET(kwd_attrs, i, val);
}
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->kwd_patterns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "MatchClass field \"kwd_patterns\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
kwd_patterns = _Py_asdl_pattern_seq_new(len, arena);
if (kwd_patterns == NULL) goto failed;
for (i = 0; i < len; i++) {
pattern_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchClass' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_pattern(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "MatchClass field \"kwd_patterns\" changed size during iteration");
goto failed;
}
asdl_seq_SET(kwd_patterns, i, val);
}
Py_CLEAR(tmp);
}
*out = _PyAST_MatchClass(cls, patterns, kwd_attrs, kwd_patterns,
lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
tp = state->MatchStar_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
identifier name;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
name = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchStar' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_identifier(state, tmp, &name, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_MatchStar(name, lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
tp = state->MatchAs_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
pattern_ty pattern;
identifier name;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->pattern, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
pattern = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchAs' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_pattern(state, tmp, &pattern, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
name = NULL;
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchAs' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_identifier(state, tmp, &name, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_MatchAs(pattern, name, lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
tp = state->MatchOr_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
asdl_pattern_seq* patterns;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->patterns, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
tmp = PyList_New(0);
if (tmp == NULL) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
gh-104799: Default missing lists in AST to the empty list (#104834) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-06-01 22:39:39 -03:00
{
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
int res;
Py_ssize_t len;
Py_ssize_t i;
if (!PyList_Check(tmp)) {
PyErr_Format(PyExc_TypeError, "MatchOr field \"patterns\" must be a list, not a %.200s", _PyType_Name(Py_TYPE(tmp)));
goto failed;
}
len = PyList_GET_SIZE(tmp);
patterns = _Py_asdl_pattern_seq_new(len, arena);
if (patterns == NULL) goto failed;
for (i = 0; i < len; i++) {
pattern_ty val;
gh-99300: Use Py_NewRef() in Python/Python-ast.c (#99499) Replace Py_INCREF() and Py_XINCREF() with Py_NewRef() and Py_XNewRef() in Python/Python-ast.c. Update Parser/asdl_c.py to regenerate code.
2022-11-15 05:29:56 -04:00
PyObject *tmp2 = Py_NewRef(PyList_GET_ITEM(tmp, i));
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'MatchOr' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
res = obj2ast_pattern(state, tmp2, &val, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
Py_DECREF(tmp2);
if (res != 0) goto failed;
if (len != PyList_GET_SIZE(tmp)) {
PyErr_SetString(PyExc_RuntimeError, "MatchOr field \"patterns\" changed size during iteration");
goto failed;
}
asdl_seq_SET(patterns, i, val);
}
Py_CLEAR(tmp);
}
*out = _PyAST_MatchOr(patterns, lineno, col_offset, end_lineno,
end_col_offset, arena);
if (*out == NULL) goto failed;
return 0;
}
PyErr_Format(PyExc_TypeError, "expected some sort of pattern, but got %R", obj);
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
int
obj2ast_type_ignore(struct ast_state *state, PyObject* obj, type_ignore_ty*
out, PyArena* arena)
{
int isinstance;
PyObject *tmp = NULL;
PyObject *tp;
if (obj == Py_None) {
*out = NULL;
return 0;
}
tp = state->TypeIgnore_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (isinstance) {
int lineno;
string tag;
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from TypeIgnore");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'TypeIgnore' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_int(state, tmp, &lineno, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->tag, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"tag\" missing from TypeIgnore");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
}
else {
int res;
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'TypeIgnore' node")) {
bpo-11105: Do not crash when compiling recursive ASTs (GH-20594) When compiling an AST object with a direct / indirect reference cycles, on the conversion phase because of exceeding amount of calls, a segfault was raised. This patch adds recursion guards to places for preventing user inputs to not to crash AST but instead raise a RecursionError.
2021-06-03 17:01:02 -03:00
goto failed;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
res = obj2ast_string(state, tmp, &tag, arena);
Use static inline function Py_EnterRecursiveCall() (#91988) Currently, calling Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() may use a function call or a static inline function call, depending if the internal pycore_ceval.h header file is included or not. Use a different name for the static inline function to ensure that the static inline function is always used in Python internals for best performance. Similar approach than PyThreadState_GET() (function call) and _PyThreadState_GET() (static inline function). * Rename _Py_EnterRecursiveCall() to _Py_EnterRecursiveCallTstate() * Rename _Py_LeaveRecursiveCall() to _Py_LeaveRecursiveCallTstate() * pycore_ceval.h: Rename Py_EnterRecursiveCall() to _Py_EnterRecursiveCall() and Py_LeaveRecursiveCall() and _Py_LeaveRecursiveCall()
2022-05-04 08:30:23 -03:00
_Py_LeaveRecursiveCall();
bpo-36878: Track extra text added to 'type: ignore' in the AST (GH-13479) GH-13238 made extra text after a # type: ignore accepted by the parser. This finishes the job and actually plumbs the extra text through the parser and makes it available in the AST.
2019-05-22 11:54:20 -03:00
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
bpo-43244: Rename pycore_ast.h functions to _PyAST_xxx() (GH-25252) Rename AST functions of pycore_ast.h to use the "_PyAST_" prefix. Remove macros creating aliases without prefix. For example, Module() becomes _PyAST_Module(). Update Grammar/python.gram to use _PyAST_xxx() functions.
2021-04-07 16:34:22 -03:00
*out = _PyAST_TypeIgnore(lineno, tag, arena);
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
if (*out == NULL) goto failed;
return 0;
}
PyErr_Format(PyExc_TypeError, "expected some sort of type_ignore, but got %R", obj);
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
bpo-35766: Merge typed_ast back into CPython (GH-11645)
2019-01-31 07:40:27 -04:00
}
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
int
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
obj2ast_type_param(struct ast_state *state, PyObject* obj, type_param_ty* out,
PyArena* arena)
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
{
int isinstance;
PyObject *tmp = NULL;
PyObject *tp;
int lineno;
int col_offset;
int end_lineno;
int end_col_offset;
if (obj == Py_None) {
*out = NULL;
return 0;
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
PyErr_SetString(PyExc_TypeError, "required field \"lineno\" missing from type_param");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'type_param' node")) {
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
goto failed;
}
res = obj2ast_int(state, tmp, &lineno, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
PyErr_SetString(PyExc_TypeError, "required field \"col_offset\" missing from type_param");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'type_param' node")) {
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
goto failed;
}
res = obj2ast_int(state, tmp, &col_offset, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_lineno, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
gh-106145: Make `end_{lineno,col_offset}` required on `type_param` nodes (#106224)
2023-06-30 20:45:08 -03:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"end_lineno\" missing from type_param");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'type_param' node")) {
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
goto failed;
}
res = obj2ast_int(state, tmp, &end_lineno, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->end_col_offset, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
gh-106145: Make `end_{lineno,col_offset}` required on `type_param` nodes (#106224)
2023-06-30 20:45:08 -03:00
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"end_col_offset\" missing from type_param");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
if (_Py_EnterRecursiveCall(" while traversing 'type_param' node")) {
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
goto failed;
}
res = obj2ast_int(state, tmp, &end_col_offset, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
tp = state->TypeVar_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (isinstance) {
identifier name;
expr_ty bound;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
expr_ty default_value;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from TypeVar");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'TypeVar' node")) {
goto failed;
}
res = obj2ast_identifier(state, tmp, &name, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->bound, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
bound = NULL;
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'TypeVar' node")) {
goto failed;
}
res = obj2ast_expr(state, tmp, &bound, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
if (PyObject_GetOptionalAttr(obj, state->default_value, &tmp) < 0) {
return -1;
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
default_value = NULL;
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'TypeVar' node")) {
goto failed;
}
res = obj2ast_expr(state, tmp, &default_value, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_TypeVar(name, bound, default_value, lineno, col_offset,
end_lineno, end_col_offset, arena);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (*out == NULL) goto failed;
return 0;
}
tp = state->ParamSpec_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (isinstance) {
identifier name;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
expr_ty default_value;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from ParamSpec");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'ParamSpec' node")) {
goto failed;
}
res = obj2ast_identifier(state, tmp, &name, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
if (PyObject_GetOptionalAttr(obj, state->default_value, &tmp) < 0) {
return -1;
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
default_value = NULL;
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'ParamSpec' node")) {
goto failed;
}
res = obj2ast_expr(state, tmp, &default_value, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_ParamSpec(name, default_value, lineno, col_offset,
end_lineno, end_col_offset, arena);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (*out == NULL) goto failed;
return 0;
}
tp = state->TypeVarTuple_type;
isinstance = PyObject_IsInstance(obj, tp);
if (isinstance == -1) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (isinstance) {
identifier name;
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
expr_ty default_value;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
gh-106521: Remove _PyObject_LookupAttr() function (GH-106642)
2023-07-12 02:57:10 -03:00
if (PyObject_GetOptionalAttr(obj, state->name, &tmp) < 0) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
if (tmp == NULL) {
PyErr_SetString(PyExc_TypeError, "required field \"name\" missing from TypeVarTuple");
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'TypeVarTuple' node")) {
goto failed;
}
res = obj2ast_identifier(state, tmp, &name, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
gh-116126: Implement PEP 696 (#116129) Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com> Co-authored-by: Bénédikt Tran <10796600+picnixz@users.noreply.github.com> Co-authored-by: Shantanu <12621235+hauntsaninja@users.noreply.github.com>
2024-05-03 10:17:32 -03:00
if (PyObject_GetOptionalAttr(obj, state->default_value, &tmp) < 0) {
return -1;
}
if (tmp == NULL || tmp == Py_None) {
Py_CLEAR(tmp);
default_value = NULL;
}
else {
int res;
if (_Py_EnterRecursiveCall(" while traversing 'TypeVarTuple' node")) {
goto failed;
}
res = obj2ast_expr(state, tmp, &default_value, arena);
_Py_LeaveRecursiveCall();
if (res != 0) goto failed;
Py_CLEAR(tmp);
}
*out = _PyAST_TypeVarTuple(name, default_value, lineno, col_offset,
end_lineno, end_col_offset, arena);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (*out == NULL) goto failed;
return 0;
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
PyErr_Format(PyExc_TypeError, "expected some sort of type_param, but got %R", obj);
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
failed:
Py_XDECREF(tmp);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return -1;
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
}
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
static int
astmodule_exec(PyObject *m)
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
{
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
struct ast_state *state = get_ast_state();
if (state == NULL) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-41194: The _ast module cannot be loaded more than once (GH-21290) Fix a crash in the _ast module: it can no longer be loaded more than once. It now uses a global state rather than a module state. * Move _ast module state: use a global state instead. * Set _astmodule.m_size to -1, so the extension cannot be loaded more than once.
2020-07-03 09:15:53 -03:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "AST", state->AST_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
if (PyModule_AddIntMacro(m, PyCF_ALLOW_TOP_LEVEL_AWAIT) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
if (PyModule_AddIntMacro(m, PyCF_ONLY_AST) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
if (PyModule_AddIntMacro(m, PyCF_TYPE_COMMENTS) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
gh-108113: Make it possible to create an optimized AST (#108154)
2023-08-21 13:31:30 -03:00
if (PyModule_AddIntMacro(m, PyCF_OPTIMIZED_AST) < 0) {
return -1;
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "mod", state->mod_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Module", state->Module_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Interactive", state->Interactive_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Expression", state->Expression_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "FunctionType", state->FunctionType_type) < 0)
{
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "stmt", state->stmt_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "FunctionDef", state->FunctionDef_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "AsyncFunctionDef",
state->AsyncFunctionDef_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "ClassDef", state->ClassDef_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Return", state->Return_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Delete", state->Delete_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Assign", state->Assign_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
if (PyModule_AddObjectRef(m, "TypeAlias", state->TypeAlias_type) < 0) {
return -1;
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "AugAssign", state->AugAssign_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "AnnAssign", state->AnnAssign_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "For", state->For_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "AsyncFor", state->AsyncFor_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "While", state->While_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "If", state->If_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "With", state->With_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "AsyncWith", state->AsyncWith_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (PyModule_AddObjectRef(m, "Match", state->Match_type) < 0) {
return -1;
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Raise", state->Raise_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Try", state->Try_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-45292: [PEP-654] add except* (GH-29581)
2021-12-14 12:48:15 -04:00
if (PyModule_AddObjectRef(m, "TryStar", state->TryStar_type) < 0) {
return -1;
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Assert", state->Assert_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Import", state->Import_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "ImportFrom", state->ImportFrom_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Global", state->Global_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Nonlocal", state->Nonlocal_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Expr", state->Expr_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Pass", state->Pass_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Break", state->Break_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Continue", state->Continue_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "expr", state->expr_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "BoolOp", state->BoolOp_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "NamedExpr", state->NamedExpr_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "BinOp", state->BinOp_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "UnaryOp", state->UnaryOp_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Lambda", state->Lambda_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "IfExp", state->IfExp_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Dict", state->Dict_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Set", state->Set_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "ListComp", state->ListComp_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "SetComp", state->SetComp_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "DictComp", state->DictComp_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "GeneratorExp", state->GeneratorExp_type) < 0)
{
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Await", state->Await_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Yield", state->Yield_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "YieldFrom", state->YieldFrom_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Compare", state->Compare_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Call", state->Call_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "FormattedValue", state->FormattedValue_type)
< 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "JoinedStr", state->JoinedStr_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Constant", state->Constant_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Attribute", state->Attribute_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Subscript", state->Subscript_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Starred", state->Starred_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Name", state->Name_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "List", state->List_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Tuple", state->Tuple_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Slice", state->Slice_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-34822: Simplify AST for subscription. (GH-9605) * Remove the slice type. * Make Slice a kind of the expr type instead of the slice type. * Replace ExtSlice(slices) with Tuple(slices, Load()). * Replace Index(value) with a value itself. All non-terminal nodes in AST for expressions are now of the expr type.
2020-03-10 13:52:34 -03:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "expr_context", state->expr_context_type) < 0)
{
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Load", state->Load_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Store", state->Store_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Del", state->Del_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "boolop", state->boolop_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "And", state->And_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Or", state->Or_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "operator", state->operator_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Add", state->Add_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Sub", state->Sub_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Mult", state->Mult_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "MatMult", state->MatMult_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Div", state->Div_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Mod", state->Mod_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Pow", state->Pow_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "LShift", state->LShift_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "RShift", state->RShift_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "BitOr", state->BitOr_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "BitXor", state->BitXor_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "BitAnd", state->BitAnd_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "FloorDiv", state->FloorDiv_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "unaryop", state->unaryop_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Invert", state->Invert_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Not", state->Not_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "UAdd", state->UAdd_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "USub", state->USub_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "cmpop", state->cmpop_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Eq", state->Eq_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "NotEq", state->NotEq_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Lt", state->Lt_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "LtE", state->LtE_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Gt", state->Gt_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "GtE", state->GtE_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "Is", state->Is_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "IsNot", state->IsNot_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "In", state->In_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "NotIn", state->NotIn_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "comprehension", state->comprehension_type) <
0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "excepthandler", state->excepthandler_type) <
0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "ExceptHandler", state->ExceptHandler_type) <
0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "arguments", state->arguments_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "arg", state->arg_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "keyword", state->keyword_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "alias", state->alias_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "withitem", state->withitem_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-42128: Structural Pattern Matching (PEP 634) (GH-22917) Co-authored-by: Guido van Rossum <guido@python.org> Co-authored-by: Talin <viridia@gmail.com> Co-authored-by: Pablo Galindo <pablogsal@gmail.com>
2021-02-26 18:51:55 -04:00
if (PyModule_AddObjectRef(m, "match_case", state->match_case_type) < 0) {
return -1;
}
bpo-43892: Make match patterns explicit in the AST (GH-25585) Co-authored-by: Brandt Bucher <brandtbucher@gmail.com>
2021-04-29 02:58:44 -03:00
if (PyModule_AddObjectRef(m, "pattern", state->pattern_type) < 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "MatchValue", state->MatchValue_type) < 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "MatchSingleton", state->MatchSingleton_type)
< 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "MatchSequence", state->MatchSequence_type) <
0) {
return -1;
}
if (PyModule_AddObjectRef(m, "MatchMapping", state->MatchMapping_type) < 0)
{
return -1;
}
if (PyModule_AddObjectRef(m, "MatchClass", state->MatchClass_type) < 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "MatchStar", state->MatchStar_type) < 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "MatchAs", state->MatchAs_type) < 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "MatchOr", state->MatchOr_type) < 0) {
return -1;
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "type_ignore", state->type_ignore_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
bpo-1635741: _ast uses PyModule_AddObjectRef() (GH-23146) Replace PyModule_AddObject() with PyModule_AddObjectRef() in the _ast module (Python-ast.c).
2020-11-04 11:37:07 -04:00
if (PyModule_AddObjectRef(m, "TypeIgnore", state->TypeIgnore_type) < 0) {
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return -1;
bpo-38823: Fix refleaks in _ast initialization error path (GH-17276)
2020-02-06 10:45:46 -04:00
}
gh-104656: Rename typeparams AST node to type_params (#104657)
2023-05-22 01:25:09 -03:00
if (PyModule_AddObjectRef(m, "type_param", state->type_param_type) < 0) {
gh-103763: Implement PEP 695 (#103764) This implements PEP 695, Type Parameter Syntax. It adds support for: - Generic functions (def func[T](): ...) - Generic classes (class X[T](): ...) - Type aliases (type X = ...) - New scoping when the new syntax is used within a class body - Compiler and interpreter changes to support the new syntax and scoping rules Co-authored-by: Marc Mueller <30130371+cdce8p@users.noreply.github.com> Co-authored-by: Eric Traut <eric@traut.com> Co-authored-by: Larry Hastings <larry@hastings.org> Co-authored-by: Alex Waygood <Alex.Waygood@Gmail.com>
2023-05-16 00:36:23 -03:00
return -1;
}
if (PyModule_AddObjectRef(m, "TypeVar", state->TypeVar_type) < 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "ParamSpec", state->ParamSpec_type) < 0) {
return -1;
}
if (PyModule_AddObjectRef(m, "TypeVarTuple", state->TypeVarTuple_type) < 0)
{
return -1;
}
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
return 0;
}
bpo-41194: The _ast module cannot be loaded more than once (GH-21290) Fix a crash in the _ast module: it can no longer be loaded more than once. It now uses a global state rather than a module state. * Move _ast module state: use a global state instead. * Set _astmodule.m_size to -1, so the extension cannot be loaded more than once.
2020-07-03 09:15:53 -03:00
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
static PyModuleDef_Slot astmodule_slots[] = {
{Py_mod_exec, astmodule_exec},
gh-99113: Add Py_MOD_PER_INTERPRETER_GIL_SUPPORTED (gh-104205) Here we are doing no more than adding the value for Py_mod_multiple_interpreters and using it for stdlib modules. We will start checking for it in gh-104206 (once PyInterpreterState.ceval.own_gil is added in gh-104204).
2023-05-05 18:11:27 -03:00
{Py_mod_multiple_interpreters, Py_MOD_PER_INTERPRETER_GIL_SUPPORTED},
gh-116322: Add Py_mod_gil module slot (#116882) This PR adds the ability to enable the GIL if it was disabled at interpreter startup, and modifies the multi-phase module initialization path to enable the GIL when loading a module, unless that module's spec includes a slot indicating it can run safely without the GIL. PEP 703 called the constant for the slot `Py_mod_gil_not_used`; I went with `Py_MOD_GIL_NOT_USED` for consistency with gh-104148. A warning will be issued up to once per interpreter for the first GIL-using module that is loaded. If `-v` is given, a shorter message will be printed to stderr every time a GIL-using module is loaded (including the first one that issues a warning).
2024-05-03 12:30:55 -03:00
{Py_mod_gil, Py_MOD_GIL_NOT_USED},
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
{0, NULL}
};
static struct PyModuleDef _astmodule = {
PyModuleDef_HEAD_INIT,
.m_name = "_ast",
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
// The _ast module uses a per-interpreter state (PyInterpreterState.ast)
bpo-41631: _ast module uses again a global state (#21961) Partially revert commit ac46eb4ad6662cf6d771b20d8963658b2186c48c: "bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957)". Using a module state per module instance is causing subtle practical problems. For example, the Mercurial project replaces the __import__() function to implement lazy import, whereas Python expected that "import _ast" always return a fully initialized _ast module. Add _PyAST_Fini() to clear the state at exit. The _ast module has no state (set _astmodule.m_size to 0). Remove astmodule_traverse(), astmodule_clear() and astmodule_free() functions.
2020-09-15 13:03:34 -03:00
.m_size = 0,
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
.m_slots = astmodule_slots,
};
PyMODINIT_FUNC
PyInit__ast(void)
{
return PyModuleDef_Init(&_astmodule);
Create _ast module. Cleanup Python-ast.c generation.
2006-02-27 11:23:19 -04:00
}
Generate code to recursively copy an AST into a tree of Python objects. Expose this through compile().
2006-02-26 15:42:26 -04:00
PyObject* PyAST_mod2obj(mod_ty t)
{
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
struct ast_state *state = get_ast_state();
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
if (state == NULL) {
Issue #18408: Fix Python-ast.c: handle init_types() failure (ex: MemoryError)
2013-07-16 19:17:15 -03:00
return NULL;
bpo-41194: The _ast module cannot be loaded more than once (GH-21290) Fix a crash in the _ast module: it can no longer be loaded more than once. It now uses a global state rather than a module state. * Move _ast module state: use a global state instead. * Set _astmodule.m_size to -1, so the extension cannot be loaded more than once.
2020-07-03 09:15:53 -03:00
}
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
int starting_recursion_depth;
/* Be careful here to prevent overflow. */
PyThreadState *tstate = _PyThreadState_GET();
if (!tstate) {
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
struct validator vstate;
GH-113655: Lower the C recursion limit on various platforms (GH-113944)
2024-01-16 05:32:01 -04:00
vstate.recursion_limit = Py_C_RECURSION_LIMIT;
GH-91079: Rename C_RECURSION_LIMIT to Py_C_RECURSION_LIMIT (#108507) Symbols of the C API should be prefixed by "Py_" to avoid conflict with existing names in 3rd party C extensions on "#include <Python.h>". test.pythoninfo now logs Py_C_RECURSION_LIMIT constant and other _testcapi and _testinternalcapi constants.
2023-09-08 06:48:28 -03:00
int recursion_depth = Py_C_RECURSION_LIMIT - tstate->c_recursion_remaining;
GH-113655: Lower the C recursion limit on various platforms (GH-113944)
2024-01-16 05:32:01 -04:00
starting_recursion_depth = recursion_depth;
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
vstate.recursion_depth = starting_recursion_depth;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
PyObject *result = ast2obj_mod(state, &vstate, t);
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
/* Check that the recursion depth counting balanced correctly */
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
if (result && vstate.recursion_depth != starting_recursion_depth) {
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
PyErr_Format(PyExc_SystemError,
"AST constructor recursion depth mismatch (before=%d, after=%d)",
gh-106905: Use separate structs to track recursion depth in each PyAST_mod2obj call. (GH-113035) Co-authored-by: Gregory P. Smith [Google LLC] <greg@krypto.org>
2023-12-25 13:36:59 -04:00
starting_recursion_depth, vstate.recursion_depth);
gh-111956: Add thread-safe one-time initialization. (gh-111960)
2023-11-16 15:19:54 -04:00
return NULL;
gh-95185: Check recursion depth in the AST constructor (#95186) Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
2022-07-24 11:58:52 -03:00
}
return result;
Merge ast-branch to head This change implements a new bytecode compiler, based on a transformation of the parse tree to an abstract syntax defined in Parser/Python.asdl. The compiler implementation is not complete, but it is in stable enough shape to run the entire test suite excepting two disabled tests.
2005-10-20 16:59:25 -03:00
}
Make identifiers str (not str8) objects throughout. This affects the parser, various object implementations, and all places that put identifiers into C string literals. In testing, a number of crashes occurred as code would fail when the recursion limit was reached (such as the Unicode interning dictionary having key/value pairs where key is not value). To solve these, I added an overflowed flag, which allows for 50 more recursions after the limit was reached and the exception was raised, and a recursion_critical flag, which indicates that recursion absolutely must be allowed, i.e. that a certain call must not cause a stack overflow exception. There are still some places where both str and str8 are accepted as identifiers; these should eventually be removed.
2007-06-10 06:51:05 -03:00
Merged revisions 62039-62042 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62039 | georg.brandl | 2008-03-29 06:24:23 -0700 (Sat, 29 Mar 2008) | 3 lines Properly check for consistency with the third argument of compile() when compiling an AST node. ........ r62040 | amaury.forgeotdarc | 2008-03-29 06:47:05 -0700 (Sat, 29 Mar 2008) | 5 lines The buildbot "x86 W2k8 trunk" seems to hang in test_socket. http://www.python.org/dev/buildbot/trunk/x86%20W2k8%20trunk/builds/255/step-test/0 Temporarily increase verbosity of this test. ........ r62042 | amaury.forgeotdarc | 2008-03-29 07:53:05 -0700 (Sat, 29 Mar 2008) | 3 lines Still investigating on the hanging test_socket. the test itself doesn't do anything on windows, focus on setUp and tearDown. ........
2008-03-31 01:20:05 -03:00
/* mode is 0 for "exec", 1 for "eval" and 2 for "single" input */
mod_ty PyAST_obj2mod(PyObject* ast, PyArena* arena, int mode)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
{
bpo-38083: Minor improvements in asdl_c.py and Python-ast.c. (GH-15824) * Use the const qualifier for constant C strings. * Intern field and attribute names. * Temporary incref a borrowed reference to a list item.
2019-09-10 07:02:30 -03:00
const char * const req_name[] = {"Module", "Expression", "Interactive"};
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
int isinstance;
merge 3.3 (#20588)
2014-02-10 23:41:40 -04:00
bpo-36842: Implement PEP 578 (GH-12613) Adds sys.audit, sys.addaudithook, io.open_code, and associated C APIs.
2019-05-23 12:45:22 -03:00
if (PySys_Audit("compile", "OO", ast, Py_None) < 0) {
return NULL;
}
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
struct ast_state *state = get_ast_state();
if (state == NULL) {
return NULL;
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
PyObject *req_type[3];
req_type[0] = state->Module_type;
req_type[1] = state->Expression_type;
req_type[2] = state->Interactive_type;
merge 3.3 (#20588)
2014-02-10 23:41:40 -04:00
bpo-35766 follow-up: Kill half-support for FunctionType in PyAST_obj2mod (#11714) See https://github.com/python/cpython/pull/11645/files/229874c612df868e7ae3e997e159915f49d16542#r252631862 https://bugs.python.org/issue35766
2019-02-01 15:37:34 -04:00
assert(0 <= mode && mode <= 2);
Merged revisions 62039-62042 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62039 | georg.brandl | 2008-03-29 06:24:23 -0700 (Sat, 29 Mar 2008) | 3 lines Properly check for consistency with the third argument of compile() when compiling an AST node. ........ r62040 | amaury.forgeotdarc | 2008-03-29 06:47:05 -0700 (Sat, 29 Mar 2008) | 5 lines The buildbot "x86 W2k8 trunk" seems to hang in test_socket. http://www.python.org/dev/buildbot/trunk/x86%20W2k8%20trunk/builds/255/step-test/0 Temporarily increase verbosity of this test. ........ r62042 | amaury.forgeotdarc | 2008-03-29 07:53:05 -0700 (Sat, 29 Mar 2008) | 3 lines Still investigating on the hanging test_socket. the test itself doesn't do anything on windows, focus on setUp and tearDown. ........
2008-03-31 01:20:05 -03:00
regenerate Python-ast.c
2009-12-12 21:24:58 -04:00
isinstance = PyObject_IsInstance(ast, req_type[mode]);
if (isinstance == -1)
return NULL;
if (!isinstance) {
Merged revisions 62039-62042 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62039 | georg.brandl | 2008-03-29 06:24:23 -0700 (Sat, 29 Mar 2008) | 3 lines Properly check for consistency with the third argument of compile() when compiling an AST node. ........ r62040 | amaury.forgeotdarc | 2008-03-29 06:47:05 -0700 (Sat, 29 Mar 2008) | 5 lines The buildbot "x86 W2k8 trunk" seems to hang in test_socket. http://www.python.org/dev/buildbot/trunk/x86%20W2k8%20trunk/builds/255/step-test/0 Temporarily increase verbosity of this test. ........ r62042 | amaury.forgeotdarc | 2008-03-29 07:53:05 -0700 (Sat, 29 Mar 2008) | 3 lines Still investigating on the hanging test_socket. the test itself doesn't do anything on windows, focus on setUp and tearDown. ........
2008-03-31 01:20:05 -03:00
PyErr_Format(PyExc_TypeError, "expected %s node, got %.400s",
bpo-38113: Update the Python-ast.c generator to PEP384 (gh-15957) Summary: This mostly migrates Python-ast.c to PEP384 and removes all statics from the whole file. This modifies the generator itself that generates the Python-ast.c. It leaves in the usage of _PyObject_LookupAttr even though it's not fully PEP384 compatible (this could always be shimmed in by anyone who needs it).
2019-09-11 14:16:34 -03:00
req_name[mode], _PyType_Name(Py_TYPE(ast)));
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
return NULL;
}
bpo-38425: Fix ‘res’ may be used uninitialized warning (GH-16688)
2019-10-10 04:41:26 -03:00
mod_ty res = NULL;
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
if (obj2ast_mod(state, ast, &res, arena) != 0)
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
return NULL;
else
return res;
}
int PyAST_Check(PyObject* obj)
{
bpo-41796: Make _ast module state per interpreter (GH-23024) The ast module internal state is now per interpreter. * Rename "astmodulestate" to "struct ast_state" * Add pycore_ast.h internal header: the ast_state structure is now declared in pycore_ast.h. * Add PyInterpreterState.ast (struct ast_state) * Remove get_ast_state() * Rename get_global_ast_state() to get_ast_state() * PyAST_obj2mod() now handles get_ast_state() failures
2020-11-02 17:03:28 -04:00
struct ast_state *state = get_ast_state();
bpo-41194: Convert _ast extension to PEP 489 (GH-21293) Convert the _ast extension module to PEP 489 "Multiphase initialization". Replace the global _ast state with a module state.
2020-07-03 15:01:46 -03:00
if (state == NULL) {
Issue #18408: Fix Python-ast.c: handle init_types() failure (ex: MemoryError)
2013-07-16 19:17:15 -03:00
return -1;
bpo-41194: The _ast module cannot be loaded more than once (GH-21290) Fix a crash in the _ast module: it can no longer be loaded more than once. It now uses a global state rather than a module state. * Move _ast module state: use a global state instead. * Set _astmodule.m_size to -1, so the extension cannot be loaded more than once.
2020-07-03 09:15:53 -03:00
}
bpo-41194: Pass module state in Python-ast.c (GH-21284) Rework asdl_c.py to pass the module state to functions in Python-ast.c, instead of using astmodulestate_global. Handle also PyState_AddModule() failure in init_types().
2020-07-03 06:35:37 -03:00
return PyObject_IsInstance(obj, state->AST_type);
Merged revisions 62004 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r62004 | georg.brandl | 2008-03-28 13:11:56 +0100 (Fr, 28 Mär 2008) | 4 lines Patch #1810 by Thomas Lee, reviewed by myself: allow compiling Python AST objects into code objects in compile(). ........
2008-03-30 17:03:44 -03:00
}
Make identifiers str (not str8) objects throughout. This affects the parser, various object implementations, and all places that put identifiers into C string literals. In testing, a number of crashes occurred as code would fail when the recursion limit was reached (such as the Unicode interning dictionary having key/value pairs where key is not value). To solve these, I added an overflowed flag, which allows for 50 more recursions after the limit was reached and the exception was raised, and a recursion_critical flag, which indicates that recursion absolutely must be allowed, i.e. that a certain call must not cause a stack overflow exception. There are still some places where both str and str8 are accepted as identifiers; these should eventually be removed.
2007-06-10 06:51:05 -03:00