Mailman 3 May 2020 - Python-checkins

(no subject)
by Furkan Önder 01 May '20

01 May '20

To: python-checkins(a)python.org Subject: bpo-40462: fix variable and function names (GH-19832) Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 https://github.com/python/cpython/commit/719e14d2837520c18398a3e22a36f20c1f… 6edf commit: 719e14d2837520c18398a3e22a36f20c1fe76edf branch: master author: Furkan =C3=96nder <furkantahaonder(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T05:49:35-07:00 summary: bpo-40462: fix variable and function names (GH-19832) Automerge-Triggered-By: @vstinner files: M Lib/test/mock_socket.py M Lib/test/test_frame.py M Lib/unittest/test/test_program.py diff --git a/Lib/test/mock_socket.py b/Lib/test/mock_socket.py index b28c4732cc3c2..cda4db25cba59 100644 --- a/Lib/test/mock_socket.py +++ b/Lib/test/mock_socket.py @@ -91,7 +91,7 @@ def makefile(self, mode=3D'r', bufsize=3D-1): handle =3D MockFile(self.lines) return handle =20 - def sendall(self, buffer, flags=3DNone): + def sendall(self, data, flags=3DNone): self.last =3D data self.output.append(data) return len(data) diff --git a/Lib/test/test_frame.py b/Lib/test/test_frame.py index d6aa2834cbc28..a8696f011f945 100644 --- a/Lib/test/test_frame.py +++ b/Lib/test/test_frame.py @@ -50,7 +50,7 @@ def g(): nonlocal endly try: yield - inner() + self.inner() finally: endly =3D True gen =3D g() diff --git a/Lib/unittest/test/test_program.py b/Lib/unittest/test/test_progr= am.py index 4a62ae1b11306..eef82ff937ab7 100644 --- a/Lib/unittest/test/test_program.py +++ b/Lib/unittest/test/test_program.py @@ -188,8 +188,6 @@ def testBufferCatchFailfast(self): program =3D self.program for arg, attr in (('buffer', 'buffer'), ('failfast', 'failfast'), ('catch', 'catchbreak')): - if attr =3D=3D 'catch' and not hasInstallHandler: - continue =20 setattr(program, attr, None) program.parseArgs([None])

1 0

bpo-32494: Use gdbm_count for dbm_length if possible (GH-19814)
by Dong-hee Na 01 May '20

01 May '20

https://github.com/python/cpython/commit/8727664557cd44dcd00612ccba816942e8… commit: 8727664557cd44dcd00612ccba816942e8f885ab branch: master author: Dong-hee Na <donghee.na92(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T14:15:35+02:00 summary: bpo-32494: Use gdbm_count for dbm_length if possible (GH-19814) files: A Misc/NEWS.d/next/Library/2020-04-30-22-25-08.bpo-32494.1xaU5l.rst M Modules/_gdbmmodule.c diff --git a/Misc/NEWS.d/next/Library/2020-04-30-22-25-08.bpo-32494.1xaU5l.rst b/Misc/NEWS.d/next/Library/2020-04-30-22-25-08.bpo-32494.1xaU5l.rst new file mode 100644 index 0000000000000..3989700c5cd83 --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-30-22-25-08.bpo-32494.1xaU5l.rst @@ -0,0 +1,2 @@ +Update :mod:`dbm.gnu` to use gdbm_count if possible when calling +:func:`len`. Patch by Dong-hee Na. diff --git a/Modules/_gdbmmodule.c b/Modules/_gdbmmodule.c index 7a9649b54119b..dd4c6b16f745c 100644 --- a/Modules/_gdbmmodule.c +++ b/Modules/_gdbmmodule.c @@ -36,7 +36,7 @@ values() methods are not supported."); typedef struct { PyObject_HEAD - int di_size; /* -1 means recompute */ + Py_ssize_t di_size; /* -1 means recompute */ GDBM_FILE di_dbm; } dbmobject; @@ -102,19 +102,39 @@ dbm_length(dbmobject *dp) return -1; } if (dp->di_size < 0) { +#if GDBM_VERSION_MAJOR >= 1 && GDBM_VERSION_MINOR >= 11 + errno = 0; + gdbm_count_t count; + if (gdbm_count(dp->di_dbm, &count) == -1) { + if (errno != 0) { + PyErr_SetFromErrno(DbmError); + } + else { + PyErr_SetString(DbmError, gdbm_strerror(gdbm_errno)); + } + return -1; + } + if (count > PY_SSIZE_T_MAX) { + PyErr_SetString(PyExc_OverflowError, "count exceeds PY_SSIZE_T_MAX"); + return -1; + } + dp->di_size = count; +#else datum key,okey; - int size; okey.dsize=0; okey.dptr=NULL; - size = 0; - for (key=gdbm_firstkey(dp->di_dbm); key.dptr; + Py_ssize_t size = 0; + for (key = gdbm_firstkey(dp->di_dbm); key.dptr; key = gdbm_nextkey(dp->di_dbm,okey)) { size++; - if(okey.dsize) free(okey.dptr); + if (okey.dsize) { + free(okey.dptr); + } okey=key; } dp->di_size = size; +#endif } return dp->di_size; }

1 0

bpo-40334: Simplify type handling in the PEG c_generator (GH-19818)
by Pablo Galindo 01 May '20

01 May '20

https://github.com/python/cpython/commit/b796b3fb48283412d3caf52323c69690e5… commit: b796b3fb48283412d3caf52323c69690e5818d3d branch: master author: Pablo Galindo <Pablogsal(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-05-01T12:32:26+01:00 summary: bpo-40334: Simplify type handling in the PEG c_generator (GH-19818) files: M Parser/pegen/parse.c M Tools/peg_generator/pegen/c_generator.py M Tools/peg_generator/pegen/parser_generator.py diff --git a/Parser/pegen/parse.c b/Parser/pegen/parse.c index 9c941ca1ee2ec..2be5e384ae532 100644 --- a/Parser/pegen/parse.c +++ b/Parser/pegen/parse.c @@ -676,7 +676,7 @@ file_rule(Parser *p) int mark = p->mark; { // statements? $ void *a; - void *endmarker_var; + Token * endmarker_var; if ( (a = statements_rule(p), 1) && @@ -738,7 +738,7 @@ eval_rule(Parser *p) { // expressions NEWLINE* $ asdl_seq * _loop0_1_var; expr_ty a; - void *endmarker_var; + Token * endmarker_var; if ( (a = expressions_rule(p)) && @@ -774,10 +774,10 @@ func_type_rule(Parser *p) asdl_seq * _loop0_2_var; void *a; expr_ty b; - void *endmarker_var; - void *literal; - void *literal_1; - void *literal_2; + Token * endmarker_var; + Token * literal; + Token * literal_1; + Token * literal_2; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -850,10 +850,10 @@ type_expressions_rule(Parser *p) asdl_seq * a; expr_ty b; expr_ty c; - void *literal; - void *literal_1; - void *literal_2; - void *literal_3; + Token * literal; + Token * literal_1; + Token * literal_2; + Token * literal_3; if ( (a = _gather_3_rule(p)) && @@ -882,8 +882,8 @@ type_expressions_rule(Parser *p) { // ','.expression+ ',' '*' expression asdl_seq * a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = _gather_5_rule(p)) && @@ -906,8 +906,8 @@ type_expressions_rule(Parser *p) { // ','.expression+ ',' '**' expression asdl_seq * a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = _gather_7_rule(p)) && @@ -1031,7 +1031,7 @@ statement_newline_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // compound_stmt NEWLINE stmt_ty a; - void *newline_var; + Token * newline_var; if ( (a = compound_stmt_rule(p)) && @@ -1059,7 +1059,7 @@ statement_newline_rule(Parser *p) p->mark = mark; } { // NEWLINE - void *newline_var; + Token * newline_var; if ( (newline_var = _PyPegen_expect_token(p, NEWLINE)) ) @@ -1082,7 +1082,7 @@ statement_newline_rule(Parser *p) p->mark = mark; } { // $ - void *endmarker_var; + Token * endmarker_var; if ( (endmarker_var = _PyPegen_expect_token(p, ENDMARKER)) ) @@ -1112,7 +1112,7 @@ simple_stmt_rule(Parser *p) int mark = p->mark; { // small_stmt !';' NEWLINE stmt_ty a; - void *newline_var; + Token * newline_var; if ( (a = small_stmt_rule(p)) && @@ -1132,7 +1132,7 @@ simple_stmt_rule(Parser *p) } { // ';'.small_stmt+ ';'? NEWLINE asdl_seq * a; - void *newline_var; + Token * newline_var; void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( @@ -1263,7 +1263,7 @@ small_stmt_rule(Parser *p) p->mark = mark; } { // 'pass' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 502)) ) @@ -1325,7 +1325,7 @@ small_stmt_rule(Parser *p) p->mark = mark; } { // 'break' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 506)) ) @@ -1348,7 +1348,7 @@ small_stmt_rule(Parser *p) p->mark = mark; } { // 'continue' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 507)) ) @@ -1540,7 +1540,7 @@ assignment_rule(Parser *p) expr_ty a; expr_ty b; void *c; - void *literal; + Token * literal; if ( (a = _PyPegen_name_token(p)) && @@ -1572,7 +1572,7 @@ assignment_rule(Parser *p) void *a; expr_ty b; void *c; - void *literal; + Token * literal; if ( (a = _tmp_20_rule(p)) && @@ -1697,7 +1697,7 @@ augassign_rule(Parser *p) AugOperator* res = NULL; int mark = p->mark; { // '+=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 36)) ) @@ -1712,7 +1712,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '-=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 37)) ) @@ -1727,7 +1727,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '*=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 38)) ) @@ -1742,7 +1742,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '@=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 50)) ) @@ -1757,7 +1757,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '/=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 39)) ) @@ -1772,7 +1772,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '%=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 40)) ) @@ -1787,7 +1787,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '&=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 41)) ) @@ -1802,7 +1802,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '|=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 42)) ) @@ -1817,7 +1817,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '^=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 43)) ) @@ -1832,7 +1832,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '<<=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 44)) ) @@ -1847,7 +1847,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '>>=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 45)) ) @@ -1862,7 +1862,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '**=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 46)) ) @@ -1877,7 +1877,7 @@ augassign_rule(Parser *p) p->mark = mark; } { // '//=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 48)) ) @@ -1915,7 +1915,7 @@ global_stmt_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // 'global' ','.NAME+ asdl_seq * a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 508)) && @@ -1963,7 +1963,7 @@ nonlocal_stmt_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // 'nonlocal' ','.NAME+ asdl_seq * a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 509)) && @@ -2057,7 +2057,7 @@ assert_stmt_rule(Parser *p) { // 'assert' expression [',' expression] expr_ty a; void *b; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 505)) && @@ -2107,7 +2107,7 @@ del_stmt_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // 'del' del_targets asdl_seq* a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 503)) && @@ -2191,7 +2191,7 @@ import_name_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // 'import' dotted_as_names asdl_seq* a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 513)) && @@ -2243,8 +2243,8 @@ import_from_rule(Parser *p) asdl_seq * a; expr_ty b; asdl_seq* c; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (keyword = _PyPegen_expect_token(p, 514)) && @@ -2277,8 +2277,8 @@ import_from_rule(Parser *p) { // 'from' (('.' | '...'))+ 'import' import_from_targets asdl_seq * a; asdl_seq* b; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (keyword = _PyPegen_expect_token(p, 514)) && @@ -2322,8 +2322,8 @@ import_from_targets_rule(Parser *p) int mark = p->mark; { // '(' import_from_as_names ','? ')' asdl_seq* a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( @@ -2357,7 +2357,7 @@ import_from_targets_rule(Parser *p) p->mark = mark; } { // '*' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 16)) ) @@ -2535,7 +2535,7 @@ dotted_name_raw(Parser *p) { // dotted_name '.' NAME expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = dotted_name_rule(p)) && @@ -2592,8 +2592,8 @@ if_stmt_rule(Parser *p) expr_ty a; asdl_seq* b; stmt_ty c; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 510)) && @@ -2627,8 +2627,8 @@ if_stmt_rule(Parser *p) expr_ty a; asdl_seq* b; void *c; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 510)) && @@ -2686,8 +2686,8 @@ elif_stmt_rule(Parser *p) expr_ty a; asdl_seq* b; stmt_ty c; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 515)) && @@ -2721,8 +2721,8 @@ elif_stmt_rule(Parser *p) expr_ty a; asdl_seq* b; void *c; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 515)) && @@ -2768,8 +2768,8 @@ else_block_rule(Parser *p) int mark = p->mark; { // 'else' ':' block asdl_seq* b; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 516)) && @@ -2813,8 +2813,8 @@ while_stmt_rule(Parser *p) expr_ty a; asdl_seq* b; void *c; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 512)) && @@ -2872,9 +2872,9 @@ for_stmt_rule(Parser *p) asdl_seq* b; void *el; expr_ty ex; - void *keyword; - void *keyword_1; - void *literal; + Token * keyword; + Token * keyword_1; + Token * literal; expr_ty t; void *tc; if ( @@ -2913,13 +2913,13 @@ for_stmt_rule(Parser *p) p->mark = mark; } { // ASYNC 'for' star_targets 'in' star_expressions ':' TYPE_COMMENT? block else_block? - void *async_var; + Token * async_var; asdl_seq* b; void *el; expr_ty ex; - void *keyword; - void *keyword_1; - void *literal; + Token * keyword; + Token * keyword_1; + Token * literal; expr_ty t; void *tc; if ( @@ -2988,10 +2988,10 @@ with_stmt_rule(Parser *p) { // 'with' '(' ','.with_item+ ')' ':' block asdl_seq * a; asdl_seq* b; - void *keyword; - void *literal; - void *literal_1; - void *literal_2; + Token * keyword; + Token * literal; + Token * literal_1; + Token * literal_2; if ( (keyword = _PyPegen_expect_token(p, 519)) && @@ -3026,8 +3026,8 @@ with_stmt_rule(Parser *p) { // 'with' ','.with_item+ ':' TYPE_COMMENT? block asdl_seq * a; asdl_seq* b; - void *keyword; - void *literal; + Token * keyword; + Token * literal; void *tc; if ( (keyword = _PyPegen_expect_token(p, 519)) @@ -3060,12 +3060,12 @@ with_stmt_rule(Parser *p) } { // ASYNC 'with' '(' ','.with_item+ ')' ':' block asdl_seq * a; - void *async_var; + Token * async_var; asdl_seq* b; - void *keyword; - void *literal; - void *literal_1; - void *literal_2; + Token * keyword; + Token * literal; + Token * literal_1; + Token * literal_2; if ( (async_var = _PyPegen_expect_token(p, ASYNC)) && @@ -3101,10 +3101,10 @@ with_stmt_rule(Parser *p) } { // ASYNC 'with' ','.with_item+ ':' TYPE_COMMENT? block asdl_seq * a; - void *async_var; + Token * async_var; asdl_seq* b; - void *keyword; - void *literal; + Token * keyword; + Token * literal; void *tc; if ( (async_var = _PyPegen_expect_token(p, ASYNC)) @@ -3196,8 +3196,8 @@ try_stmt_rule(Parser *p) { // 'try' ':' block finally_block asdl_seq* b; asdl_seq* f; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 511)) && @@ -3230,8 +3230,8 @@ try_stmt_rule(Parser *p) void *el; asdl_seq * ex; void *f; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 511)) && @@ -3288,8 +3288,8 @@ except_block_rule(Parser *p) { // 'except' expression ['as' target] ':' block asdl_seq* b; expr_ty e; - void *keyword; - void *literal; + Token * keyword; + Token * literal; void *t; if ( (keyword = _PyPegen_expect_token(p, 520)) @@ -3322,8 +3322,8 @@ except_block_rule(Parser *p) } { // 'except' ':' block asdl_seq* b; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 520)) && @@ -3365,8 +3365,8 @@ finally_block_rule(Parser *p) int mark = p->mark; { // 'finally' ':' block asdl_seq* a; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 521)) && @@ -3408,7 +3408,7 @@ return_stmt_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // 'return' star_expressions? void *a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 500)) && @@ -3457,7 +3457,7 @@ raise_stmt_rule(Parser *p) { // 'raise' expression ['from' expression] expr_ty a; void *b; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 501)) && @@ -3484,7 +3484,7 @@ raise_stmt_rule(Parser *p) p->mark = mark; } { // 'raise' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 501)) ) @@ -3576,10 +3576,10 @@ function_def_raw_rule(Parser *p) { // 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block void *a; asdl_seq* b; - void *keyword; - void *literal; - void *literal_1; - void *literal_2; + Token * keyword; + Token * literal; + Token * literal_1; + Token * literal_2; expr_ty n; void *params; void *tc; @@ -3622,12 +3622,12 @@ function_def_raw_rule(Parser *p) } { // ASYNC 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block void *a; - void *async_var; + Token * async_var; asdl_seq* b; - void *keyword; - void *literal; - void *literal_1; - void *literal_2; + Token * keyword; + Token * literal; + Token * literal_1; + Token * literal_2; expr_ty n; void *params; void *tc; @@ -3688,8 +3688,8 @@ func_type_comment_rule(Parser *p) PyObject* res = NULL; int mark = p->mark; { // NEWLINE TYPE_COMMENT &(NEWLINE INDENT) - void *newline_var; - void *t; + Token * newline_var; + Token * t; if ( (newline_var = _PyPegen_expect_token(p, NEWLINE)) && @@ -3719,7 +3719,7 @@ func_type_comment_rule(Parser *p) p->mark = mark; } { // TYPE_COMMENT - void *type_comment_var; + Token * type_comment_var; if ( (type_comment_var = _PyPegen_expect_token(p, TYPE_COMMENT)) ) @@ -3899,8 +3899,8 @@ slash_no_default_rule(Parser *p) int mark = p->mark; { // param_no_default+ '/' ',' asdl_seq * a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = _loop1_59_rule(p)) && @@ -3920,7 +3920,7 @@ slash_no_default_rule(Parser *p) } { // param_no_default+ '/' &')' asdl_seq * a; - void *literal; + Token * literal; if ( (a = _loop1_60_rule(p)) && @@ -3957,8 +3957,8 @@ slash_with_default_rule(Parser *p) { // param_no_default* param_with_default+ '/' ',' asdl_seq * a; asdl_seq * b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = _loop0_61_rule(p)) && @@ -3981,7 +3981,7 @@ slash_with_default_rule(Parser *p) { // param_no_default* param_with_default+ '/' &')' asdl_seq * a; asdl_seq * b; - void *literal; + Token * literal; if ( (a = _loop0_63_rule(p)) && @@ -4022,7 +4022,7 @@ star_etc_rule(Parser *p) arg_ty a; asdl_seq * b; void *c; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 16)) && @@ -4045,8 +4045,8 @@ star_etc_rule(Parser *p) { // '*' ',' param_maybe_default+ kwds? asdl_seq * b; void *c; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 16)) && @@ -4097,7 +4097,7 @@ kwds_rule(Parser *p) int mark = p->mark; { // '**' param_no_default arg_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 35)) && @@ -4129,7 +4129,7 @@ param_no_default_rule(Parser *p) int mark = p->mark; { // param ',' TYPE_COMMENT? arg_ty a; - void *literal; + Token * literal; void *tc; if ( (a = param_rule(p)) @@ -4185,7 +4185,7 @@ param_with_default_rule(Parser *p) { // param default ',' TYPE_COMMENT? arg_ty a; expr_ty c; - void *literal; + Token * literal; void *tc; if ( (a = param_rule(p)) @@ -4248,7 +4248,7 @@ param_maybe_default_rule(Parser *p) { // param default? ',' TYPE_COMMENT? arg_ty a; void *c; - void *literal; + Token * literal; void *tc; if ( (a = param_rule(p)) @@ -4356,7 +4356,7 @@ annotation_rule(Parser *p) int mark = p->mark; { // ':' expression expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 11)) && @@ -4388,7 +4388,7 @@ default_rule(Parser *p) int mark = p->mark; { // '=' expression expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 22)) && @@ -4502,8 +4502,8 @@ class_def_raw_rule(Parser *p) expr_ty a; void *b; asdl_seq* c; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 523)) && @@ -4551,9 +4551,9 @@ block_rule(Parser *p) int mark = p->mark; { // NEWLINE INDENT statements DEDENT asdl_seq* a; - void *dedent_var; - void *indent_var; - void *newline_var; + Token * dedent_var; + Token * indent_var; + Token * newline_var; if ( (newline_var = _PyPegen_expect_token(p, NEWLINE)) && @@ -4686,7 +4686,7 @@ star_expressions_rule(Parser *p) } { // star_expression ',' expr_ty a; - void *literal; + Token * literal; if ( (a = star_expression_rule(p)) && @@ -4747,7 +4747,7 @@ star_expression_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '*' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 16)) && @@ -4840,7 +4840,7 @@ star_named_expression_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '*' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 16)) && @@ -4900,7 +4900,7 @@ named_expression_rule(Parser *p) { // NAME ':=' expression expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = _PyPegen_name_token(p)) && @@ -5040,7 +5040,7 @@ expressions_rule(Parser *p) } { // expression ',' expr_ty a; - void *literal; + Token * literal; if ( (a = expression_rule(p)) && @@ -5103,8 +5103,8 @@ expression_rule(Parser *p) expr_ty a; expr_ty b; expr_ty c; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (a = disjunction_rule(p)) && @@ -5182,8 +5182,8 @@ lambdef_rule(Parser *p) { // 'lambda' lambda_parameters? ':' expression void *a; expr_ty b; - void *keyword; - void *literal; + Token * keyword; + Token * literal; if ( (keyword = _PyPegen_expect_token(p, 524)) && @@ -5345,8 +5345,8 @@ lambda_slash_without_default_rule(Parser *p) int mark = p->mark; { // lambda_plain_names ',' '/' asdl_seq* a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = lambda_plain_names_rule(p)) && @@ -5381,8 +5381,8 @@ lambda_slash_with_default_rule(Parser *p) { // [lambda_plain_names ','] lambda_names_with_default ',' '/' void *a; asdl_seq* b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = _tmp_83_rule(p), 1) && @@ -5423,7 +5423,7 @@ lambda_star_etc_rule(Parser *p) arg_ty a; asdl_seq * b; void *c; - void *literal; + Token * literal; void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( @@ -5450,7 +5450,7 @@ lambda_star_etc_rule(Parser *p) { // '*' lambda_name_with_optional_default+ [',' lambda_kwds] ','? asdl_seq * b; void *c; - void *literal; + Token * literal; void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( @@ -5508,7 +5508,7 @@ lambda_name_with_optional_default_rule(Parser *p) { // ',' lambda_plain_name ['=' expression] arg_ty a; void *b; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && @@ -5571,7 +5571,7 @@ lambda_name_with_default_rule(Parser *p) int mark = p->mark; { // lambda_plain_name '=' expression expr_ty e; - void *literal; + Token * literal; arg_ty n; if ( (n = lambda_plain_name_rule(p)) @@ -5680,7 +5680,7 @@ lambda_kwds_rule(Parser *p) int mark = p->mark; { // '**' lambda_plain_name arg_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 35)) && @@ -5846,7 +5846,7 @@ inversion_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // 'not' inversion expr_ty a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 525)) && @@ -6091,7 +6091,7 @@ eq_bitwise_or_rule(Parser *p) int mark = p->mark; { // '==' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 27)) && @@ -6155,7 +6155,7 @@ lte_bitwise_or_rule(Parser *p) int mark = p->mark; { // '<=' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 29)) && @@ -6187,7 +6187,7 @@ lt_bitwise_or_rule(Parser *p) int mark = p->mark; { // '<' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 20)) && @@ -6219,7 +6219,7 @@ gte_bitwise_or_rule(Parser *p) int mark = p->mark; { // '>=' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 30)) && @@ -6251,7 +6251,7 @@ gt_bitwise_or_rule(Parser *p) int mark = p->mark; { // '>' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 21)) && @@ -6283,8 +6283,8 @@ notin_bitwise_or_rule(Parser *p) int mark = p->mark; { // 'not' 'in' bitwise_or expr_ty a; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (keyword = _PyPegen_expect_token(p, 525)) && @@ -6318,7 +6318,7 @@ in_bitwise_or_rule(Parser *p) int mark = p->mark; { // 'in' bitwise_or expr_ty a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 518)) && @@ -6350,8 +6350,8 @@ isnot_bitwise_or_rule(Parser *p) int mark = p->mark; { // 'is' 'not' bitwise_or expr_ty a; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (keyword = _PyPegen_expect_token(p, 526)) && @@ -6385,7 +6385,7 @@ is_bitwise_or_rule(Parser *p) int mark = p->mark; { // 'is' bitwise_or expr_ty a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 526)) && @@ -6451,7 +6451,7 @@ bitwise_or_raw(Parser *p) { // bitwise_or '|' bitwise_xor expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = bitwise_or_rule(p)) && @@ -6538,7 +6538,7 @@ bitwise_xor_raw(Parser *p) { // bitwise_xor '^' bitwise_and expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = bitwise_xor_rule(p)) && @@ -6625,7 +6625,7 @@ bitwise_and_raw(Parser *p) { // bitwise_and '&' shift_expr expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = bitwise_and_rule(p)) && @@ -6712,7 +6712,7 @@ shift_expr_raw(Parser *p) { // shift_expr '<<' sum expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = shift_expr_rule(p)) && @@ -6741,7 +6741,7 @@ shift_expr_raw(Parser *p) { // shift_expr '>>' sum expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = shift_expr_rule(p)) && @@ -6828,7 +6828,7 @@ sum_raw(Parser *p) { // sum '+' term expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = sum_rule(p)) && @@ -6857,7 +6857,7 @@ sum_raw(Parser *p) { // sum '-' term expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = sum_rule(p)) && @@ -6950,7 +6950,7 @@ term_raw(Parser *p) { // term '*' factor expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = term_rule(p)) && @@ -6979,7 +6979,7 @@ term_raw(Parser *p) { // term '/' factor expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = term_rule(p)) && @@ -7008,7 +7008,7 @@ term_raw(Parser *p) { // term '//' factor expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = term_rule(p)) && @@ -7037,7 +7037,7 @@ term_raw(Parser *p) { // term '%' factor expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = term_rule(p)) && @@ -7066,7 +7066,7 @@ term_raw(Parser *p) { // term '@' factor expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = term_rule(p)) && @@ -7129,7 +7129,7 @@ factor_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '+' factor expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 14)) && @@ -7155,7 +7155,7 @@ factor_rule(Parser *p) } { // '-' factor expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 15)) && @@ -7181,7 +7181,7 @@ factor_rule(Parser *p) } { // '~' factor expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 31)) && @@ -7242,7 +7242,7 @@ power_rule(Parser *p) { // await_primary '**' factor expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = await_primary_rule(p)) && @@ -7305,7 +7305,7 @@ await_primary_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // AWAIT primary expr_ty a; - void *await_var; + Token * await_var; if ( (await_var = _PyPegen_expect_token(p, AWAIT)) && @@ -7396,7 +7396,7 @@ primary_raw(Parser *p) { // primary '.' NAME expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = primary_rule(p)) && @@ -7451,8 +7451,8 @@ primary_raw(Parser *p) { // primary '(' arguments? ')' expr_ty a; void *b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = primary_rule(p)) && @@ -7483,8 +7483,8 @@ primary_raw(Parser *p) { // primary '[' slices ']' expr_ty a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = primary_rule(p)) && @@ -7615,7 +7615,7 @@ slice_rule(Parser *p) void *a; void *b; void *c; - void *literal; + Token * literal; if ( (a = expression_rule(p), 1) && @@ -7703,7 +7703,7 @@ atom_rule(Parser *p) p->mark = mark; } { // 'True' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 527)) ) @@ -7726,7 +7726,7 @@ atom_rule(Parser *p) p->mark = mark; } { // 'False' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 528)) ) @@ -7749,7 +7749,7 @@ atom_rule(Parser *p) p->mark = mark; } { // 'None' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 529)) ) @@ -7772,7 +7772,7 @@ atom_rule(Parser *p) p->mark = mark; } { // '__new_parser__' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 530)) ) @@ -7850,7 +7850,7 @@ atom_rule(Parser *p) p->mark = mark; } { // '...' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 52)) ) @@ -7928,8 +7928,8 @@ list_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '[' star_named_expressions? ']' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 9)) && @@ -7980,8 +7980,8 @@ listcomp_rule(Parser *p) { // '[' named_expression for_if_clauses ']' expr_ty a; asdl_seq* b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 9)) && @@ -8044,8 +8044,8 @@ tuple_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '(' [star_named_expression ',' star_named_expressions?] ')' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -8087,8 +8087,8 @@ group_rule(Parser *p) int mark = p->mark; { // '(' (yield_expr | named_expression) ')' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -8131,8 +8131,8 @@ genexp_rule(Parser *p) { // '(' expression for_if_clauses ')' expr_ty a; asdl_seq* b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -8195,8 +8195,8 @@ set_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '{' expressions_list '}' asdl_seq* a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 25)) && @@ -8247,8 +8247,8 @@ setcomp_rule(Parser *p) { // '{' expression for_if_clauses '}' expr_ty a; asdl_seq* b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 25)) && @@ -8311,8 +8311,8 @@ dict_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '{' kvpairs? '}' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 25)) && @@ -8363,8 +8363,8 @@ dictcomp_rule(Parser *p) { // '{' kvpair for_if_clauses '}' KeyValuePair* a; asdl_seq* b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 25)) && @@ -8441,7 +8441,7 @@ kvpair_rule(Parser *p) int mark = p->mark; { // '**' bitwise_or expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 35)) && @@ -8460,7 +8460,7 @@ kvpair_rule(Parser *p) { // expression ':' expression expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = expression_rule(p)) && @@ -8521,11 +8521,11 @@ for_if_clause_rule(Parser *p) int mark = p->mark; { // ASYNC 'for' star_targets 'in' disjunction (('if' disjunction))* expr_ty a; - void *async_var; + Token * async_var; expr_ty b; asdl_seq * c; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (async_var = _PyPegen_expect_token(p, ASYNC)) && @@ -8553,8 +8553,8 @@ for_if_clause_rule(Parser *p) expr_ty a; expr_ty b; asdl_seq * c; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (keyword = _PyPegen_expect_token(p, 517)) && @@ -8600,8 +8600,8 @@ yield_expr_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // 'yield' 'from' expression expr_ty a; - void *keyword; - void *keyword_1; + Token * keyword; + Token * keyword_1; if ( (keyword = _PyPegen_expect_token(p, 504)) && @@ -8629,7 +8629,7 @@ yield_expr_rule(Parser *p) } { // 'yield' star_expressions? void *a; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 504)) && @@ -8819,7 +8819,7 @@ kwargs_rule(Parser *p) { // ','.kwarg_or_starred+ ',' ','.kwarg_or_double_starred+ asdl_seq * a; asdl_seq * b; - void *literal; + Token * literal; if ( (a = _gather_113_rule(p)) && @@ -8883,7 +8883,7 @@ starred_expression_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '*' expression expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 16)) && @@ -8932,7 +8932,7 @@ kwarg_or_starred_rule(Parser *p) { // NAME '=' expression expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = _PyPegen_name_token(p)) && @@ -8998,7 +8998,7 @@ kwarg_or_double_starred_rule(Parser *p) { // NAME '=' expression expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = _PyPegen_name_token(p)) && @@ -9026,7 +9026,7 @@ kwarg_or_double_starred_rule(Parser *p) } { // '**' expression expr_ty a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 35)) && @@ -9182,7 +9182,7 @@ star_target_rule(Parser *p) UNUSED(start_col_offset); // Only used by EXTRA macro { // '*' (!'*' star_target) void *a; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 16)) && @@ -9209,7 +9209,7 @@ star_target_rule(Parser *p) { // t_primary '.' NAME !t_lookahead expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = t_primary_rule(p)) && @@ -9240,8 +9240,8 @@ star_target_rule(Parser *p) { // t_primary '[' slices ']' !t_lookahead expr_ty a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = t_primary_rule(p)) && @@ -9326,8 +9326,8 @@ star_atom_rule(Parser *p) } { // '(' star_target ')' expr_ty a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -9347,8 +9347,8 @@ star_atom_rule(Parser *p) } { // '(' star_targets_seq? ')' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -9376,8 +9376,8 @@ star_atom_rule(Parser *p) } { // '[' star_targets_seq? ']' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 9)) && @@ -9448,8 +9448,8 @@ inside_paren_ann_assign_target_rule(Parser *p) } { // '(' inside_paren_ann_assign_target ')' expr_ty a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -9494,7 +9494,7 @@ ann_assign_subscript_attribute_target_rule(Parser *p) { // t_primary '.' NAME !t_lookahead expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = t_primary_rule(p)) && @@ -9525,8 +9525,8 @@ ann_assign_subscript_attribute_target_rule(Parser *p) { // t_primary '[' slices ']' !t_lookahead expr_ty a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = t_primary_rule(p)) && @@ -9619,7 +9619,7 @@ del_target_rule(Parser *p) { // t_primary '.' NAME !t_lookahead expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = t_primary_rule(p)) && @@ -9650,8 +9650,8 @@ del_target_rule(Parser *p) { // t_primary '[' slices ']' !t_lookahead expr_ty a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = t_primary_rule(p)) && @@ -9732,8 +9732,8 @@ del_t_atom_rule(Parser *p) } { // '(' del_target ')' expr_ty a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -9753,8 +9753,8 @@ del_t_atom_rule(Parser *p) } { // '(' del_targets? ')' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -9782,8 +9782,8 @@ del_t_atom_rule(Parser *p) } { // '[' del_targets? ']' void *a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 9)) && @@ -9872,7 +9872,7 @@ target_rule(Parser *p) { // t_primary '.' NAME !t_lookahead expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = t_primary_rule(p)) && @@ -9903,8 +9903,8 @@ target_rule(Parser *p) { // t_primary '[' slices ']' !t_lookahead expr_ty a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = t_primary_rule(p)) && @@ -10001,7 +10001,7 @@ t_primary_raw(Parser *p) { // t_primary '.' NAME &t_lookahead expr_ty a; expr_ty b; - void *literal; + Token * literal; if ( (a = t_primary_rule(p)) && @@ -10032,8 +10032,8 @@ t_primary_raw(Parser *p) { // t_primary '[' slices ']' &t_lookahead expr_ty a; expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = t_primary_rule(p)) && @@ -10094,8 +10094,8 @@ t_primary_raw(Parser *p) { // t_primary '(' arguments? ')' &t_lookahead expr_ty a; void *b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (a = t_primary_rule(p)) && @@ -10157,7 +10157,7 @@ t_lookahead_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '(' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 7)) ) @@ -10168,7 +10168,7 @@ t_lookahead_rule(Parser *p) p->mark = mark; } { // '[' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 9)) ) @@ -10179,7 +10179,7 @@ t_lookahead_rule(Parser *p) p->mark = mark; } { // '.' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 23)) ) @@ -10228,8 +10228,8 @@ t_atom_rule(Parser *p) } { // '(' target ')' expr_ty a; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -10249,8 +10249,8 @@ t_atom_rule(Parser *p) } { // '(' targets? ')' void *b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -10278,8 +10278,8 @@ t_atom_rule(Parser *p) } { // '[' targets? ']' void *b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 9)) && @@ -10324,8 +10324,8 @@ incorrect_arguments_rule(Parser *p) int mark = p->mark; { // args ',' '*' expr_ty args_var; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (args_var = args_rule(p)) && @@ -10346,7 +10346,7 @@ incorrect_arguments_rule(Parser *p) { // expression for_if_clauses ',' [args | expression for_if_clauses] expr_ty expression_var; asdl_seq* for_if_clauses_var; - void *literal; + Token * literal; void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( @@ -10371,7 +10371,7 @@ incorrect_arguments_rule(Parser *p) { // args ',' args expr_ty a; expr_ty args_var; - void *literal; + Token * literal; if ( (a = args_rule(p)) && @@ -10406,7 +10406,7 @@ invalid_named_expression_rule(Parser *p) { // expression ':=' expression expr_ty a; expr_ty expression_var; - void *literal; + Token * literal; if ( (a = expression_rule(p)) && @@ -10444,7 +10444,7 @@ invalid_assignment_rule(Parser *p) int mark = p->mark; { // list ':' expr_ty list_var; - void *literal; + Token * literal; if ( (list_var = list_rule(p)) && @@ -10461,7 +10461,7 @@ invalid_assignment_rule(Parser *p) p->mark = mark; } { // tuple ':' - void *literal; + Token * literal; expr_ty tuple_var; if ( (tuple_var = tuple_rule(p)) @@ -10481,7 +10481,7 @@ invalid_assignment_rule(Parser *p) { // expression ':' expression ['=' annotated_rhs] expr_ty expression_var; expr_ty expression_var_1; - void *literal; + Token * literal; void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( @@ -10539,7 +10539,7 @@ invalid_block_rule(Parser *p) void * res = NULL; int mark = p->mark; { // NEWLINE !INDENT - void *newline_var; + Token * newline_var; if ( (newline_var = _PyPegen_expect_token(p, NEWLINE)) && @@ -10573,7 +10573,7 @@ invalid_comprehension_rule(Parser *p) void *_tmp_133_var; expr_ty expression_var; asdl_seq* for_if_clauses_var; - void *literal; + Token * literal; if ( (_tmp_133_var = _tmp_133_rule(p)) && @@ -10644,11 +10644,11 @@ invalid_double_type_comments_rule(Parser *p) void * res = NULL; int mark = p->mark; { // TYPE_COMMENT NEWLINE TYPE_COMMENT NEWLINE INDENT - void *indent_var; - void *newline_var; - void *newline_var_1; - void *type_comment_var; - void *type_comment_var_1; + Token * indent_var; + Token * newline_var; + Token * newline_var_1; + Token * type_comment_var; + Token * type_comment_var_1; if ( (type_comment_var = _PyPegen_expect_token(p, TYPE_COMMENT)) && @@ -10693,7 +10693,7 @@ _loop0_1_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // NEWLINE - void *newline_var; + Token * newline_var; while ( (newline_var = _PyPegen_expect_token(p, NEWLINE)) ) @@ -10742,7 +10742,7 @@ _loop0_2_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // NEWLINE - void *newline_var; + Token * newline_var; while ( (newline_var = _PyPegen_expect_token(p, NEWLINE)) ) @@ -10792,7 +10792,7 @@ _loop0_4_rule(Parser *p) ssize_t n = 0; { // ',' expression expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -10877,7 +10877,7 @@ _loop0_6_rule(Parser *p) ssize_t n = 0; { // ',' expression expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -10962,7 +10962,7 @@ _loop0_8_rule(Parser *p) ssize_t n = 0; { // ',' expression expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -11047,7 +11047,7 @@ _loop0_10_rule(Parser *p) ssize_t n = 0; { // ',' expression expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -11185,7 +11185,7 @@ _loop0_13_rule(Parser *p) ssize_t n = 0; { // ';' small_stmt stmt_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 13)) && @@ -11261,7 +11261,7 @@ _tmp_14_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'import' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 513)) ) @@ -11272,7 +11272,7 @@ _tmp_14_rule(Parser *p) p->mark = mark; } { // 'from' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 514)) ) @@ -11297,7 +11297,7 @@ _tmp_15_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'def' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 522)) ) @@ -11308,7 +11308,7 @@ _tmp_15_rule(Parser *p) p->mark = mark; } { // '@' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 49)) ) @@ -11319,7 +11319,7 @@ _tmp_15_rule(Parser *p) p->mark = mark; } { // ASYNC - void *async_var; + Token * async_var; if ( (async_var = _PyPegen_expect_token(p, ASYNC)) ) @@ -11344,7 +11344,7 @@ _tmp_16_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'class' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 523)) ) @@ -11355,7 +11355,7 @@ _tmp_16_rule(Parser *p) p->mark = mark; } { // '@' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 49)) ) @@ -11380,7 +11380,7 @@ _tmp_17_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'with' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 519)) ) @@ -11391,7 +11391,7 @@ _tmp_17_rule(Parser *p) p->mark = mark; } { // ASYNC - void *async_var; + Token * async_var; if ( (async_var = _PyPegen_expect_token(p, ASYNC)) ) @@ -11416,7 +11416,7 @@ _tmp_18_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'for' - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 517)) ) @@ -11427,7 +11427,7 @@ _tmp_18_rule(Parser *p) p->mark = mark; } { // ASYNC - void *async_var; + Token * async_var; if ( (async_var = _PyPegen_expect_token(p, ASYNC)) ) @@ -11453,7 +11453,7 @@ _tmp_19_rule(Parser *p) int mark = p->mark; { // '=' annotated_rhs expr_ty d; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 22)) && @@ -11485,8 +11485,8 @@ _tmp_20_rule(Parser *p) int mark = p->mark; { // '(' inside_paren_ann_assign_target ')' expr_ty b; - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; if ( (literal = _PyPegen_expect_token(p, 7)) && @@ -11531,7 +11531,7 @@ _tmp_21_rule(Parser *p) int mark = p->mark; { // '=' annotated_rhs expr_ty d; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 22)) && @@ -11696,7 +11696,7 @@ _loop0_26_rule(Parser *p) ssize_t n = 0; { // ',' NAME expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -11781,7 +11781,7 @@ _loop0_28_rule(Parser *p) ssize_t n = 0; { // ',' NAME expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -11857,7 +11857,7 @@ _tmp_29_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' expression - void *literal; + Token * literal; expr_ty z; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -12000,7 +12000,7 @@ _loop0_33_rule(Parser *p) ssize_t n = 0; { // ',' import_from_as_name alias_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -12076,7 +12076,7 @@ _tmp_34_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'as' NAME - void *keyword; + Token * keyword; expr_ty z; if ( (keyword = _PyPegen_expect_token(p, 531)) @@ -12117,7 +12117,7 @@ _loop0_36_rule(Parser *p) ssize_t n = 0; { // ',' dotted_as_name alias_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -12193,7 +12193,7 @@ _tmp_37_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'as' NAME - void *keyword; + Token * keyword; expr_ty z; if ( (keyword = _PyPegen_expect_token(p, 531)) @@ -12234,7 +12234,7 @@ _loop0_39_rule(Parser *p) ssize_t n = 0; { // ',' with_item withitem_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -12319,7 +12319,7 @@ _loop0_41_rule(Parser *p) ssize_t n = 0; { // ',' with_item withitem_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -12404,7 +12404,7 @@ _loop0_43_rule(Parser *p) ssize_t n = 0; { // ',' with_item withitem_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -12489,7 +12489,7 @@ _loop0_45_rule(Parser *p) ssize_t n = 0; { // ',' with_item withitem_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -12565,7 +12565,7 @@ _tmp_46_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'as' target - void *keyword; + Token * keyword; expr_ty t; if ( (keyword = _PyPegen_expect_token(p, 531)) @@ -12650,7 +12650,7 @@ _tmp_48_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'as' target - void *keyword; + Token * keyword; expr_ty z; if ( (keyword = _PyPegen_expect_token(p, 531)) @@ -12682,7 +12682,7 @@ _tmp_49_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'from' expression - void *keyword; + Token * keyword; expr_ty z; if ( (keyword = _PyPegen_expect_token(p, 514)) @@ -12714,7 +12714,7 @@ _tmp_50_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '->' expression - void *literal; + Token * literal; expr_ty z; if ( (literal = _PyPegen_expect_token(p, 51)) @@ -12746,7 +12746,7 @@ _tmp_51_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '->' expression - void *literal; + Token * literal; expr_ty z; if ( (literal = _PyPegen_expect_token(p, 51)) @@ -12778,8 +12778,8 @@ _tmp_52_rule(Parser *p) void * res = NULL; int mark = p->mark; { // NEWLINE INDENT - void *indent_var; - void *newline_var; + Token * indent_var; + Token * newline_var; if ( (newline_var = _PyPegen_expect_token(p, NEWLINE)) && @@ -13573,8 +13573,8 @@ _tmp_68_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '(' arguments? ')' - void *literal; - void *literal_1; + Token * literal; + Token * literal_1; void *z; if ( (literal = _PyPegen_expect_token(p, 7)) @@ -13617,7 +13617,7 @@ _loop0_70_rule(Parser *p) ssize_t n = 0; { // ',' star_expression expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -13755,7 +13755,7 @@ _loop0_73_rule(Parser *p) ssize_t n = 0; { // ',' star_named_expression expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -13884,7 +13884,7 @@ _tmp_75_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_plain_names - void *literal; + Token * literal; asdl_seq* x; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -13916,7 +13916,7 @@ _tmp_76_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_names_with_default - void *literal; + Token * literal; asdl_seq* y; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -13948,7 +13948,7 @@ _tmp_77_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_star_etc? - void *literal; + Token * literal; void *z; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -13980,7 +13980,7 @@ _tmp_78_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_names_with_default - void *literal; + Token * literal; asdl_seq* y; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -14012,7 +14012,7 @@ _tmp_79_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_star_etc? - void *literal; + Token * literal; void *z; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -14044,7 +14044,7 @@ _tmp_80_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_names_with_default - void *literal; + Token * literal; asdl_seq* y; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -14076,7 +14076,7 @@ _tmp_81_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_star_etc? - void *literal; + Token * literal; void *z; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -14108,7 +14108,7 @@ _tmp_82_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ',' lambda_star_etc? - void *literal; + Token * literal; void *z; if ( (literal = _PyPegen_expect_token(p, 12)) @@ -14140,7 +14140,7 @@ _tmp_83_rule(Parser *p) void * res = NULL; int mark = p->mark; { // lambda_plain_names ',' - void *literal; + Token * literal; asdl_seq* n; if ( (n = lambda_plain_names_rule(p)) @@ -14222,7 +14222,7 @@ _tmp_85_rule(Parser *p) int mark = p->mark; { // ',' lambda_kwds arg_ty d; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && @@ -14307,7 +14307,7 @@ _tmp_87_rule(Parser *p) int mark = p->mark; { // ',' lambda_kwds arg_ty d; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && @@ -14339,7 +14339,7 @@ _tmp_88_rule(Parser *p) int mark = p->mark; { // '=' expression expr_ty e; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 22)) && @@ -14379,7 +14379,7 @@ _loop0_90_rule(Parser *p) ssize_t n = 0; { // ',' lambda_name_with_default NameDefaultPair* elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -14464,7 +14464,7 @@ _loop0_92_rule(Parser *p) ssize_t n = 0; { // ',' (lambda_plain_name !'=') void *elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -14699,7 +14699,7 @@ _tmp_96_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '!=' - void *tok; + Token * tok; if ( (tok = _PyPegen_expect_token(p, 28)) ) @@ -14737,7 +14737,7 @@ _loop0_98_rule(Parser *p) ssize_t n = 0; { // ',' slice expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -14814,7 +14814,7 @@ _tmp_99_rule(Parser *p) int mark = p->mark; { // ':' expression? void *d; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 11)) && @@ -15039,7 +15039,7 @@ _tmp_104_rule(Parser *p) void * res = NULL; int mark = p->mark; { // star_named_expression ',' star_named_expressions? - void *literal; + Token * literal; expr_ty y; void *z; if ( @@ -15119,7 +15119,7 @@ _loop0_107_rule(Parser *p) ssize_t n = 0; { // ',' kvpair KeyValuePair* elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15347,7 +15347,7 @@ _tmp_111_rule(Parser *p) int mark = p->mark; { // ',' args expr_ty c; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15379,7 +15379,7 @@ _tmp_112_rule(Parser *p) int mark = p->mark; { // ',' args expr_ty c; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15419,7 +15419,7 @@ _loop0_114_rule(Parser *p) ssize_t n = 0; { // ',' kwarg_or_starred KeywordOrStarred* elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15504,7 +15504,7 @@ _loop0_116_rule(Parser *p) ssize_t n = 0; { // ',' kwarg_or_double_starred KeywordOrStarred* elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15589,7 +15589,7 @@ _loop0_118_rule(Parser *p) ssize_t n = 0; { // ',' kwarg_or_starred KeywordOrStarred* elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15674,7 +15674,7 @@ _loop0_120_rule(Parser *p) ssize_t n = 0; { // ',' kwarg_or_double_starred KeywordOrStarred* elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15808,7 +15808,7 @@ _loop0_123_rule(Parser *p) ssize_t n = 0; { // ',' star_target expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -15920,7 +15920,7 @@ _loop0_126_rule(Parser *p) ssize_t n = 0; { // ',' del_target expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -16005,7 +16005,7 @@ _loop0_128_rule(Parser *p) ssize_t n = 0; { // ',' target expr_ty elem; - void *literal; + Token * literal; while ( (literal = _PyPegen_expect_token(p, 12)) && @@ -16121,7 +16121,7 @@ _tmp_130_rule(Parser *p) int mark = p->mark; { // '=' annotated_rhs expr_ty annotated_rhs_var; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 22)) && @@ -16148,7 +16148,7 @@ _tmp_131_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '=' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 22)) ) @@ -16220,7 +16220,7 @@ _tmp_133_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '[' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 9)) ) @@ -16231,7 +16231,7 @@ _tmp_133_rule(Parser *p) p->mark = mark; } { // '(' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 7)) ) @@ -16242,7 +16242,7 @@ _tmp_133_rule(Parser *p) p->mark = mark; } { // '{' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 25)) ) @@ -16352,7 +16352,7 @@ _tmp_136_rule(Parser *p) void * res = NULL; int mark = p->mark; { // star_targets '=' - void *literal; + Token * literal; expr_ty z; if ( (z = star_targets_rule(p)) @@ -16384,7 +16384,7 @@ _tmp_137_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '.' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 23)) ) @@ -16395,7 +16395,7 @@ _tmp_137_rule(Parser *p) p->mark = mark; } { // '...' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 52)) ) @@ -16420,7 +16420,7 @@ _tmp_138_rule(Parser *p) void * res = NULL; int mark = p->mark; { // '.' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 23)) ) @@ -16431,7 +16431,7 @@ _tmp_138_rule(Parser *p) p->mark = mark; } { // '...' - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 52)) ) @@ -16457,8 +16457,8 @@ _tmp_139_rule(Parser *p) int mark = p->mark; { // '@' named_expression NEWLINE expr_ty f; - void *literal; - void *newline_var; + Token * literal; + Token * newline_var; if ( (literal = _PyPegen_expect_token(p, 49)) && @@ -16492,7 +16492,7 @@ _tmp_140_rule(Parser *p) int mark = p->mark; { // ',' star_expression expr_ty c; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && @@ -16524,7 +16524,7 @@ _tmp_141_rule(Parser *p) int mark = p->mark; { // ',' expression expr_ty c; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && @@ -16583,7 +16583,7 @@ _tmp_143_rule(Parser *p) int mark = p->mark; { // 'or' conjunction expr_ty c; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 532)) && @@ -16615,7 +16615,7 @@ _tmp_144_rule(Parser *p) int mark = p->mark; { // 'and' inversion expr_ty c; - void *keyword; + Token * keyword; if ( (keyword = _PyPegen_expect_token(p, 533)) && @@ -16646,7 +16646,7 @@ _tmp_145_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'if' disjunction - void *keyword; + Token * keyword; expr_ty z; if ( (keyword = _PyPegen_expect_token(p, 510)) @@ -16678,7 +16678,7 @@ _tmp_146_rule(Parser *p) void * res = NULL; int mark = p->mark; { // 'if' disjunction - void *keyword; + Token * keyword; expr_ty z; if ( (keyword = _PyPegen_expect_token(p, 510)) @@ -16711,7 +16711,7 @@ _tmp_147_rule(Parser *p) int mark = p->mark; { // ',' star_target expr_ty c; - void *literal; + Token * literal; if ( (literal = _PyPegen_expect_token(p, 12)) && diff --git a/Tools/peg_generator/pegen/c_generator.py b/Tools/peg_generator/pegen/c_generator.py index a59da2ffae8e1..6c77f43991bbe 100644 --- a/Tools/peg_generator/pegen/c_generator.py +++ b/Tools/peg_generator/pegen/c_generator.py @@ -65,9 +65,9 @@ class FunctionCall: function: str arguments: Optional[List[Any]] = None assigned_variable: Optional[str] = None + return_type: Optional[str] = None nodetype: Optional[NodeTypes] = None force_true: bool = False - metadata: Dict[str, Any] = field(default_factory=dict) def __str__(self) -> str: parts = [] @@ -101,6 +101,7 @@ def keyword_helper(self, keyword: str) -> FunctionCall: assigned_variable="keyword", function="_PyPegen_expect_token", arguments=["p", self.keyword_cache[keyword]], + return_type="Token *", nodetype=NodeTypes.KEYWORD, ) @@ -113,21 +114,26 @@ def visit_NameLeaf(self, node: NameLeaf) -> FunctionCall: function=f"_PyPegen_{name.lower()}_token", arguments=["p"], nodetype=BASE_NODETYPES[name], - metadata={"rulename": name.lower()}, + return_type="expr_ty", ) return FunctionCall( assigned_variable=f"{name.lower()}_var", function=f"_PyPegen_expect_token", arguments=["p", name], nodetype=NodeTypes.GENERIC_TOKEN, - metadata={"rulename": name.lower()}, + return_type="Token *", ) + type = None + rule = self.gen.all_rules.get(name.lower()) + if rule is not None: + type = "asdl_seq *" if rule.is_loop() or rule.is_gather() else rule.type + return FunctionCall( assigned_variable=f"{name}_var", function=f"{name}_rule", arguments=["p"], - metadata={"rulename": name.lower()}, + return_type=type, ) def visit_StringLeaf(self, node: StringLeaf) -> FunctionCall: @@ -142,6 +148,7 @@ def visit_StringLeaf(self, node: StringLeaf) -> FunctionCall: function=f"_PyPegen_expect_token", arguments=["p", type], nodetype=NodeTypes.GENERIC_TOKEN, + return_type="Token *", ) def visit_Rhs(self, node: Rhs) -> FunctionCall: @@ -160,10 +167,7 @@ def can_we_inline(node: Rhs) -> int: else: name = self.gen.name_node(node) self.cache[node] = FunctionCall( - assigned_variable=f"{name}_var", - function=f"{name}_rule", - arguments=["p"], - metadata={"rulename": name}, + assigned_variable=f"{name}_var", function=f"{name}_rule", arguments=["p"], ) return self.cache[node] @@ -179,16 +183,19 @@ def lookahead_call_helper(self, node: Lookahead, positive: int) -> FunctionCall: return FunctionCall( function=f"_PyPegen_lookahead_with_name", arguments=[positive, call.function, *call.arguments], + return_type="int", ) elif call.nodetype in {NodeTypes.GENERIC_TOKEN, NodeTypes.KEYWORD}: return FunctionCall( function=f"_PyPegen_lookahead_with_int", arguments=[positive, call.function, *call.arguments], + return_type="int", ) else: return FunctionCall( function=f"_PyPegen_lookahead", arguments=[positive, call.function, *call.arguments], + return_type="int", ) def visit_PositiveLookahead(self, node: PositiveLookahead) -> FunctionCall: @@ -214,7 +221,7 @@ def visit_Repeat0(self, node: Repeat0) -> FunctionCall: assigned_variable=f"{name}_var", function=f"{name}_rule", arguments=["p"], - metadata={"rulename": name}, + return_type="asdl_seq *", ) return self.cache[node] @@ -226,7 +233,7 @@ def visit_Repeat1(self, node: Repeat1) -> FunctionCall: assigned_variable=f"{name}_var", function=f"{name}_rule", arguments=["p"], - metadata={"rulename": name}, + return_type="asdl_seq *", ) return self.cache[node] @@ -238,7 +245,7 @@ def visit_Gather(self, node: Gather) -> FunctionCall: assigned_variable=f"{name}_var", function=f"{name}_rule", arguments=["p"], - metadata={"rulename": name}, + return_type="asdl_seq *", ) return self.cache[node] @@ -247,7 +254,10 @@ def visit_Group(self, node: Group) -> FunctionCall: def visit_Cut(self, node: Cut) -> FunctionCall: return FunctionCall( - assigned_variable="cut_var", function="1", nodetype=NodeTypes.CUT_OPERATOR + assigned_variable="cut_var", + return_type="int", + function="1", + nodetype=NodeTypes.CUT_OPERATOR, ) @@ -701,24 +711,4 @@ def collect_vars(self, node: Alt) -> Dict[Optional[str], Optional[str]]: def add_var(self, node: NamedItem) -> Tuple[Optional[str], Optional[str]]: call = self.callmakervisitor.visit(node.item) - if not call.assigned_variable: - return None, None - if call.nodetype == NodeTypes.CUT_OPERATOR: - return call.assigned_variable, "int" - - name = call.assigned_variable - rulename = call.metadata.get("rulename") - - type: Optional[str] = None - - assert self.all_rules is not None - if rulename and rulename in self.all_rules: - rule = self.all_rules.get(rulename) - if rule.is_loop() or rule.is_gather(): - type = "asdl_seq *" - else: - type = rule.type - elif call.nodetype in BASE_NODETYPES.values(): - type = "expr_ty" - - return self.dedupe(node.name if node.name else call.assigned_variable), type + return self.dedupe(node.name if node.name else call.assigned_variable), call.return_type diff --git a/Tools/peg_generator/pegen/parser_generator.py b/Tools/peg_generator/pegen/parser_generator.py index 3f6cdbe409d56..b92df2267762d 100644 --- a/Tools/peg_generator/pegen/parser_generator.py +++ b/Tools/peg_generator/pegen/parser_generator.py @@ -47,7 +47,7 @@ def __init__(self, grammar: Grammar, file: Optional[IO[Text]]): self.todo = self.rules.copy() # Rules to generate self.counter = 0 # For name_rule()/name_loop() self.keyword_counter = 499 # For keyword_type() - self.all_rules: Optional[Dict[str, Rule]] = None # Rules + temporal rules + self.all_rules: Dict[str, Rule] = {} # Rules + temporal rules self._local_variable_stack: List[List[str]] = [] @contextlib.contextmanager @@ -87,13 +87,13 @@ def collect_todo(self) -> None: done: Set[str] = set() while True: alltodo = list(self.todo) + self.all_rules.update(self.todo) todo = [i for i in alltodo if i not in done] if not todo: break for rulename in todo: self.todo[rulename].collect_todo(self) done = set(alltodo) - self.all_rules = self.todo.copy() def keyword_type(self) -> int: self.keyword_counter += 1

1 0

bpo-40453: Add PyConfig._isolated_subinterpreter (GH-19820)
by Victor Stinner 01 May '20

01 May '20

https://github.com/python/cpython/commit/252346acd937ddba4845331994b8ff4f90… commit: 252346acd937ddba4845331994b8ff4f90349625 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-05-01T11:33:44+02:00 summary: bpo-40453: Add PyConfig._isolated_subinterpreter (GH-19820) An isolated subinterpreter cannot spawn threads, spawn a child process or call os.fork(). * Add private _Py_NewInterpreter(isolated_subinterpreter) function. * Add isolated=True keyword-only parameter to _xxsubinterpreters.create(). * Allow again os.fork() in "non-isolated" subinterpreters. files: A Misc/NEWS.d/next/Library/2020-04-30-22-04-58.bpo-40453.ggz7sl.rst M Doc/c-api/init_config.rst M Include/cpython/initconfig.h M Include/cpython/pylifecycle.h M Lib/test/test__xxsubinterpreters.py M Lib/test/test_embed.py M Modules/_posixsubprocess.c M Modules/_threadmodule.c M Modules/_winapi.c M Modules/_xxsubinterpretersmodule.c M Modules/posixmodule.c M Programs/_testembed.c M Python/initconfig.c M Python/pylifecycle.c diff --git a/Doc/c-api/init_config.rst b/Doc/c-api/init_config.rst index 49507c8bad3ed..fc82c3eb59024 100644 --- a/Doc/c-api/init_config.rst +++ b/Doc/c-api/init_config.rst @@ -1004,6 +1004,8 @@ Private provisional API: * :c:member:`PyConfig._init_main`: if set to 0, :c:func:`Py_InitializeFromConfig` stops at the "Core" initialization phase. +* :c:member:`PyConfig._isolated_interpreter`: if non-zero, + disallow threads, subprocesses and fork. .. c:function:: PyStatus _Py_InitializeMain(void) diff --git a/Include/cpython/initconfig.h b/Include/cpython/initconfig.h index 8326c235702bd..df93a5539d48b 100644 --- a/Include/cpython/initconfig.h +++ b/Include/cpython/initconfig.h @@ -409,6 +409,10 @@ typedef struct { /* If equal to 0, stop Python initialization before the "main" phase */ int _init_main; + + /* If non-zero, disallow threads, subprocesses, and fork. + Default: 0. */ + int _isolated_interpreter; } PyConfig; PyAPI_FUNC(void) PyConfig_InitPythonConfig(PyConfig *config); diff --git a/Include/cpython/pylifecycle.h b/Include/cpython/pylifecycle.h index a01e9c94f12d7..eb523b82e182d 100644 --- a/Include/cpython/pylifecycle.h +++ b/Include/cpython/pylifecycle.h @@ -65,6 +65,8 @@ PyAPI_FUNC(int) _Py_CoerceLegacyLocale(int warn); PyAPI_FUNC(int) _Py_LegacyLocaleDetected(int warn); PyAPI_FUNC(char *) _Py_SetLocaleFromEnv(int category); +PyAPI_FUNC(PyThreadState *) _Py_NewInterpreter(int isolated_subinterpreter); + #ifdef __cplusplus } #endif diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py index 80eff19152f15..e17bfde2c2f75 100644 --- a/Lib/test/test__xxsubinterpreters.py +++ b/Lib/test/test__xxsubinterpreters.py @@ -794,6 +794,7 @@ def f(): self.assertEqual(out, 'it worked!') def test_create_thread(self): + subinterp = interpreters.create(isolated=False) script, file = _captured_script(""" import threading def f(): @@ -804,7 +805,7 @@ def f(): t.join() """) with file: - interpreters.run_string(self.id, script) + interpreters.run_string(subinterp, script) out = file.read() self.assertEqual(out, 'it worked!') diff --git a/Lib/test/test_embed.py b/Lib/test/test_embed.py index 0bdfae1b7e387..3d60b2f330c62 100644 --- a/Lib/test/test_embed.py +++ b/Lib/test/test_embed.py @@ -406,6 +406,7 @@ class InitConfigTests(EmbeddingTestsMixin, unittest.TestCase): 'check_hash_pycs_mode': 'default', 'pathconfig_warnings': 1, '_init_main': 1, + '_isolated_interpreter': 0, } if MS_WINDOWS: CONFIG_COMPAT.update({ @@ -766,6 +767,8 @@ def test_init_from_config(self): 'check_hash_pycs_mode': 'always', 'pathconfig_warnings': 0, + + '_isolated_interpreter': 1, } self.check_all_configs("test_init_from_config", config, preconfig, api=API_COMPAT) diff --git a/Misc/NEWS.d/next/Library/2020-04-30-22-04-58.bpo-40453.ggz7sl.rst b/Misc/NEWS.d/next/Library/2020-04-30-22-04-58.bpo-40453.ggz7sl.rst new file mode 100644 index 0000000000000..f20c666d3e27f --- /dev/null +++ b/Misc/NEWS.d/next/Library/2020-04-30-22-04-58.bpo-40453.ggz7sl.rst @@ -0,0 +1,3 @@ +Add ``isolated=True`` keyword-only parameter to +``_xxsubinterpreters.create()``. An isolated subinterpreter cannot spawn +threads, spawn a child process or call ``os.fork()``. diff --git a/Modules/_posixsubprocess.c b/Modules/_posixsubprocess.c index 60dd78d92a4f5..add2962189b1c 100644 --- a/Modules/_posixsubprocess.c +++ b/Modules/_posixsubprocess.c @@ -663,6 +663,14 @@ subprocess_fork_exec(PyObject* self, PyObject *args) return NULL; } + PyInterpreterState *interp = PyInterpreterState_Get(); + const PyConfig *config = _PyInterpreterState_GetConfig(interp); + if (config->_isolated_interpreter) { + PyErr_SetString(PyExc_RuntimeError, + "subprocess not supported for isolated subinterpreters"); + return NULL; + } + /* We need to call gc.disable() when we'll be calling preexec_fn */ if (preexec_fn != Py_None) { PyObject *result; diff --git a/Modules/_threadmodule.c b/Modules/_threadmodule.c index b3d90b22c5a66..77baba4847897 100644 --- a/Modules/_threadmodule.c +++ b/Modules/_threadmodule.c @@ -1085,6 +1085,14 @@ thread_PyThread_start_new_thread(PyObject *self, PyObject *fargs) "optional 3rd arg must be a dictionary"); return NULL; } + + PyInterpreterState *interp = _PyInterpreterState_GET(); + if (interp->config._isolated_interpreter) { + PyErr_SetString(PyExc_RuntimeError, + "thread is not supported for isolated subinterpreters"); + return NULL; + } + boot = PyMem_NEW(struct bootstate, 1); if (boot == NULL) return PyErr_NoMemory(); diff --git a/Modules/_winapi.c b/Modules/_winapi.c index 1b28adb0b3983..e1672c478522e 100644 --- a/Modules/_winapi.c +++ b/Modules/_winapi.c @@ -1080,6 +1080,14 @@ _winapi_CreateProcess_impl(PyObject *module, return NULL; } + PyInterpreterState *interp = PyInterpreterState_Get(); + const PyConfig *config = _PyInterpreterState_GetConfig(interp); + if (config->_isolated_interpreter) { + PyErr_SetString(PyExc_RuntimeError, + "subprocess not supported for isolated subinterpreters"); + return NULL; + } + ZeroMemory(&si, sizeof(si)); si.StartupInfo.cb = sizeof(si); diff --git a/Modules/_xxsubinterpretersmodule.c b/Modules/_xxsubinterpretersmodule.c index 15e80559ec6f6..de11c090870f9 100644 --- a/Modules/_xxsubinterpretersmodule.c +++ b/Modules/_xxsubinterpretersmodule.c @@ -1999,16 +1999,20 @@ _global_channels(void) { } static PyObject * -interp_create(PyObject *self, PyObject *args) +interp_create(PyObject *self, PyObject *args, PyObject *kwds) { - if (!PyArg_UnpackTuple(args, "create", 0, 0)) { + + static char *kwlist[] = {"isolated", NULL}; + int isolated = 1; + if (!PyArg_ParseTupleAndKeywords(args, kwds, "|$i:create", kwlist, + &isolated)) { return NULL; } // Create and initialize the new interpreter. PyThreadState *save_tstate = PyThreadState_Swap(NULL); // XXX Possible GILState issues? - PyThreadState *tstate = Py_NewInterpreter(); + PyThreadState *tstate = _Py_NewInterpreter(isolated); PyThreadState_Swap(save_tstate); if (tstate == NULL) { /* Since no new thread state was created, there is no exception to @@ -2547,8 +2551,8 @@ channel__channel_id(PyObject *self, PyObject *args, PyObject *kwds) } static PyMethodDef module_functions[] = { - {"create", (PyCFunction)interp_create, - METH_VARARGS, create_doc}, + {"create", (PyCFunction)(void(*)(void))interp_create, + METH_VARARGS | METH_KEYWORDS, create_doc}, {"destroy", (PyCFunction)(void(*)(void))interp_destroy, METH_VARARGS | METH_KEYWORDS, destroy_doc}, {"list_all", interp_list_all, diff --git a/Modules/posixmodule.c b/Modules/posixmodule.c index 3d3f6ac969926..0163b0757aefa 100644 --- a/Modules/posixmodule.c +++ b/Modules/posixmodule.c @@ -6243,9 +6243,10 @@ os_fork_impl(PyObject *module) /*[clinic end generated code: output=3626c81f98985d49 input=13c956413110eeaa]*/ { pid_t pid; - - if (_PyInterpreterState_GET() != PyInterpreterState_Main()) { - PyErr_SetString(PyExc_RuntimeError, "fork not supported for subinterpreters"); + PyInterpreterState *interp = _PyInterpreterState_GET(); + if (interp->config._isolated_interpreter) { + PyErr_SetString(PyExc_RuntimeError, + "fork not supported for isolated subinterpreters"); return NULL; } if (PySys_Audit("os.fork", NULL) < 0) { diff --git a/Programs/_testembed.c b/Programs/_testembed.c index 2cf0d71b470bf..5c83678f650d0 100644 --- a/Programs/_testembed.c +++ b/Programs/_testembed.c @@ -603,6 +603,8 @@ static int test_init_from_config(void) Py_FrozenFlag = 0; config.pathconfig_warnings = 0; + config._isolated_interpreter = 1; + init_from_config_clear(&config); dump_config(); diff --git a/Python/initconfig.c b/Python/initconfig.c index 58cca562f336d..185935c05fb28 100644 --- a/Python/initconfig.c +++ b/Python/initconfig.c @@ -632,6 +632,7 @@ _PyConfig_InitCompatConfig(PyConfig *config) config->check_hash_pycs_mode = NULL; config->pathconfig_warnings = -1; config->_init_main = 1; + config->_isolated_interpreter = 0; #ifdef MS_WINDOWS config->legacy_windows_stdio = -1; #endif @@ -850,6 +851,7 @@ _PyConfig_Copy(PyConfig *config, const PyConfig *config2) COPY_WSTR_ATTR(check_hash_pycs_mode); COPY_ATTR(pathconfig_warnings); COPY_ATTR(_init_main); + COPY_ATTR(_isolated_interpreter); #undef COPY_ATTR #undef COPY_WSTR_ATTR @@ -949,6 +951,7 @@ config_as_dict(const PyConfig *config) SET_ITEM_WSTR(check_hash_pycs_mode); SET_ITEM_INT(pathconfig_warnings); SET_ITEM_INT(_init_main); + SET_ITEM_INT(_isolated_interpreter); return dict; diff --git a/Python/pylifecycle.c b/Python/pylifecycle.c index 7909cdbf5b772..5726a559cfcb7 100644 --- a/Python/pylifecycle.c +++ b/Python/pylifecycle.c @@ -1526,7 +1526,7 @@ Py_Finalize(void) */ static PyStatus -new_interpreter(PyThreadState **tstate_p) +new_interpreter(PyThreadState **tstate_p, int isolated_subinterpreter) { PyStatus status; @@ -1573,6 +1573,7 @@ new_interpreter(PyThreadState **tstate_p) if (_PyStatus_EXCEPTION(status)) { goto error; } + interp->config._isolated_interpreter = isolated_subinterpreter; status = pycore_interp_init(tstate); if (_PyStatus_EXCEPTION(status)) { @@ -1606,10 +1607,10 @@ new_interpreter(PyThreadState **tstate_p) } PyThreadState * -Py_NewInterpreter(void) +_Py_NewInterpreter(int isolated_subinterpreter) { PyThreadState *tstate = NULL; - PyStatus status = new_interpreter(&tstate); + PyStatus status = new_interpreter(&tstate, isolated_subinterpreter); if (_PyStatus_EXCEPTION(status)) { Py_ExitStatusException(status); } @@ -1617,6 +1618,12 @@ Py_NewInterpreter(void) } +PyThreadState * +Py_NewInterpreter(void) +{ + return _Py_NewInterpreter(0); +} + /* Delete an interpreter and its last thread. This requires that the given thread state is current, that the thread has no remaining frames, and that it is its interpreter's only remaining thread.

1 0

Change 'exception happened' to 'exception occurred' in two places (#19767)
by Noah Doersing 01 May '20

01 May '20

https://github.com/python/cpython/commit/8bcfd31cc01e068bca78aa42a87c24aea6… commit: 8bcfd31cc01e068bca78aa42a87c24aea6ebc6b1 branch: master author: Noah Doersing <doersino(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-04-30T21:30:10-07:00 summary: Change 'exception happened' to 'exception occurred' in two places (#19767) files: M Doc/tutorial/errors.rst M Lib/socketserver.py diff --git a/Doc/tutorial/errors.rst b/Doc/tutorial/errors.rst index ab23df9f3ff9a..0ce96466e8c28 100644 --- a/Doc/tutorial/errors.rst +++ b/Doc/tutorial/errors.rst @@ -67,7 +67,7 @@ The rest of the line provides detail based on the type of exception and what caused it. The preceding part of the error message shows the context where the exception -happened, in the form of a stack traceback. In general it contains a stack +occurred, in the form of a stack traceback. In general it contains a stack traceback listing source lines; however, it will not display lines read from standard input. diff --git a/Lib/socketserver.py b/Lib/socketserver.py index 1ad028fa4d08c..57c1ae6e9e8be 100644 --- a/Lib/socketserver.py +++ b/Lib/socketserver.py @@ -374,7 +374,7 @@ def handle_error(self, request, client_address): """ print('-'*40, file=sys.stderr) - print('Exception happened during processing of request from', + print('Exception occurred during processing of request from', client_address, file=sys.stderr) import traceback traceback.print_exc()

1 0

bpo-40334: Add support for feature_version in new PEG parser (GH-19827)
by Lysandros Nikolaou 01 May '20

01 May '20

https://github.com/python/cpython/commit/3e0a6f37dfdd595be737baae00ec0e036a… commit: 3e0a6f37dfdd595be737baae00ec0e036a912615 branch: master author: Lysandros Nikolaou <lisandrosnik(a)gmail.com> committer: GitHub <noreply(a)github.com> date: 2020-04-30T20:27:52-07:00 summary: bpo-40334: Add support for feature_version in new PEG parser (GH-19827) `ast.parse` and `compile` support a `feature_version` parameter that tells the parser to parse the input string, as if it were written in an older Python version. The `feature_version` is propagated to the tokenizer, which uses it to handle the three different stages of support for `async` and `await`. Additionally, it disallows the following at parser level: - The '@' operator in < 3.5 - Async functions in < 3.5 - Async comprehensions in < 3.6 - Underscores in numeric literals in < 3.6 - Await expression in < 3.5 - Variable annotations in < 3.6 - Async for-loops in < 3.5 - Async with-statements in < 3.5 - F-strings in < 3.6 Closes we-like-parsers/cpython#124. files: M Grammar/python.gram M Lib/test/test_type_comments.py M Parser/pegen/parse.c M Parser/pegen/parse_string.c M Parser/pegen/pegen.c M Parser/pegen/pegen.h diff --git a/Grammar/python.gram b/Grammar/python.gram index e1164d990aaa4..38107fcf7354c 100644 --- a/Grammar/python.gram +++ b/Grammar/python.gram @@ -80,10 +80,14 @@ compound_stmt[stmt_ty]: # NOTE: annotated_rhs may start with 'yield'; yield_expr must start with 'yield' assignment: | a=NAME ':' b=expression c=['=' d=annotated_rhs { d }] { - _Py_AnnAssign(CHECK(_PyPegen_set_expr_context(p, a, Store)), b, c, 1, EXTRA) } + CHECK_VERSION( + 6, + "Variable annotation syntax is", + _Py_AnnAssign(CHECK(_PyPegen_set_expr_context(p, a, Store)), b, c, 1, EXTRA) + ) } | a=('(' b=inside_paren_ann_assign_target ')' { b } | ann_assign_subscript_attribute_target) ':' b=expression c=['=' d=annotated_rhs { d }] { - _Py_AnnAssign(a, b, c, 0, EXTRA)} + CHECK_VERSION(6, "Variable annotations syntax is", _Py_AnnAssign(a, b, c, 0, EXTRA)) } | a=(z=star_targets '=' { z })+ b=(yield_expr | star_expressions) tc=[TYPE_COMMENT] { _Py_Assign(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) } | a=target b=augassign c=(yield_expr | star_expressions) { @@ -91,19 +95,19 @@ assignment: | invalid_assignment augassign[AugOperator*]: - | '+=' {_PyPegen_augoperator(p, Add)} - | '-=' {_PyPegen_augoperator(p, Sub)} - | '*=' {_PyPegen_augoperator(p, Mult)} - | '@=' {_PyPegen_augoperator(p, MatMult)} - | '/=' {_PyPegen_augoperator(p, Div)} - | '%=' {_PyPegen_augoperator(p, Mod)} - | '&=' {_PyPegen_augoperator(p, BitAnd)} - | '|=' {_PyPegen_augoperator(p, BitOr)} - | '^=' {_PyPegen_augoperator(p, BitXor)} - | '<<=' {_PyPegen_augoperator(p, LShift)} - | '>>=' {_PyPegen_augoperator(p, RShift)} - | '**=' {_PyPegen_augoperator(p, Pow)} - | '//=' {_PyPegen_augoperator(p, FloorDiv)} + | '+=' { _PyPegen_augoperator(p, Add) } + | '-=' { _PyPegen_augoperator(p, Sub) } + | '*=' { _PyPegen_augoperator(p, Mult) } + | '@=' { CHECK_VERSION(5, "The '@' operator is", _PyPegen_augoperator(p, MatMult)) } + | '/=' { _PyPegen_augoperator(p, Div) } + | '%=' { _PyPegen_augoperator(p, Mod) } + | '&=' { _PyPegen_augoperator(p, BitAnd) } + | '|=' { _PyPegen_augoperator(p, BitOr) } + | '^=' { _PyPegen_augoperator(p, BitXor) } + | '<<=' { _PyPegen_augoperator(p, LShift) } + | '>>=' { _PyPegen_augoperator(p, RShift) } + | '**=' { _PyPegen_augoperator(p, Pow) } + | '//=' { _PyPegen_augoperator(p, FloorDiv) } global_stmt[stmt_ty]: 'global' a=','.NAME+ { _Py_Global(CHECK(_PyPegen_map_names_to_ids(p, a)), EXTRA) } @@ -156,14 +160,20 @@ while_stmt[stmt_ty]: | 'while' a=named_expression ':' b=block c=[else_block] { _Py_While(a, b, c, EXTRA) } for_stmt[stmt_ty]: - | is_async=[ASYNC] 'for' t=star_targets 'in' ex=star_expressions ':' tc=[TYPE_COMMENT] b=block el=[else_block] { - (is_async ? _Py_AsyncFor : _Py_For)(t, ex, b, el, NEW_TYPE_COMMENT(p, tc), EXTRA) } + | 'for' t=star_targets 'in' ex=star_expressions ':' tc=[TYPE_COMMENT] b=block el=[else_block] { + _Py_For(t, ex, b, el, NEW_TYPE_COMMENT(p, tc), EXTRA) } + | ASYNC 'for' t=star_targets 'in' ex=star_expressions ':' tc=[TYPE_COMMENT] b=block el=[else_block] { + CHECK_VERSION(5, "Async for loops are", _Py_AsyncFor(t, ex, b, el, NEW_TYPE_COMMENT(p, tc), EXTRA)) } with_stmt[stmt_ty]: - | is_async=[ASYNC] 'with' '(' a=','.with_item+ ')' ':' b=block { - (is_async ? _Py_AsyncWith : _Py_With)(a, b, NULL, EXTRA) } - | is_async=[ASYNC] 'with' a=','.with_item+ ':' tc=[TYPE_COMMENT] b=block { - (is_async ? _Py_AsyncWith : _Py_With)(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) } + | 'with' '(' a=','.with_item+ ')' ':' b=block { + _Py_With(a, b, NULL, EXTRA) } + | 'with' a=','.with_item+ ':' tc=[TYPE_COMMENT] b=block { + _Py_With(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA) } + | ASYNC 'with' '(' a=','.with_item+ ')' ':' b=block { + CHECK_VERSION(5, "Async with statements are", _Py_AsyncWith(a, b, NULL, EXTRA)) } + | ASYNC 'with' a=','.with_item+ ':' tc=[TYPE_COMMENT] b=block { + CHECK_VERSION(5, "Async with statements are", _Py_AsyncWith(a, b, NEW_TYPE_COMMENT(p, tc), EXTRA)) } with_item[withitem_ty]: | e=expression o=['as' t=target { t }] { _Py_withitem(e, o, p->arena) } @@ -188,10 +198,18 @@ function_def[stmt_ty]: | function_def_raw function_def_raw[stmt_ty]: - | is_async=[ASYNC] 'def' n=NAME '(' params=[params] ')' a=['->' z=expression { z }] ':' tc=[func_type_comment] b=block { - (is_async ? _Py_AsyncFunctionDef : _Py_FunctionDef)(n->v.Name.id, - (params) ? params : CHECK(_PyPegen_empty_arguments(p)), - b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA) } + | 'def' n=NAME '(' params=[params] ')' a=['->' z=expression { z }] ':' tc=[func_type_comment] b=block { + _Py_FunctionDef(n->v.Name.id, + (params) ? params : CHECK(_PyPegen_empty_arguments(p)), + b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA) } + | ASYNC 'def' n=NAME '(' params=[params] ')' a=['->' z=expression { z }] ':' tc=[func_type_comment] b=block { + CHECK_VERSION( + 5, + "Async functions are", + _Py_AsyncFunctionDef(n->v.Name.id, + (params) ? params : CHECK(_PyPegen_empty_arguments(p)), + b, NULL, a, NEW_TYPE_COMMENT(p, tc), EXTRA) + ) } func_type_comment[PyObject*]: | NEWLINE t=TYPE_COMMENT &(NEWLINE INDENT) { t } # Must be followed by indented block | invalid_double_type_comments @@ -399,7 +417,7 @@ term[expr_ty]: | a=term '/' b=factor { _Py_BinOp(a, Div, b, EXTRA) } | a=term '//' b=factor { _Py_BinOp(a, FloorDiv, b, EXTRA) } | a=term '%' b=factor { _Py_BinOp(a, Mod, b, EXTRA) } - | a=term '@' b=factor { _Py_BinOp(a, MatMult, b, EXTRA) } + | a=term '@' b=factor { CHECK_VERSION(5, "The '@' operator is", _Py_BinOp(a, MatMult, b, EXTRA)) } | factor factor[expr_ty] (memo): | '+' a=factor { _Py_UnaryOp(UAdd, a, EXTRA) } @@ -410,7 +428,7 @@ power[expr_ty]: | a=await_primary '**' b=factor { _Py_BinOp(a, Pow, b, EXTRA) } | await_primary await_primary[expr_ty] (memo): - | AWAIT a=primary { _Py_Await(a, EXTRA) } + | AWAIT a=primary { CHECK_VERSION(5, "Await expressions are", _Py_Await(a, EXTRA)) } | primary primary[expr_ty]: | a=primary '.' b=NAME { _Py_Attribute(a, b->v.Name.id, Load, EXTRA) } @@ -469,8 +487,12 @@ kvpair[KeyValuePair*]: | '**' a=bitwise_or { _PyPegen_key_value_pair(p, NULL, a) } | a=expression ':' b=expression { _PyPegen_key_value_pair(p, a, b) } for_if_clauses[asdl_seq*]: - | a=(y=[ASYNC] 'for' a=star_targets 'in' b=disjunction c=('if' z=disjunction { z })* - { _Py_comprehension(a, b, c, y != NULL, p->arena) })+ { a } + | for_if_clause+ +for_if_clause[comprehension_ty]: + | ASYNC 'for' a=star_targets 'in' b=disjunction c=('if' z=disjunction { z })* { + CHECK_VERSION(6, "Async comprehensions are", _Py_comprehension(a, b, c, 1, p->arena)) } + | 'for' a=star_targets 'in' b=disjunction c=('if' z=disjunction { z })* { + _Py_comprehension(a, b, c, 0, p->arena) } yield_expr[expr_ty]: | 'yield' 'from' a=expression { _Py_YieldFrom(a, EXTRA) } diff --git a/Lib/test/test_type_comments.py b/Lib/test/test_type_comments.py index 6c3f6ed4ed209..6027b3b56f76f 100644 --- a/Lib/test/test_type_comments.py +++ b/Lib/test/test_type_comments.py @@ -252,7 +252,6 @@ def test_funcdef(self): self.assertEqual(tree.body[0].type_comment, None) self.assertEqual(tree.body[1].type_comment, None) - @support.skip_if_new_parser("Pegen does not support feature_version yet") def test_asyncdef(self): for tree in self.parse_all(asyncdef, minver=5): self.assertEqual(tree.body[0].type_comment, "() -> int") @@ -261,27 +260,22 @@ def test_asyncdef(self): self.assertEqual(tree.body[0].type_comment, None) self.assertEqual(tree.body[1].type_comment, None) - @support.skip_if_new_parser("Pegen does not support feature_version yet") def test_asyncvar(self): for tree in self.parse_all(asyncvar, maxver=6): pass - @support.skip_if_new_parser("Pegen does not support feature_version yet") def test_asynccomp(self): for tree in self.parse_all(asynccomp, minver=6): pass - @support.skip_if_new_parser("Pegen does not support feature_version yet") def test_matmul(self): for tree in self.parse_all(matmul, minver=5): pass - @support.skip_if_new_parser("Pegen does not support feature_version yet") def test_fstring(self): for tree in self.parse_all(fstring, minver=6): pass - @support.skip_if_new_parser("Pegen does not support feature_version yet") def test_underscorednumber(self): for tree in self.parse_all(underscorednumber, minver=6): pass diff --git a/Parser/pegen/parse.c b/Parser/pegen/parse.c index 8ff9a70d3bb82..9c941ca1ee2ec 100644 --- a/Parser/pegen/parse.c +++ b/Parser/pegen/parse.c @@ -188,176 +188,183 @@ static KeywordToken *reserved_keywords[] = { #define kvpairs_type 1117 #define kvpair_type 1118 #define for_if_clauses_type 1119 -#define yield_expr_type 1120 -#define arguments_type 1121 -#define args_type 1122 -#define kwargs_type 1123 -#define starred_expression_type 1124 -#define kwarg_or_starred_type 1125 -#define kwarg_or_double_starred_type 1126 -#define star_targets_type 1127 -#define star_targets_seq_type 1128 -#define star_target_type 1129 -#define star_atom_type 1130 -#define inside_paren_ann_assign_target_type 1131 -#define ann_assign_subscript_attribute_target_type 1132 -#define del_targets_type 1133 -#define del_target_type 1134 -#define del_t_atom_type 1135 -#define targets_type 1136 -#define target_type 1137 -#define t_primary_type 1138 // Left-recursive -#define t_lookahead_type 1139 -#define t_atom_type 1140 -#define incorrect_arguments_type 1141 -#define invalid_named_expression_type 1142 -#define invalid_assignment_type 1143 -#define invalid_block_type 1144 -#define invalid_comprehension_type 1145 -#define invalid_parameters_type 1146 -#define invalid_double_type_comments_type 1147 -#define _loop0_1_type 1148 -#define _loop0_2_type 1149 -#define _loop0_4_type 1150 -#define _gather_3_type 1151 -#define _loop0_6_type 1152 -#define _gather_5_type 1153 -#define _loop0_8_type 1154 -#define _gather_7_type 1155 -#define _loop0_10_type 1156 -#define _gather_9_type 1157 -#define _loop1_11_type 1158 -#define _loop0_13_type 1159 -#define _gather_12_type 1160 -#define _tmp_14_type 1161 -#define _tmp_15_type 1162 -#define _tmp_16_type 1163 -#define _tmp_17_type 1164 -#define _tmp_18_type 1165 -#define _tmp_19_type 1166 -#define _tmp_20_type 1167 -#define _tmp_21_type 1168 -#define _loop1_22_type 1169 -#define _tmp_23_type 1170 -#define _tmp_24_type 1171 -#define _loop0_26_type 1172 -#define _gather_25_type 1173 -#define _loop0_28_type 1174 -#define _gather_27_type 1175 -#define _tmp_29_type 1176 -#define _loop0_30_type 1177 -#define _loop1_31_type 1178 -#define _loop0_33_type 1179 -#define _gather_32_type 1180 -#define _tmp_34_type 1181 -#define _loop0_36_type 1182 -#define _gather_35_type 1183 -#define _tmp_37_type 1184 -#define _loop0_39_type 1185 -#define _gather_38_type 1186 -#define _loop0_41_type 1187 -#define _gather_40_type 1188 -#define _tmp_42_type 1189 -#define _loop1_43_type 1190 -#define _tmp_44_type 1191 -#define _tmp_45_type 1192 -#define _tmp_46_type 1193 -#define _tmp_47_type 1194 -#define _loop0_48_type 1195 -#define _loop0_49_type 1196 -#define _loop0_50_type 1197 -#define _loop1_51_type 1198 -#define _loop0_52_type 1199 -#define _loop1_53_type 1200 -#define _loop1_54_type 1201 -#define _loop1_55_type 1202 -#define _loop0_56_type 1203 -#define _loop1_57_type 1204 -#define _loop0_58_type 1205 -#define _loop1_59_type 1206 -#define _loop0_60_type 1207 -#define _loop1_61_type 1208 -#define _loop1_62_type 1209 -#define _tmp_63_type 1210 -#define _loop0_65_type 1211 -#define _gather_64_type 1212 -#define _loop1_66_type 1213 -#define _loop0_68_type 1214 -#define _gather_67_type 1215 -#define _loop1_69_type 1216 -#define _tmp_70_type 1217 -#define _tmp_71_type 1218 -#define _tmp_72_type 1219 -#define _tmp_73_type 1220 -#define _tmp_74_type 1221 -#define _tmp_75_type 1222 -#define _tmp_76_type 1223 -#define _tmp_77_type 1224 -#define _tmp_78_type 1225 -#define _loop0_79_type 1226 -#define _tmp_80_type 1227 -#define _loop1_81_type 1228 -#define _tmp_82_type 1229 -#define _tmp_83_type 1230 -#define _loop0_85_type 1231 -#define _gather_84_type 1232 -#define _loop0_87_type 1233 -#define _gather_86_type 1234 -#define _loop1_88_type 1235 -#define _loop1_89_type 1236 -#define _loop1_90_type 1237 -#define _tmp_91_type 1238 -#define _loop0_93_type 1239 -#define _gather_92_type 1240 -#define _tmp_94_type 1241 -#define _tmp_95_type 1242 -#define _tmp_96_type 1243 -#define _tmp_97_type 1244 -#define _loop1_98_type 1245 -#define _tmp_99_type 1246 -#define _tmp_100_type 1247 -#define _loop0_102_type 1248 -#define _gather_101_type 1249 -#define _loop1_103_type 1250 -#define _tmp_104_type 1251 -#define _tmp_105_type 1252 -#define _loop0_107_type 1253 -#define _gather_106_type 1254 -#define _loop0_109_type 1255 -#define _gather_108_type 1256 -#define _loop0_111_type 1257 -#define _gather_110_type 1258 -#define _loop0_113_type 1259 -#define _gather_112_type 1260 +#define for_if_clause_type 1120 +#define yield_expr_type 1121 +#define arguments_type 1122 +#define args_type 1123 +#define kwargs_type 1124 +#define starred_expression_type 1125 +#define kwarg_or_starred_type 1126 +#define kwarg_or_double_starred_type 1127 +#define star_targets_type 1128 +#define star_targets_seq_type 1129 +#define star_target_type 1130 +#define star_atom_type 1131 +#define inside_paren_ann_assign_target_type 1132 +#define ann_assign_subscript_attribute_target_type 1133 +#define del_targets_type 1134 +#define del_target_type 1135 +#define del_t_atom_type 1136 +#define targets_type 1137 +#define target_type 1138 +#define t_primary_type 1139 // Left-recursive +#define t_lookahead_type 1140 +#define t_atom_type 1141 +#define incorrect_arguments_type 1142 +#define invalid_named_expression_type 1143 +#define invalid_assignment_type 1144 +#define invalid_block_type 1145 +#define invalid_comprehension_type 1146 +#define invalid_parameters_type 1147 +#define invalid_double_type_comments_type 1148 +#define _loop0_1_type 1149 +#define _loop0_2_type 1150 +#define _loop0_4_type 1151 +#define _gather_3_type 1152 +#define _loop0_6_type 1153 +#define _gather_5_type 1154 +#define _loop0_8_type 1155 +#define _gather_7_type 1156 +#define _loop0_10_type 1157 +#define _gather_9_type 1158 +#define _loop1_11_type 1159 +#define _loop0_13_type 1160 +#define _gather_12_type 1161 +#define _tmp_14_type 1162 +#define _tmp_15_type 1163 +#define _tmp_16_type 1164 +#define _tmp_17_type 1165 +#define _tmp_18_type 1166 +#define _tmp_19_type 1167 +#define _tmp_20_type 1168 +#define _tmp_21_type 1169 +#define _loop1_22_type 1170 +#define _tmp_23_type 1171 +#define _tmp_24_type 1172 +#define _loop0_26_type 1173 +#define _gather_25_type 1174 +#define _loop0_28_type 1175 +#define _gather_27_type 1176 +#define _tmp_29_type 1177 +#define _loop0_30_type 1178 +#define _loop1_31_type 1179 +#define _loop0_33_type 1180 +#define _gather_32_type 1181 +#define _tmp_34_type 1182 +#define _loop0_36_type 1183 +#define _gather_35_type 1184 +#define _tmp_37_type 1185 +#define _loop0_39_type 1186 +#define _gather_38_type 1187 +#define _loop0_41_type 1188 +#define _gather_40_type 1189 +#define _loop0_43_type 1190 +#define _gather_42_type 1191 +#define _loop0_45_type 1192 +#define _gather_44_type 1193 +#define _tmp_46_type 1194 +#define _loop1_47_type 1195 +#define _tmp_48_type 1196 +#define _tmp_49_type 1197 +#define _tmp_50_type 1198 +#define _tmp_51_type 1199 +#define _tmp_52_type 1200 +#define _loop0_53_type 1201 +#define _loop0_54_type 1202 +#define _loop0_55_type 1203 +#define _loop1_56_type 1204 +#define _loop0_57_type 1205 +#define _loop1_58_type 1206 +#define _loop1_59_type 1207 +#define _loop1_60_type 1208 +#define _loop0_61_type 1209 +#define _loop1_62_type 1210 +#define _loop0_63_type 1211 +#define _loop1_64_type 1212 +#define _loop0_65_type 1213 +#define _loop1_66_type 1214 +#define _loop1_67_type 1215 +#define _tmp_68_type 1216 +#define _loop0_70_type 1217 +#define _gather_69_type 1218 +#define _loop1_71_type 1219 +#define _loop0_73_type 1220 +#define _gather_72_type 1221 +#define _loop1_74_type 1222 +#define _tmp_75_type 1223 +#define _tmp_76_type 1224 +#define _tmp_77_type 1225 +#define _tmp_78_type 1226 +#define _tmp_79_type 1227 +#define _tmp_80_type 1228 +#define _tmp_81_type 1229 +#define _tmp_82_type 1230 +#define _tmp_83_type 1231 +#define _loop0_84_type 1232 +#define _tmp_85_type 1233 +#define _loop1_86_type 1234 +#define _tmp_87_type 1235 +#define _tmp_88_type 1236 +#define _loop0_90_type 1237 +#define _gather_89_type 1238 +#define _loop0_92_type 1239 +#define _gather_91_type 1240 +#define _loop1_93_type 1241 +#define _loop1_94_type 1242 +#define _loop1_95_type 1243 +#define _tmp_96_type 1244 +#define _loop0_98_type 1245 +#define _gather_97_type 1246 +#define _tmp_99_type 1247 +#define _tmp_100_type 1248 +#define _tmp_101_type 1249 +#define _tmp_102_type 1250 +#define _loop1_103_type 1251 +#define _tmp_104_type 1252 +#define _tmp_105_type 1253 +#define _loop0_107_type 1254 +#define _gather_106_type 1255 +#define _loop1_108_type 1256 +#define _loop0_109_type 1257 +#define _loop0_110_type 1258 +#define _tmp_111_type 1259 +#define _tmp_112_type 1260 #define _loop0_114_type 1261 -#define _loop0_116_type 1262 -#define _gather_115_type 1263 -#define _tmp_117_type 1264 -#define _loop0_119_type 1265 -#define _gather_118_type 1266 -#define _loop0_121_type 1267 -#define _gather_120_type 1268 -#define _tmp_122_type 1269 -#define _tmp_123_type 1270 -#define _tmp_124_type 1271 -#define _tmp_125_type 1272 -#define _tmp_126_type 1273 -#define _loop0_127_type 1274 -#define _tmp_128_type 1275 -#define _tmp_129_type 1276 -#define _tmp_130_type 1277 -#define _tmp_131_type 1278 -#define _tmp_132_type 1279 -#define _tmp_133_type 1280 -#define _tmp_134_type 1281 -#define _tmp_135_type 1282 -#define _tmp_136_type 1283 -#define _tmp_137_type 1284 -#define _tmp_138_type 1285 -#define _tmp_139_type 1286 -#define _loop1_140_type 1287 -#define _loop0_141_type 1288 -#define _tmp_142_type 1289 +#define _gather_113_type 1262 +#define _loop0_116_type 1263 +#define _gather_115_type 1264 +#define _loop0_118_type 1265 +#define _gather_117_type 1266 +#define _loop0_120_type 1267 +#define _gather_119_type 1268 +#define _loop0_121_type 1269 +#define _loop0_123_type 1270 +#define _gather_122_type 1271 +#define _tmp_124_type 1272 +#define _loop0_126_type 1273 +#define _gather_125_type 1274 +#define _loop0_128_type 1275 +#define _gather_127_type 1276 +#define _tmp_129_type 1277 +#define _tmp_130_type 1278 +#define _tmp_131_type 1279 +#define _tmp_132_type 1280 +#define _tmp_133_type 1281 +#define _loop0_134_type 1282 +#define _tmp_135_type 1283 +#define _tmp_136_type 1284 +#define _tmp_137_type 1285 +#define _tmp_138_type 1286 +#define _tmp_139_type 1287 +#define _tmp_140_type 1288 +#define _tmp_141_type 1289 +#define _tmp_142_type 1290 +#define _tmp_143_type 1291 +#define _tmp_144_type 1292 +#define _tmp_145_type 1293 +#define _tmp_146_type 1294 +#define _tmp_147_type 1295 +#define _loop1_148_type 1296 static mod_ty file_rule(Parser *p); static mod_ty interactive_rule(Parser *p); @@ -479,6 +486,7 @@ static expr_ty dictcomp_rule(Parser *p); static asdl_seq* kvpairs_rule(Parser *p); static KeyValuePair* kvpair_rule(Parser *p); static asdl_seq* for_if_clauses_rule(Parser *p); +static comprehension_ty for_if_clause_rule(Parser *p); static expr_ty yield_expr_rule(Parser *p); static expr_ty arguments_rule(Parser *p); static expr_ty args_rule(Parser *p); @@ -548,107 +556,113 @@ static asdl_seq *_loop0_39_rule(Parser *p); static asdl_seq *_gather_38_rule(Parser *p); static asdl_seq *_loop0_41_rule(Parser *p); static asdl_seq *_gather_40_rule(Parser *p); -static void *_tmp_42_rule(Parser *p); -static asdl_seq *_loop1_43_rule(Parser *p); -static void *_tmp_44_rule(Parser *p); -static void *_tmp_45_rule(Parser *p); +static asdl_seq *_loop0_43_rule(Parser *p); +static asdl_seq *_gather_42_rule(Parser *p); +static asdl_seq *_loop0_45_rule(Parser *p); +static asdl_seq *_gather_44_rule(Parser *p); static void *_tmp_46_rule(Parser *p); -static void *_tmp_47_rule(Parser *p); -static asdl_seq *_loop0_48_rule(Parser *p); -static asdl_seq *_loop0_49_rule(Parser *p); -static asdl_seq *_loop0_50_rule(Parser *p); -static asdl_seq *_loop1_51_rule(Parser *p); -static asdl_seq *_loop0_52_rule(Parser *p); -static asdl_seq *_loop1_53_rule(Parser *p); -static asdl_seq *_loop1_54_rule(Parser *p); -static asdl_seq *_loop1_55_rule(Parser *p); -static asdl_seq *_loop0_56_rule(Parser *p); -static asdl_seq *_loop1_57_rule(Parser *p); -static asdl_seq *_loop0_58_rule(Parser *p); +static asdl_seq *_loop1_47_rule(Parser *p); +static void *_tmp_48_rule(Parser *p); +static void *_tmp_49_rule(Parser *p); +static void *_tmp_50_rule(Parser *p); +static void *_tmp_51_rule(Parser *p); +static void *_tmp_52_rule(Parser *p); +static asdl_seq *_loop0_53_rule(Parser *p); +static asdl_seq *_loop0_54_rule(Parser *p); +static asdl_seq *_loop0_55_rule(Parser *p); +static asdl_seq *_loop1_56_rule(Parser *p); +static asdl_seq *_loop0_57_rule(Parser *p); +static asdl_seq *_loop1_58_rule(Parser *p); static asdl_seq *_loop1_59_rule(Parser *p); -static asdl_seq *_loop0_60_rule(Parser *p); -static asdl_seq *_loop1_61_rule(Parser *p); +static asdl_seq *_loop1_60_rule(Parser *p); +static asdl_seq *_loop0_61_rule(Parser *p); static asdl_seq *_loop1_62_rule(Parser *p); -static void *_tmp_63_rule(Parser *p); +static asdl_seq *_loop0_63_rule(Parser *p); +static asdl_seq *_loop1_64_rule(Parser *p); static asdl_seq *_loop0_65_rule(Parser *p); -static asdl_seq *_gather_64_rule(Parser *p); static asdl_seq *_loop1_66_rule(Parser *p); -static asdl_seq *_loop0_68_rule(Parser *p); -static asdl_seq *_gather_67_rule(Parser *p); -static asdl_seq *_loop1_69_rule(Parser *p); -static void *_tmp_70_rule(Parser *p); -static void *_tmp_71_rule(Parser *p); -static void *_tmp_72_rule(Parser *p); -static void *_tmp_73_rule(Parser *p); -static void *_tmp_74_rule(Parser *p); +static asdl_seq *_loop1_67_rule(Parser *p); +static void *_tmp_68_rule(Parser *p); +static asdl_seq *_loop0_70_rule(Parser *p); +static asdl_seq *_gather_69_rule(Parser *p); +static asdl_seq *_loop1_71_rule(Parser *p); +static asdl_seq *_loop0_73_rule(Parser *p); +static asdl_seq *_gather_72_rule(Parser *p); +static asdl_seq *_loop1_74_rule(Parser *p); static void *_tmp_75_rule(Parser *p); static void *_tmp_76_rule(Parser *p); static void *_tmp_77_rule(Parser *p); static void *_tmp_78_rule(Parser *p); -static asdl_seq *_loop0_79_rule(Parser *p); +static void *_tmp_79_rule(Parser *p); static void *_tmp_80_rule(Parser *p); -static asdl_seq *_loop1_81_rule(Parser *p); +static void *_tmp_81_rule(Parser *p); static void *_tmp_82_rule(Parser *p); static void *_tmp_83_rule(Parser *p); -static asdl_seq *_loop0_85_rule(Parser *p); -static asdl_seq *_gather_84_rule(Parser *p); -static asdl_seq *_loop0_87_rule(Parser *p); -static asdl_seq *_gather_86_rule(Parser *p); -static asdl_seq *_loop1_88_rule(Parser *p); -static asdl_seq *_loop1_89_rule(Parser *p); -static asdl_seq *_loop1_90_rule(Parser *p); -static void *_tmp_91_rule(Parser *p); -static asdl_seq *_loop0_93_rule(Parser *p); -static asdl_seq *_gather_92_rule(Parser *p); -static void *_tmp_94_rule(Parser *p); -static void *_tmp_95_rule(Parser *p); +static asdl_seq *_loop0_84_rule(Parser *p); +static void *_tmp_85_rule(Parser *p); +static asdl_seq *_loop1_86_rule(Parser *p); +static void *_tmp_87_rule(Parser *p); +static void *_tmp_88_rule(Parser *p); +static asdl_seq *_loop0_90_rule(Parser *p); +static asdl_seq *_gather_89_rule(Parser *p); +static asdl_seq *_loop0_92_rule(Parser *p); +static asdl_seq *_gather_91_rule(Parser *p); +static asdl_seq *_loop1_93_rule(Parser *p); +static asdl_seq *_loop1_94_rule(Parser *p); +static asdl_seq *_loop1_95_rule(Parser *p); static void *_tmp_96_rule(Parser *p); -static void *_tmp_97_rule(Parser *p); -static asdl_seq *_loop1_98_rule(Parser *p); +static asdl_seq *_loop0_98_rule(Parser *p); +static asdl_seq *_gather_97_rule(Parser *p); static void *_tmp_99_rule(Parser *p); static void *_tmp_100_rule(Parser *p); -static asdl_seq *_loop0_102_rule(Parser *p); -static asdl_seq *_gather_101_rule(Parser *p); +static void *_tmp_101_rule(Parser *p); +static void *_tmp_102_rule(Parser *p); static asdl_seq *_loop1_103_rule(Parser *p); static void *_tmp_104_rule(Parser *p); static void *_tmp_105_rule(Parser *p); static asdl_seq *_loop0_107_rule(Parser *p); static asdl_seq *_gather_106_rule(Parser *p); +static asdl_seq *_loop1_108_rule(Parser *p); static asdl_seq *_loop0_109_rule(Parser *p); -static asdl_seq *_gather_108_rule(Parser *p); -static asdl_seq *_loop0_111_rule(Parser *p); -static asdl_seq *_gather_110_rule(Parser *p); -static asdl_seq *_loop0_113_rule(Parser *p); -static asdl_seq *_gather_112_rule(Parser *p); +static asdl_seq *_loop0_110_rule(Parser *p); +static void *_tmp_111_rule(Parser *p); +static void *_tmp_112_rule(Parser *p); static asdl_seq *_loop0_114_rule(Parser *p); +static asdl_seq *_gather_113_rule(Parser *p); static asdl_seq *_loop0_116_rule(Parser *p); static asdl_seq *_gather_115_rule(Parser *p); -static void *_tmp_117_rule(Parser *p); -static asdl_seq *_loop0_119_rule(Parser *p); -static asdl_seq *_gather_118_rule(Parser *p); +static asdl_seq *_loop0_118_rule(Parser *p); +static asdl_seq *_gather_117_rule(Parser *p); +static asdl_seq *_loop0_120_rule(Parser *p); +static asdl_seq *_gather_119_rule(Parser *p); static asdl_seq *_loop0_121_rule(Parser *p); -static asdl_seq *_gather_120_rule(Parser *p); -static void *_tmp_122_rule(Parser *p); -static void *_tmp_123_rule(Parser *p); +static asdl_seq *_loop0_123_rule(Parser *p); +static asdl_seq *_gather_122_rule(Parser *p); static void *_tmp_124_rule(Parser *p); -static void *_tmp_125_rule(Parser *p); -static void *_tmp_126_rule(Parser *p); -static asdl_seq *_loop0_127_rule(Parser *p); -static void *_tmp_128_rule(Parser *p); +static asdl_seq *_loop0_126_rule(Parser *p); +static asdl_seq *_gather_125_rule(Parser *p); +static asdl_seq *_loop0_128_rule(Parser *p); +static asdl_seq *_gather_127_rule(Parser *p); static void *_tmp_129_rule(Parser *p); static void *_tmp_130_rule(Parser *p); static void *_tmp_131_rule(Parser *p); static void *_tmp_132_rule(Parser *p); static void *_tmp_133_rule(Parser *p); -static void *_tmp_134_rule(Parser *p); +static asdl_seq *_loop0_134_rule(Parser *p); static void *_tmp_135_rule(Parser *p); static void *_tmp_136_rule(Parser *p); static void *_tmp_137_rule(Parser *p); static void *_tmp_138_rule(Parser *p); static void *_tmp_139_rule(Parser *p); -static asdl_seq *_loop1_140_rule(Parser *p); -static asdl_seq *_loop0_141_rule(Parser *p); +static void *_tmp_140_rule(Parser *p); +static void *_tmp_141_rule(Parser *p); static void *_tmp_142_rule(Parser *p); +static void *_tmp_143_rule(Parser *p); +static void *_tmp_144_rule(Parser *p); +static void *_tmp_145_rule(Parser *p); +static void *_tmp_146_rule(Parser *p); +static void *_tmp_147_rule(Parser *p); +static asdl_seq *_loop1_148_rule(Parser *p); // file: statements? $ @@ -1545,7 +1559,7 @@ assignment_rule(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = _Py_AnnAssign ( CHECK ( _PyPegen_set_expr_context ( p , a , Store ) ) , b , c , 1 , EXTRA ); + res = CHECK_VERSION ( 6 , "Variable annotation syntax is" , _Py_AnnAssign ( CHECK ( _PyPegen_set_expr_context ( p , a , Store ) ) , b , c , 1 , EXTRA ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -1577,7 +1591,7 @@ assignment_rule(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = _Py_AnnAssign ( a , b , c , 0 , EXTRA ); + res = CHECK_VERSION ( 6 , "Variable annotations syntax is" , _Py_AnnAssign ( a , b , c , 0 , EXTRA ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -1733,7 +1747,7 @@ augassign_rule(Parser *p) (literal = _PyPegen_expect_token(p, 50)) ) { - res = _PyPegen_augoperator ( p , MatMult ); + res = CHECK_VERSION ( 5 , "The '@' operator is" , _PyPegen_augoperator ( p , MatMult ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -2836,7 +2850,8 @@ while_stmt_rule(Parser *p) } // for_stmt: -// | ASYNC? 'for' star_targets 'in' star_expressions ':' TYPE_COMMENT? block else_block? +// | 'for' star_targets 'in' star_expressions ':' TYPE_COMMENT? block else_block? +// | ASYNC 'for' star_targets 'in' star_expressions ':' TYPE_COMMENT? block else_block? static stmt_ty for_stmt_rule(Parser *p) { @@ -2853,18 +2868,62 @@ for_stmt_rule(Parser *p) UNUSED(start_lineno); // Only used by EXTRA macro int start_col_offset = p->tokens[mark]->col_offset; UNUSED(start_col_offset); // Only used by EXTRA macro - { // ASYNC? 'for' star_targets 'in' star_expressions ':' TYPE_COMMENT? block else_block? + { // 'for' star_targets 'in' star_expressions ':' TYPE_COMMENT? block else_block? asdl_seq* b; void *el; expr_ty ex; - void *is_async; void *keyword; void *keyword_1; void *literal; expr_ty t; void *tc; if ( - (is_async = _PyPegen_expect_token(p, ASYNC), 1) + (keyword = _PyPegen_expect_token(p, 517)) + && + (t = star_targets_rule(p)) + && + (keyword_1 = _PyPegen_expect_token(p, 518)) + && + (ex = star_expressions_rule(p)) + && + (literal = _PyPegen_expect_token(p, 11)) + && + (tc = _PyPegen_expect_token(p, TYPE_COMMENT), 1) + && + (b = block_rule(p)) + && + (el = else_block_rule(p), 1) + ) + { + Token *token = _PyPegen_get_last_nonnwhitespace_token(p); + if (token == NULL) { + return NULL; + } + int end_lineno = token->end_lineno; + UNUSED(end_lineno); // Only used by EXTRA macro + int end_col_offset = token->end_col_offset; + UNUSED(end_col_offset); // Only used by EXTRA macro + res = _Py_For ( t , ex , b , el , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ); + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + return NULL; + } + goto done; + } + p->mark = mark; + } + { // ASYNC 'for' star_targets 'in' star_expressions ':' TYPE_COMMENT? block else_block? + void *async_var; + asdl_seq* b; + void *el; + expr_ty ex; + void *keyword; + void *keyword_1; + void *literal; + expr_ty t; + void *tc; + if ( + (async_var = _PyPegen_expect_token(p, ASYNC)) && (keyword = _PyPegen_expect_token(p, 517)) && @@ -2891,7 +2950,7 @@ for_stmt_rule(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = ( is_async ? _Py_AsyncFor : _Py_For ) ( t , ex , b , el , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ); + res = CHECK_VERSION ( 5 , "Async for loops are" , _Py_AsyncFor ( t , ex , b , el , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -2906,8 +2965,10 @@ for_stmt_rule(Parser *p) } // with_stmt: -// | ASYNC? 'with' '(' ','.with_item+ ')' ':' block -// | ASYNC? 'with' ','.with_item+ ':' TYPE_COMMENT? block +// | 'with' '(' ','.with_item+ ')' ':' block +// | 'with' ','.with_item+ ':' TYPE_COMMENT? block +// | ASYNC 'with' '(' ','.with_item+ ')' ':' block +// | ASYNC 'with' ','.with_item+ ':' TYPE_COMMENT? block static stmt_ty with_stmt_rule(Parser *p) { @@ -2924,17 +2985,14 @@ with_stmt_rule(Parser *p) UNUSED(start_lineno); // Only used by EXTRA macro int start_col_offset = p->tokens[mark]->col_offset; UNUSED(start_col_offset); // Only used by EXTRA macro - { // ASYNC? 'with' '(' ','.with_item+ ')' ':' block + { // 'with' '(' ','.with_item+ ')' ':' block asdl_seq * a; asdl_seq* b; - void *is_async; void *keyword; void *literal; void *literal_1; void *literal_2; if ( - (is_async = _PyPegen_expect_token(p, ASYNC), 1) - && (keyword = _PyPegen_expect_token(p, 519)) && (literal = _PyPegen_expect_token(p, 7)) @@ -2956,7 +3014,7 @@ with_stmt_rule(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = ( is_async ? _Py_AsyncWith : _Py_With ) ( a , b , NULL , EXTRA ); + res = _Py_With ( a , b , NULL , EXTRA ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -2965,16 +3023,13 @@ with_stmt_rule(Parser *p) } p->mark = mark; } - { // ASYNC? 'with' ','.with_item+ ':' TYPE_COMMENT? block + { // 'with' ','.with_item+ ':' TYPE_COMMENT? block asdl_seq * a; asdl_seq* b; - void *is_async; void *keyword; void *literal; void *tc; if ( - (is_async = _PyPegen_expect_token(p, ASYNC), 1) - && (keyword = _PyPegen_expect_token(p, 519)) && (a = _gather_40_rule(p)) @@ -2994,7 +3049,86 @@ with_stmt_rule(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = ( is_async ? _Py_AsyncWith : _Py_With ) ( a , b , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ); + res = _Py_With ( a , b , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ); + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + return NULL; + } + goto done; + } + p->mark = mark; + } + { // ASYNC 'with' '(' ','.with_item+ ')' ':' block + asdl_seq * a; + void *async_var; + asdl_seq* b; + void *keyword; + void *literal; + void *literal_1; + void *literal_2; + if ( + (async_var = _PyPegen_expect_token(p, ASYNC)) + && + (keyword = _PyPegen_expect_token(p, 519)) + && + (literal = _PyPegen_expect_token(p, 7)) + && + (a = _gather_42_rule(p)) + && + (literal_1 = _PyPegen_expect_token(p, 8)) + && + (literal_2 = _PyPegen_expect_token(p, 11)) + && + (b = block_rule(p)) + ) + { + Token *token = _PyPegen_get_last_nonnwhitespace_token(p); + if (token == NULL) { + return NULL; + } + int end_lineno = token->end_lineno; + UNUSED(end_lineno); // Only used by EXTRA macro + int end_col_offset = token->end_col_offset; + UNUSED(end_col_offset); // Only used by EXTRA macro + res = CHECK_VERSION ( 5 , "Async with statements are" , _Py_AsyncWith ( a , b , NULL , EXTRA ) ); + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + return NULL; + } + goto done; + } + p->mark = mark; + } + { // ASYNC 'with' ','.with_item+ ':' TYPE_COMMENT? block + asdl_seq * a; + void *async_var; + asdl_seq* b; + void *keyword; + void *literal; + void *tc; + if ( + (async_var = _PyPegen_expect_token(p, ASYNC)) + && + (keyword = _PyPegen_expect_token(p, 519)) + && + (a = _gather_44_rule(p)) + && + (literal = _PyPegen_expect_token(p, 11)) + && + (tc = _PyPegen_expect_token(p, TYPE_COMMENT), 1) + && + (b = block_rule(p)) + ) + { + Token *token = _PyPegen_get_last_nonnwhitespace_token(p); + if (token == NULL) { + return NULL; + } + int end_lineno = token->end_lineno; + UNUSED(end_lineno); // Only used by EXTRA macro + int end_col_offset = token->end_col_offset; + UNUSED(end_col_offset); // Only used by EXTRA macro + res = CHECK_VERSION ( 5 , "Async with statements are" , _Py_AsyncWith ( a , b , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -3023,7 +3157,7 @@ with_item_rule(Parser *p) if ( (e = expression_rule(p)) && - (o = _tmp_42_rule(p), 1) + (o = _tmp_46_rule(p), 1) ) { res = _Py_withitem ( e , o , p -> arena ); @@ -3105,7 +3239,7 @@ try_stmt_rule(Parser *p) && (b = block_rule(p)) && - (ex = _loop1_43_rule(p)) + (ex = _loop1_47_rule(p)) && (el = else_block_rule(p), 1) && @@ -3162,7 +3296,7 @@ except_block_rule(Parser *p) && (e = expression_rule(p)) && - (t = _tmp_44_rule(p), 1) + (t = _tmp_48_rule(p), 1) && (literal = _PyPegen_expect_token(p, 11)) && @@ -3329,7 +3463,7 @@ raise_stmt_rule(Parser *p) && (a = expression_rule(p)) && - (b = _tmp_45_rule(p), 1) + (b = _tmp_49_rule(p), 1) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -3421,7 +3555,8 @@ function_def_rule(Parser *p) } // function_def_raw: -// | ASYNC? 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block +// | 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block +// | ASYNC 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block static stmt_ty function_def_raw_rule(Parser *p) { @@ -3438,10 +3573,57 @@ function_def_raw_rule(Parser *p) UNUSED(start_lineno); // Only used by EXTRA macro int start_col_offset = p->tokens[mark]->col_offset; UNUSED(start_col_offset); // Only used by EXTRA macro - { // ASYNC? 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block + { // 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block + void *a; + asdl_seq* b; + void *keyword; + void *literal; + void *literal_1; + void *literal_2; + expr_ty n; + void *params; + void *tc; + if ( + (keyword = _PyPegen_expect_token(p, 522)) + && + (n = _PyPegen_name_token(p)) + && + (literal = _PyPegen_expect_token(p, 7)) + && + (params = params_rule(p), 1) + && + (literal_1 = _PyPegen_expect_token(p, 8)) + && + (a = _tmp_50_rule(p), 1) + && + (literal_2 = _PyPegen_expect_token(p, 11)) + && + (tc = func_type_comment_rule(p), 1) + && + (b = block_rule(p)) + ) + { + Token *token = _PyPegen_get_last_nonnwhitespace_token(p); + if (token == NULL) { + return NULL; + } + int end_lineno = token->end_lineno; + UNUSED(end_lineno); // Only used by EXTRA macro + int end_col_offset = token->end_col_offset; + UNUSED(end_col_offset); // Only used by EXTRA macro + res = _Py_FunctionDef ( n -> v . Name . id , ( params ) ? params : CHECK ( _PyPegen_empty_arguments ( p ) ) , b , NULL , a , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ); + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + return NULL; + } + goto done; + } + p->mark = mark; + } + { // ASYNC 'def' NAME '(' params? ')' ['->' expression] ':' func_type_comment? block void *a; + void *async_var; asdl_seq* b; - void *is_async; void *keyword; void *literal; void *literal_1; @@ -3450,7 +3632,7 @@ function_def_raw_rule(Parser *p) void *params; void *tc; if ( - (is_async = _PyPegen_expect_token(p, ASYNC), 1) + (async_var = _PyPegen_expect_token(p, ASYNC)) && (keyword = _PyPegen_expect_token(p, 522)) && @@ -3462,7 +3644,7 @@ function_def_raw_rule(Parser *p) && (literal_1 = _PyPegen_expect_token(p, 8)) && - (a = _tmp_46_rule(p), 1) + (a = _tmp_51_rule(p), 1) && (literal_2 = _PyPegen_expect_token(p, 11)) && @@ -3479,7 +3661,7 @@ function_def_raw_rule(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = ( is_async ? _Py_AsyncFunctionDef : _Py_FunctionDef ) ( n -> v . Name . id , ( params ) ? params : CHECK ( _PyPegen_empty_arguments ( p ) ) , b , NULL , a , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ); + res = CHECK_VERSION ( 5 , "Async functions are" , _Py_AsyncFunctionDef ( n -> v . Name . id , ( params ) ? params : CHECK ( _PyPegen_empty_arguments ( p ) ) , b , NULL , a , NEW_TYPE_COMMENT ( p , tc ) , EXTRA ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -3513,7 +3695,7 @@ func_type_comment_rule(Parser *p) && (t = _PyPegen_expect_token(p, TYPE_COMMENT)) && - _PyPegen_lookahead(1, _tmp_47_rule, p) + _PyPegen_lookahead(1, _tmp_52_rule, p) ) { res = t; @@ -3610,9 +3792,9 @@ parameters_rule(Parser *p) if ( (a = slash_no_default_rule(p)) && - (b = _loop0_48_rule(p)) + (b = _loop0_53_rule(p)) && - (c = _loop0_49_rule(p)) + (c = _loop0_54_rule(p)) && (d = star_etc_rule(p), 1) ) @@ -3633,7 +3815,7 @@ parameters_rule(Parser *p) if ( (a = slash_with_default_rule(p)) && - (b = _loop0_50_rule(p)) + (b = _loop0_55_rule(p)) && (c = star_etc_rule(p), 1) ) @@ -3652,9 +3834,9 @@ parameters_rule(Parser *p) asdl_seq * b; void *c; if ( - (a = _loop1_51_rule(p)) + (a = _loop1_56_rule(p)) && - (b = _loop0_52_rule(p)) + (b = _loop0_57_rule(p)) && (c = star_etc_rule(p), 1) ) @@ -3672,7 +3854,7 @@ parameters_rule(Parser *p) asdl_seq * a; void *b; if ( - (a = _loop1_53_rule(p)) + (a = _loop1_58_rule(p)) && (b = star_etc_rule(p), 1) ) @@ -3720,7 +3902,7 @@ slash_no_default_rule(Parser *p) void *literal; void *literal_1; if ( - (a = _loop1_54_rule(p)) + (a = _loop1_59_rule(p)) && (literal = _PyPegen_expect_token(p, 17)) && @@ -3740,7 +3922,7 @@ slash_no_default_rule(Parser *p) asdl_seq * a; void *literal; if ( - (a = _loop1_55_rule(p)) + (a = _loop1_60_rule(p)) && (literal = _PyPegen_expect_token(p, 17)) && @@ -3778,9 +3960,9 @@ slash_with_default_rule(Parser *p) void *literal; void *literal_1; if ( - (a = _loop0_56_rule(p)) + (a = _loop0_61_rule(p)) && - (b = _loop1_57_rule(p)) + (b = _loop1_62_rule(p)) && (literal = _PyPegen_expect_token(p, 17)) && @@ -3801,9 +3983,9 @@ slash_with_default_rule(Parser *p) asdl_seq * b; void *literal; if ( - (a = _loop0_58_rule(p)) + (a = _loop0_63_rule(p)) && - (b = _loop1_59_rule(p)) + (b = _loop1_64_rule(p)) && (literal = _PyPegen_expect_token(p, 17)) && @@ -3846,7 +4028,7 @@ star_etc_rule(Parser *p) && (a = param_no_default_rule(p)) && - (b = _loop0_60_rule(p)) + (b = _loop0_65_rule(p)) && (c = kwds_rule(p), 1) ) @@ -3870,7 +4052,7 @@ star_etc_rule(Parser *p) && (literal_1 = _PyPegen_expect_token(p, 12)) && - (b = _loop1_61_rule(p)) + (b = _loop1_66_rule(p)) && (c = kwds_rule(p), 1) ) @@ -4239,7 +4421,7 @@ decorators_rule(Parser *p) { // (('@' named_expression NEWLINE))+ asdl_seq * a; if ( - (a = _loop1_62_rule(p)) + (a = _loop1_67_rule(p)) ) { res = a; @@ -4327,7 +4509,7 @@ class_def_raw_rule(Parser *p) && (a = _PyPegen_name_token(p)) && - (b = _tmp_63_rule(p), 1) + (b = _tmp_68_rule(p), 1) && (literal = _PyPegen_expect_token(p, 11)) && @@ -4433,7 +4615,7 @@ expressions_list_rule(Parser *p) void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( - (a = _gather_64_rule(p)) + (a = _gather_69_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -4480,7 +4662,7 @@ star_expressions_rule(Parser *p) if ( (a = star_expression_rule(p)) && - (b = _loop1_66_rule(p)) + (b = _loop1_71_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -4620,7 +4802,7 @@ star_named_expressions_rule(Parser *p) void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( - (a = _gather_67_rule(p)) + (a = _gather_72_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -4834,7 +5016,7 @@ expressions_rule(Parser *p) if ( (a = expression_rule(p)) && - (b = _loop1_69_rule(p)) + (b = _loop1_74_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -5056,11 +5238,11 @@ lambda_parameters_rule(Parser *p) if ( (a = lambda_slash_without_default_rule(p)) && - (b = _tmp_70_rule(p), 1) + (b = _tmp_75_rule(p), 1) && - (c = _tmp_71_rule(p), 1) + (c = _tmp_76_rule(p), 1) && - (d = _tmp_72_rule(p), 1) + (d = _tmp_77_rule(p), 1) ) { res = _PyPegen_make_arguments ( p , a , NULL , b , c , d ); @@ -5079,9 +5261,9 @@ lambda_parameters_rule(Parser *p) if ( (a = lambda_slash_with_default_rule(p)) && - (b = _tmp_73_rule(p), 1) + (b = _tmp_78_rule(p), 1) && - (c = _tmp_74_rule(p), 1) + (c = _tmp_79_rule(p), 1) ) { res = _PyPegen_make_arguments ( p , NULL , a , NULL , b , c ); @@ -5100,9 +5282,9 @@ lambda_parameters_rule(Parser *p) if ( (a = lambda_plain_names_rule(p)) && - (b = _tmp_75_rule(p), 1) + (b = _tmp_80_rule(p), 1) && - (c = _tmp_76_rule(p), 1) + (c = _tmp_81_rule(p), 1) ) { res = _PyPegen_make_arguments ( p , NULL , NULL , a , b , c ); @@ -5120,7 +5302,7 @@ lambda_parameters_rule(Parser *p) if ( (a = lambda_names_with_default_rule(p)) && - (b = _tmp_77_rule(p), 1) + (b = _tmp_82_rule(p), 1) ) { res = _PyPegen_make_arguments ( p , NULL , NULL , NULL , a , b ); @@ -5202,7 +5384,7 @@ lambda_slash_with_default_rule(Parser *p) void *literal; void *literal_1; if ( - (a = _tmp_78_rule(p), 1) + (a = _tmp_83_rule(p), 1) && (b = lambda_names_with_default_rule(p)) && @@ -5249,9 +5431,9 @@ lambda_star_etc_rule(Parser *p) && (a = lambda_plain_name_rule(p)) && - (b = _loop0_79_rule(p)) + (b = _loop0_84_rule(p)) && - (c = _tmp_80_rule(p), 1) + (c = _tmp_85_rule(p), 1) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -5274,9 +5456,9 @@ lambda_star_etc_rule(Parser *p) if ( (literal = _PyPegen_expect_token(p, 16)) && - (b = _loop1_81_rule(p)) + (b = _loop1_86_rule(p)) && - (c = _tmp_82_rule(p), 1) + (c = _tmp_87_rule(p), 1) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -5332,7 +5514,7 @@ lambda_name_with_optional_default_rule(Parser *p) && (a = lambda_plain_name_rule(p)) && - (b = _tmp_83_rule(p), 1) + (b = _tmp_88_rule(p), 1) ) { res = _PyPegen_name_default_pair ( p , a , b , NULL ); @@ -5361,7 +5543,7 @@ lambda_names_with_default_rule(Parser *p) { // ','.lambda_name_with_default+ asdl_seq * a; if ( - (a = _gather_84_rule(p)) + (a = _gather_89_rule(p)) ) { res = a; @@ -5425,7 +5607,7 @@ lambda_plain_names_rule(Parser *p) { // ','.(lambda_plain_name !'=')+ asdl_seq * a; if ( - (a = _gather_86_rule(p)) + (a = _gather_91_rule(p)) ) { res = a; @@ -5544,7 +5726,7 @@ disjunction_rule(Parser *p) if ( (a = conjunction_rule(p)) && - (b = _loop1_88_rule(p)) + (b = _loop1_93_rule(p)) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -5606,7 +5788,7 @@ conjunction_rule(Parser *p) if ( (a = inversion_rule(p)) && - (b = _loop1_89_rule(p)) + (b = _loop1_94_rule(p)) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -5728,7 +5910,7 @@ comparison_rule(Parser *p) if ( (a = bitwise_or_rule(p)) && - (b = _loop1_90_rule(p)) + (b = _loop1_95_rule(p)) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -5940,10 +6122,10 @@ noteq_bitwise_or_rule(Parser *p) CmpopExprPair* res = NULL; int mark = p->mark; { // ('!=') bitwise_or - void *_tmp_91_var; + void *_tmp_96_var; expr_ty a; if ( - (_tmp_91_var = _tmp_91_rule(p)) + (_tmp_96_var = _tmp_96_rule(p)) && (a = bitwise_or_rule(p)) ) @@ -6901,7 +7083,7 @@ term_raw(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = _Py_BinOp ( a , MatMult , b , EXTRA ); + res = CHECK_VERSION ( 5 , "The '@' operator is" , _Py_BinOp ( a , MatMult , b , EXTRA ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -7138,7 +7320,7 @@ await_primary_rule(Parser *p) UNUSED(end_lineno); // Only used by EXTRA macro int end_col_offset = token->end_col_offset; UNUSED(end_col_offset); // Only used by EXTRA macro - res = _Py_Await ( a , EXTRA ); + res = CHECK_VERSION ( 5 , "Await expressions are" , _Py_Await ( a , EXTRA ) ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -7385,7 +7567,7 @@ slices_rule(Parser *p) void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( - (a = _gather_92_rule(p)) + (a = _gather_97_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -7441,7 +7623,7 @@ slice_rule(Parser *p) && (b = expression_rule(p), 1) && - (c = _tmp_94_rule(p), 1) + (c = _tmp_99_rule(p), 1) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -7629,40 +7811,40 @@ atom_rule(Parser *p) p->mark = mark; } { // &'(' (tuple | group | genexp) - void *_tmp_95_var; + void *_tmp_100_var; if ( _PyPegen_lookahead_with_int(1, _PyPegen_expect_token, p, 7) && - (_tmp_95_var = _tmp_95_rule(p)) + (_tmp_100_var = _tmp_100_rule(p)) ) { - res = _tmp_95_var; + res = _tmp_100_var; goto done; } p->mark = mark; } { // &'[' (list | listcomp) - void *_tmp_96_var; + void *_tmp_101_var; if ( _PyPegen_lookahead_with_int(1, _PyPegen_expect_token, p, 9) && - (_tmp_96_var = _tmp_96_rule(p)) + (_tmp_101_var = _tmp_101_rule(p)) ) { - res = _tmp_96_var; + res = _tmp_101_var; goto done; } p->mark = mark; } { // &'{' (dict | set | dictcomp | setcomp) - void *_tmp_97_var; + void *_tmp_102_var; if ( _PyPegen_lookahead_with_int(1, _PyPegen_expect_token, p, 25) && - (_tmp_97_var = _tmp_97_rule(p)) + (_tmp_102_var = _tmp_102_rule(p)) ) { - res = _tmp_97_var; + res = _tmp_102_var; goto done; } p->mark = mark; @@ -7709,7 +7891,7 @@ strings_rule(Parser *p) { // STRING+ asdl_seq * a; if ( - (a = _loop1_98_rule(p)) + (a = _loop1_103_rule(p)) ) { res = _PyPegen_concatenate_strings ( p , a ); @@ -7867,7 +8049,7 @@ tuple_rule(Parser *p) if ( (literal = _PyPegen_expect_token(p, 7)) && - (a = _tmp_99_rule(p), 1) + (a = _tmp_104_rule(p), 1) && (literal_1 = _PyPegen_expect_token(p, 8)) ) @@ -7910,7 +8092,7 @@ group_rule(Parser *p) if ( (literal = _PyPegen_expect_token(p, 7)) && - (a = _tmp_100_rule(p)) + (a = _tmp_105_rule(p)) && (literal_1 = _PyPegen_expect_token(p, 8)) ) @@ -8229,7 +8411,7 @@ kvpairs_rule(Parser *p) void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( - (a = _gather_101_rule(p)) + (a = _gather_106_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -8301,7 +8483,7 @@ kvpair_rule(Parser *p) return res; } -// for_if_clauses: ((ASYNC? 'for' star_targets 'in' disjunction (('if' disjunction))*))+ +// for_if_clauses: for_if_clause+ static asdl_seq* for_if_clauses_rule(Parser *p) { @@ -8310,13 +8492,82 @@ for_if_clauses_rule(Parser *p) } asdl_seq* res = NULL; int mark = p->mark; - { // ((ASYNC? 'for' star_targets 'in' disjunction (('if' disjunction))*))+ - asdl_seq * a; + { // for_if_clause+ + asdl_seq * _loop1_108_var; if ( - (a = _loop1_103_rule(p)) + (_loop1_108_var = _loop1_108_rule(p)) ) { - res = a; + res = _loop1_108_var; + goto done; + } + p->mark = mark; + } + res = NULL; + done: + return res; +} + +// for_if_clause: +// | ASYNC 'for' star_targets 'in' disjunction (('if' disjunction))* +// | 'for' star_targets 'in' disjunction (('if' disjunction))* +static comprehension_ty +for_if_clause_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + comprehension_ty res = NULL; + int mark = p->mark; + { // ASYNC 'for' star_targets 'in' disjunction (('if' disjunction))* + expr_ty a; + void *async_var; + expr_ty b; + asdl_seq * c; + void *keyword; + void *keyword_1; + if ( + (async_var = _PyPegen_expect_token(p, ASYNC)) + && + (keyword = _PyPegen_expect_token(p, 517)) + && + (a = star_targets_rule(p)) + && + (keyword_1 = _PyPegen_expect_token(p, 518)) + && + (b = disjunction_rule(p)) + && + (c = _loop0_109_rule(p)) + ) + { + res = CHECK_VERSION ( 6 , "Async comprehensions are" , _Py_comprehension ( a , b , c , 1 , p -> arena ) ); + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + return NULL; + } + goto done; + } + p->mark = mark; + } + { // 'for' star_targets 'in' disjunction (('if' disjunction))* + expr_ty a; + expr_ty b; + asdl_seq * c; + void *keyword; + void *keyword_1; + if ( + (keyword = _PyPegen_expect_token(p, 517)) + && + (a = star_targets_rule(p)) + && + (keyword_1 = _PyPegen_expect_token(p, 518)) + && + (b = disjunction_rule(p)) + && + (c = _loop0_110_rule(p)) + ) + { + res = _Py_comprehension ( a , b , c , 0 , p -> arena ); if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -8479,7 +8730,7 @@ args_rule(Parser *p) if ( (a = starred_expression_rule(p)) && - (b = _tmp_104_rule(p), 1) + (b = _tmp_111_rule(p), 1) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -8528,7 +8779,7 @@ args_rule(Parser *p) if ( (a = named_expression_rule(p)) && - (b = _tmp_105_rule(p), 1) + (b = _tmp_112_rule(p), 1) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -8570,11 +8821,11 @@ kwargs_rule(Parser *p) asdl_seq * b; void *literal; if ( - (a = _gather_106_rule(p)) + (a = _gather_113_rule(p)) && (literal = _PyPegen_expect_token(p, 12)) && - (b = _gather_108_rule(p)) + (b = _gather_115_rule(p)) ) { res = _PyPegen_join_sequences ( p , a , b ); @@ -8587,23 +8838,23 @@ kwargs_rule(Parser *p) p->mark = mark; } { // ','.kwarg_or_starred+ - asdl_seq * _gather_110_var; + asdl_seq * _gather_117_var; if ( - (_gather_110_var = _gather_110_rule(p)) + (_gather_117_var = _gather_117_rule(p)) ) { - res = _gather_110_var; + res = _gather_117_var; goto done; } p->mark = mark; } { // ','.kwarg_or_double_starred+ - asdl_seq * _gather_112_var; + asdl_seq * _gather_119_var; if ( - (_gather_112_var = _gather_112_rule(p)) + (_gather_119_var = _gather_119_rule(p)) ) { - res = _gather_112_var; + res = _gather_119_var; goto done; } p->mark = mark; @@ -8846,7 +9097,7 @@ star_targets_rule(Parser *p) if ( (a = star_target_rule(p)) && - (b = _loop0_114_rule(p)) + (b = _loop0_121_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -8887,7 +9138,7 @@ star_targets_seq_rule(Parser *p) void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( - (a = _gather_115_rule(p)) + (a = _gather_122_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -8935,7 +9186,7 @@ star_target_rule(Parser *p) if ( (literal = _PyPegen_expect_token(p, 16)) && - (a = _tmp_117_rule(p)) + (a = _tmp_124_rule(p)) ) { Token *token = _PyPegen_get_last_nonnwhitespace_token(p); @@ -9324,7 +9575,7 @@ del_targets_rule(Parser *p) void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( - (a = _gather_118_rule(p)) + (a = _gather_125_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -9577,7 +9828,7 @@ targets_rule(Parser *p) void *opt_var; UNUSED(opt_var); // Silence compiler warnings if ( - (a = _gather_120_rule(p)) + (a = _gather_127_rule(p)) && (opt_var = _PyPegen_expect_token(p, 12), 1) ) @@ -10105,7 +10356,7 @@ incorrect_arguments_rule(Parser *p) && (literal = _PyPegen_expect_token(p, 12)) && - (opt_var = _tmp_122_rule(p), 1) + (opt_var = _tmp_129_rule(p), 1) ) { res = RAISE_SYNTAX_ERROR ( "Generator expression must be parenthesized" ); @@ -10240,7 +10491,7 @@ invalid_assignment_rule(Parser *p) && (expression_var_1 = expression_rule(p)) && - (opt_var = _tmp_123_rule(p), 1) + (opt_var = _tmp_130_rule(p), 1) ) { res = RAISE_SYNTAX_ERROR ( "illegal target for annotation" ); @@ -10253,15 +10504,15 @@ invalid_assignment_rule(Parser *p) p->mark = mark; } { // expression ('=' | augassign) (yield_expr | star_expressions) - void *_tmp_124_var; - void *_tmp_125_var; + void *_tmp_131_var; + void *_tmp_132_var; expr_ty a; if ( (a = expression_rule(p)) && - (_tmp_124_var = _tmp_124_rule(p)) + (_tmp_131_var = _tmp_131_rule(p)) && - (_tmp_125_var = _tmp_125_rule(p)) + (_tmp_132_var = _tmp_132_rule(p)) ) { res = RAISE_SYNTAX_ERROR ( "cannot assign to %s" , _PyPegen_get_expr_name ( a ) ); @@ -10319,12 +10570,12 @@ invalid_comprehension_rule(Parser *p) void * res = NULL; int mark = p->mark; { // ('[' | '(' | '{') '*' expression for_if_clauses - void *_tmp_126_var; + void *_tmp_133_var; expr_ty expression_var; asdl_seq* for_if_clauses_var; void *literal; if ( - (_tmp_126_var = _tmp_126_rule(p)) + (_tmp_133_var = _tmp_133_rule(p)) && (literal = _PyPegen_expect_token(p, 16)) && @@ -10358,13 +10609,13 @@ invalid_parameters_rule(Parser *p) void * res = NULL; int mark = p->mark; { // param_no_default* (slash_with_default | param_with_default+) param_no_default - asdl_seq * _loop0_127_var; - void *_tmp_128_var; + asdl_seq * _loop0_134_var; + void *_tmp_135_var; arg_ty param_no_default_var; if ( - (_loop0_127_var = _loop0_127_rule(p)) + (_loop0_134_var = _loop0_134_rule(p)) && - (_tmp_128_var = _tmp_128_rule(p)) + (_tmp_135_var = _tmp_135_rule(p)) && (param_no_default_var = param_no_default_rule(p)) ) @@ -11319,12 +11570,12 @@ _loop1_22_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // (star_targets '=') - void *_tmp_129_var; + void *_tmp_136_var; while ( - (_tmp_129_var = _tmp_129_rule(p)) + (_tmp_136_var = _tmp_136_rule(p)) ) { - res = _tmp_129_var; + res = _tmp_136_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -11646,12 +11897,12 @@ _loop0_30_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // ('.' | '...') - void *_tmp_130_var; + void *_tmp_137_var; while ( - (_tmp_130_var = _tmp_130_rule(p)) + (_tmp_137_var = _tmp_137_rule(p)) ) { - res = _tmp_130_var; + res = _tmp_137_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -11695,12 +11946,12 @@ _loop1_31_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // ('.' | '...') - void *_tmp_131_var; + void *_tmp_138_var; while ( - (_tmp_131_var = _tmp_131_rule(p)) + (_tmp_138_var = _tmp_138_rule(p)) ) { - res = _tmp_131_var; + res = _tmp_138_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -12134,9 +12385,179 @@ _gather_40_rule(Parser *p) return res; } -// _tmp_42: 'as' target -static void * -_tmp_42_rule(Parser *p) +// _loop0_43: ',' with_item +static asdl_seq * +_loop0_43_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + void *res = NULL; + int mark = p->mark; + int start_mark = p->mark; + void **children = PyMem_Malloc(sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "Parser out of memory"); + return NULL; + } + ssize_t children_capacity = 1; + ssize_t n = 0; + { // ',' with_item + withitem_ty elem; + void *literal; + while ( + (literal = _PyPegen_expect_token(p, 12)) + && + (elem = with_item_rule(p)) + ) + { + res = elem; + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + PyMem_Free(children); + return NULL; + } + if (n == children_capacity) { + children_capacity *= 2; + children = PyMem_Realloc(children, children_capacity*sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "realloc None"); + return NULL; + } + } + children[n++] = res; + mark = p->mark; + } + p->mark = mark; + } + asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); + if (!seq) { + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_43"); + PyMem_Free(children); + return NULL; + } + for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); + PyMem_Free(children); + _PyPegen_insert_memo(p, start_mark, _loop0_43_type, seq); + return seq; +} + +// _gather_42: with_item _loop0_43 +static asdl_seq * +_gather_42_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + asdl_seq * res = NULL; + int mark = p->mark; + { // with_item _loop0_43 + withitem_ty elem; + asdl_seq * seq; + if ( + (elem = with_item_rule(p)) + && + (seq = _loop0_43_rule(p)) + ) + { + res = _PyPegen_seq_insert_in_front(p, elem, seq); + goto done; + } + p->mark = mark; + } + res = NULL; + done: + return res; +} + +// _loop0_45: ',' with_item +static asdl_seq * +_loop0_45_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + void *res = NULL; + int mark = p->mark; + int start_mark = p->mark; + void **children = PyMem_Malloc(sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "Parser out of memory"); + return NULL; + } + ssize_t children_capacity = 1; + ssize_t n = 0; + { // ',' with_item + withitem_ty elem; + void *literal; + while ( + (literal = _PyPegen_expect_token(p, 12)) + && + (elem = with_item_rule(p)) + ) + { + res = elem; + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + PyMem_Free(children); + return NULL; + } + if (n == children_capacity) { + children_capacity *= 2; + children = PyMem_Realloc(children, children_capacity*sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "realloc None"); + return NULL; + } + } + children[n++] = res; + mark = p->mark; + } + p->mark = mark; + } + asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); + if (!seq) { + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_45"); + PyMem_Free(children); + return NULL; + } + for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); + PyMem_Free(children); + _PyPegen_insert_memo(p, start_mark, _loop0_45_type, seq); + return seq; +} + +// _gather_44: with_item _loop0_45 +static asdl_seq * +_gather_44_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + asdl_seq * res = NULL; + int mark = p->mark; + { // with_item _loop0_45 + withitem_ty elem; + asdl_seq * seq; + if ( + (elem = with_item_rule(p)) + && + (seq = _loop0_45_rule(p)) + ) + { + res = _PyPegen_seq_insert_in_front(p, elem, seq); + goto done; + } + p->mark = mark; + } + res = NULL; + done: + return res; +} + +// _tmp_46: 'as' target +static void * +_tmp_46_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12166,9 +12587,9 @@ _tmp_42_rule(Parser *p) return res; } -// _loop1_43: except_block +// _loop1_47: except_block static asdl_seq * -_loop1_43_rule(Parser *p) +_loop1_47_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12209,19 +12630,19 @@ _loop1_43_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_43"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_47"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_43_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_47_type, seq); return seq; } -// _tmp_44: 'as' target +// _tmp_48: 'as' target static void * -_tmp_44_rule(Parser *p) +_tmp_48_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12251,9 +12672,9 @@ _tmp_44_rule(Parser *p) return res; } -// _tmp_45: 'from' expression +// _tmp_49: 'from' expression static void * -_tmp_45_rule(Parser *p) +_tmp_49_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12283,9 +12704,41 @@ _tmp_45_rule(Parser *p) return res; } -// _tmp_46: '->' expression +// _tmp_50: '->' expression static void * -_tmp_46_rule(Parser *p) +_tmp_50_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + void * res = NULL; + int mark = p->mark; + { // '->' expression + void *literal; + expr_ty z; + if ( + (literal = _PyPegen_expect_token(p, 51)) + && + (z = expression_rule(p)) + ) + { + res = z; + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + return NULL; + } + goto done; + } + p->mark = mark; + } + res = NULL; + done: + return res; +} + +// _tmp_51: '->' expression +static void * +_tmp_51_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12315,9 +12768,9 @@ _tmp_46_rule(Parser *p) return res; } -// _tmp_47: NEWLINE INDENT +// _tmp_52: NEWLINE INDENT static void * -_tmp_47_rule(Parser *p) +_tmp_52_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12343,9 +12796,9 @@ _tmp_47_rule(Parser *p) return res; } -// _loop0_48: param_no_default +// _loop0_53: param_no_default static asdl_seq * -_loop0_48_rule(Parser *p) +_loop0_53_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12382,19 +12835,19 @@ _loop0_48_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_48"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_53"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_48_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_53_type, seq); return seq; } -// _loop0_49: param_with_default +// _loop0_54: param_with_default static asdl_seq * -_loop0_49_rule(Parser *p) +_loop0_54_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12431,19 +12884,19 @@ _loop0_49_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_49"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_54"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_49_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_54_type, seq); return seq; } -// _loop0_50: param_with_default +// _loop0_55: param_with_default static asdl_seq * -_loop0_50_rule(Parser *p) +_loop0_55_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12480,19 +12933,19 @@ _loop0_50_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_50"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_55"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_50_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_55_type, seq); return seq; } -// _loop1_51: param_no_default +// _loop1_56: param_no_default static asdl_seq * -_loop1_51_rule(Parser *p) +_loop1_56_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12533,19 +12986,19 @@ _loop1_51_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_51"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_56"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_51_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_56_type, seq); return seq; } -// _loop0_52: param_with_default +// _loop0_57: param_with_default static asdl_seq * -_loop0_52_rule(Parser *p) +_loop0_57_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12582,19 +13035,19 @@ _loop0_52_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_52"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_57"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_52_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_57_type, seq); return seq; } -// _loop1_53: param_with_default +// _loop1_58: param_with_default static asdl_seq * -_loop1_53_rule(Parser *p) +_loop1_58_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12635,19 +13088,19 @@ _loop1_53_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_53"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_58"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_53_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_58_type, seq); return seq; } -// _loop1_54: param_no_default +// _loop1_59: param_no_default static asdl_seq * -_loop1_54_rule(Parser *p) +_loop1_59_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12688,19 +13141,19 @@ _loop1_54_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_54"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_59"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_54_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_59_type, seq); return seq; } -// _loop1_55: param_no_default +// _loop1_60: param_no_default static asdl_seq * -_loop1_55_rule(Parser *p) +_loop1_60_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12741,19 +13194,19 @@ _loop1_55_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_55"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_60"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_55_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_60_type, seq); return seq; } -// _loop0_56: param_no_default +// _loop0_61: param_no_default static asdl_seq * -_loop0_56_rule(Parser *p) +_loop0_61_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12790,19 +13243,19 @@ _loop0_56_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_56"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_61"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_56_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_61_type, seq); return seq; } -// _loop1_57: param_with_default +// _loop1_62: param_with_default static asdl_seq * -_loop1_57_rule(Parser *p) +_loop1_62_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12843,19 +13296,19 @@ _loop1_57_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_57"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_62"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_57_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_62_type, seq); return seq; } -// _loop0_58: param_no_default +// _loop0_63: param_no_default static asdl_seq * -_loop0_58_rule(Parser *p) +_loop0_63_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12892,19 +13345,19 @@ _loop0_58_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_58"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_63"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_58_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_63_type, seq); return seq; } -// _loop1_59: param_with_default +// _loop1_64: param_with_default static asdl_seq * -_loop1_59_rule(Parser *p) +_loop1_64_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12945,19 +13398,19 @@ _loop1_59_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_59"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_64"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_59_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_64_type, seq); return seq; } -// _loop0_60: param_maybe_default +// _loop0_65: param_maybe_default static asdl_seq * -_loop0_60_rule(Parser *p) +_loop0_65_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -12994,19 +13447,19 @@ _loop0_60_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_60"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_65"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_60_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_65_type, seq); return seq; } -// _loop1_61: param_maybe_default +// _loop1_66: param_maybe_default static asdl_seq * -_loop1_61_rule(Parser *p) +_loop1_66_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13047,19 +13500,19 @@ _loop1_61_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_61"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_66"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_61_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_66_type, seq); return seq; } -// _loop1_62: ('@' named_expression NEWLINE) +// _loop1_67: ('@' named_expression NEWLINE) static asdl_seq * -_loop1_62_rule(Parser *p) +_loop1_67_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13075,12 +13528,12 @@ _loop1_62_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // ('@' named_expression NEWLINE) - void *_tmp_132_var; + void *_tmp_139_var; while ( - (_tmp_132_var = _tmp_132_rule(p)) + (_tmp_139_var = _tmp_139_rule(p)) ) { - res = _tmp_132_var; + res = _tmp_139_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -13100,19 +13553,19 @@ _loop1_62_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_62"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_67"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_62_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_67_type, seq); return seq; } -// _tmp_63: '(' arguments? ')' +// _tmp_68: '(' arguments? ')' static void * -_tmp_63_rule(Parser *p) +_tmp_68_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13145,9 +13598,9 @@ _tmp_63_rule(Parser *p) return res; } -// _loop0_65: ',' star_expression +// _loop0_70: ',' star_expression static asdl_seq * -_loop0_65_rule(Parser *p) +_loop0_70_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13192,32 +13645,32 @@ _loop0_65_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_65"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_70"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_65_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_70_type, seq); return seq; } -// _gather_64: star_expression _loop0_65 +// _gather_69: star_expression _loop0_70 static asdl_seq * -_gather_64_rule(Parser *p) +_gather_69_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // star_expression _loop0_65 + { // star_expression _loop0_70 expr_ty elem; asdl_seq * seq; if ( (elem = star_expression_rule(p)) && - (seq = _loop0_65_rule(p)) + (seq = _loop0_70_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -13230,9 +13683,9 @@ _gather_64_rule(Parser *p) return res; } -// _loop1_66: (',' star_expression) +// _loop1_71: (',' star_expression) static asdl_seq * -_loop1_66_rule(Parser *p) +_loop1_71_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13248,12 +13701,12 @@ _loop1_66_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // (',' star_expression) - void *_tmp_133_var; + void *_tmp_140_var; while ( - (_tmp_133_var = _tmp_133_rule(p)) + (_tmp_140_var = _tmp_140_rule(p)) ) { - res = _tmp_133_var; + res = _tmp_140_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -13273,19 +13726,19 @@ _loop1_66_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_66"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_71"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_66_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_71_type, seq); return seq; } -// _loop0_68: ',' star_named_expression +// _loop0_73: ',' star_named_expression static asdl_seq * -_loop0_68_rule(Parser *p) +_loop0_73_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13330,32 +13783,32 @@ _loop0_68_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_68"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_73"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_68_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_73_type, seq); return seq; } -// _gather_67: star_named_expression _loop0_68 +// _gather_72: star_named_expression _loop0_73 static asdl_seq * -_gather_67_rule(Parser *p) +_gather_72_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // star_named_expression _loop0_68 + { // star_named_expression _loop0_73 expr_ty elem; asdl_seq * seq; if ( (elem = star_named_expression_rule(p)) && - (seq = _loop0_68_rule(p)) + (seq = _loop0_73_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -13368,9 +13821,9 @@ _gather_67_rule(Parser *p) return res; } -// _loop1_69: (',' expression) +// _loop1_74: (',' expression) static asdl_seq * -_loop1_69_rule(Parser *p) +_loop1_74_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13386,12 +13839,12 @@ _loop1_69_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // (',' expression) - void *_tmp_134_var; + void *_tmp_141_var; while ( - (_tmp_134_var = _tmp_134_rule(p)) + (_tmp_141_var = _tmp_141_rule(p)) ) { - res = _tmp_134_var; + res = _tmp_141_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -13411,19 +13864,19 @@ _loop1_69_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_69"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_74"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_69_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_74_type, seq); return seq; } -// _tmp_70: ',' lambda_plain_names +// _tmp_75: ',' lambda_plain_names static void * -_tmp_70_rule(Parser *p) +_tmp_75_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13453,9 +13906,9 @@ _tmp_70_rule(Parser *p) return res; } -// _tmp_71: ',' lambda_names_with_default +// _tmp_76: ',' lambda_names_with_default static void * -_tmp_71_rule(Parser *p) +_tmp_76_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13485,9 +13938,9 @@ _tmp_71_rule(Parser *p) return res; } -// _tmp_72: ',' lambda_star_etc? +// _tmp_77: ',' lambda_star_etc? static void * -_tmp_72_rule(Parser *p) +_tmp_77_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13517,9 +13970,9 @@ _tmp_72_rule(Parser *p) return res; } -// _tmp_73: ',' lambda_names_with_default +// _tmp_78: ',' lambda_names_with_default static void * -_tmp_73_rule(Parser *p) +_tmp_78_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13549,9 +14002,9 @@ _tmp_73_rule(Parser *p) return res; } -// _tmp_74: ',' lambda_star_etc? +// _tmp_79: ',' lambda_star_etc? static void * -_tmp_74_rule(Parser *p) +_tmp_79_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13581,9 +14034,9 @@ _tmp_74_rule(Parser *p) return res; } -// _tmp_75: ',' lambda_names_with_default +// _tmp_80: ',' lambda_names_with_default static void * -_tmp_75_rule(Parser *p) +_tmp_80_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13613,9 +14066,9 @@ _tmp_75_rule(Parser *p) return res; } -// _tmp_76: ',' lambda_star_etc? +// _tmp_81: ',' lambda_star_etc? static void * -_tmp_76_rule(Parser *p) +_tmp_81_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13645,9 +14098,9 @@ _tmp_76_rule(Parser *p) return res; } -// _tmp_77: ',' lambda_star_etc? +// _tmp_82: ',' lambda_star_etc? static void * -_tmp_77_rule(Parser *p) +_tmp_82_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13677,9 +14130,9 @@ _tmp_77_rule(Parser *p) return res; } -// _tmp_78: lambda_plain_names ',' +// _tmp_83: lambda_plain_names ',' static void * -_tmp_78_rule(Parser *p) +_tmp_83_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13709,9 +14162,9 @@ _tmp_78_rule(Parser *p) return res; } -// _loop0_79: lambda_name_with_optional_default +// _loop0_84: lambda_name_with_optional_default static asdl_seq * -_loop0_79_rule(Parser *p) +_loop0_84_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13748,19 +14201,19 @@ _loop0_79_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_79"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_84"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_79_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_84_type, seq); return seq; } -// _tmp_80: ',' lambda_kwds +// _tmp_85: ',' lambda_kwds static void * -_tmp_80_rule(Parser *p) +_tmp_85_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13790,9 +14243,9 @@ _tmp_80_rule(Parser *p) return res; } -// _loop1_81: lambda_name_with_optional_default +// _loop1_86: lambda_name_with_optional_default static asdl_seq * -_loop1_81_rule(Parser *p) +_loop1_86_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13833,19 +14286,19 @@ _loop1_81_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_81"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_86"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_81_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_86_type, seq); return seq; } -// _tmp_82: ',' lambda_kwds +// _tmp_87: ',' lambda_kwds static void * -_tmp_82_rule(Parser *p) +_tmp_87_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13875,9 +14328,9 @@ _tmp_82_rule(Parser *p) return res; } -// _tmp_83: '=' expression +// _tmp_88: '=' expression static void * -_tmp_83_rule(Parser *p) +_tmp_88_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13907,9 +14360,9 @@ _tmp_83_rule(Parser *p) return res; } -// _loop0_85: ',' lambda_name_with_default +// _loop0_90: ',' lambda_name_with_default static asdl_seq * -_loop0_85_rule(Parser *p) +_loop0_90_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -13954,32 +14407,32 @@ _loop0_85_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_85"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_90"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_85_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_90_type, seq); return seq; } -// _gather_84: lambda_name_with_default _loop0_85 +// _gather_89: lambda_name_with_default _loop0_90 static asdl_seq * -_gather_84_rule(Parser *p) +_gather_89_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // lambda_name_with_default _loop0_85 + { // lambda_name_with_default _loop0_90 NameDefaultPair* elem; asdl_seq * seq; if ( (elem = lambda_name_with_default_rule(p)) && - (seq = _loop0_85_rule(p)) + (seq = _loop0_90_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -13992,9 +14445,9 @@ _gather_84_rule(Parser *p) return res; } -// _loop0_87: ',' (lambda_plain_name !'=') +// _loop0_92: ',' (lambda_plain_name !'=') static asdl_seq * -_loop0_87_rule(Parser *p) +_loop0_92_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14015,7 +14468,7 @@ _loop0_87_rule(Parser *p) while ( (literal = _PyPegen_expect_token(p, 12)) && - (elem = _tmp_135_rule(p)) + (elem = _tmp_142_rule(p)) ) { res = elem; @@ -14039,32 +14492,32 @@ _loop0_87_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_87"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_92"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_87_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_92_type, seq); return seq; } -// _gather_86: (lambda_plain_name !'=') _loop0_87 +// _gather_91: (lambda_plain_name !'=') _loop0_92 static asdl_seq * -_gather_86_rule(Parser *p) +_gather_91_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // (lambda_plain_name !'=') _loop0_87 + { // (lambda_plain_name !'=') _loop0_92 void *elem; asdl_seq * seq; if ( - (elem = _tmp_135_rule(p)) + (elem = _tmp_142_rule(p)) && - (seq = _loop0_87_rule(p)) + (seq = _loop0_92_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -14077,9 +14530,9 @@ _gather_86_rule(Parser *p) return res; } -// _loop1_88: ('or' conjunction) +// _loop1_93: ('or' conjunction) static asdl_seq * -_loop1_88_rule(Parser *p) +_loop1_93_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14095,12 +14548,12 @@ _loop1_88_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // ('or' conjunction) - void *_tmp_136_var; + void *_tmp_143_var; while ( - (_tmp_136_var = _tmp_136_rule(p)) + (_tmp_143_var = _tmp_143_rule(p)) ) { - res = _tmp_136_var; + res = _tmp_143_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -14120,19 +14573,19 @@ _loop1_88_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_88"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_93"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_88_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_93_type, seq); return seq; } -// _loop1_89: ('and' inversion) +// _loop1_94: ('and' inversion) static asdl_seq * -_loop1_89_rule(Parser *p) +_loop1_94_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14148,12 +14601,12 @@ _loop1_89_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // ('and' inversion) - void *_tmp_137_var; + void *_tmp_144_var; while ( - (_tmp_137_var = _tmp_137_rule(p)) + (_tmp_144_var = _tmp_144_rule(p)) ) { - res = _tmp_137_var; + res = _tmp_144_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -14173,19 +14626,19 @@ _loop1_89_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_89"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_94"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_89_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_94_type, seq); return seq; } -// _loop1_90: compare_op_bitwise_or_pair +// _loop1_95: compare_op_bitwise_or_pair static asdl_seq * -_loop1_90_rule(Parser *p) +_loop1_95_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14226,19 +14679,19 @@ _loop1_90_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_90"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_95"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_90_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_95_type, seq); return seq; } -// _tmp_91: '!=' +// _tmp_96: '!=' static void * -_tmp_91_rule(Parser *p) +_tmp_96_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14265,9 +14718,9 @@ _tmp_91_rule(Parser *p) return res; } -// _loop0_93: ',' slice +// _loop0_98: ',' slice static asdl_seq * -_loop0_93_rule(Parser *p) +_loop0_98_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14312,32 +14765,32 @@ _loop0_93_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_93"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_98"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_93_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_98_type, seq); return seq; } -// _gather_92: slice _loop0_93 +// _gather_97: slice _loop0_98 static asdl_seq * -_gather_92_rule(Parser *p) +_gather_97_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // slice _loop0_93 + { // slice _loop0_98 expr_ty elem; asdl_seq * seq; if ( (elem = slice_rule(p)) && - (seq = _loop0_93_rule(p)) + (seq = _loop0_98_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -14350,9 +14803,9 @@ _gather_92_rule(Parser *p) return res; } -// _tmp_94: ':' expression? +// _tmp_99: ':' expression? static void * -_tmp_94_rule(Parser *p) +_tmp_99_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14382,9 +14835,9 @@ _tmp_94_rule(Parser *p) return res; } -// _tmp_95: tuple | group | genexp +// _tmp_100: tuple | group | genexp static void * -_tmp_95_rule(Parser *p) +_tmp_100_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14429,9 +14882,9 @@ _tmp_95_rule(Parser *p) return res; } -// _tmp_96: list | listcomp +// _tmp_101: list | listcomp static void * -_tmp_96_rule(Parser *p) +_tmp_101_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14465,9 +14918,9 @@ _tmp_96_rule(Parser *p) return res; } -// _tmp_97: dict | set | dictcomp | setcomp +// _tmp_102: dict | set | dictcomp | setcomp static void * -_tmp_97_rule(Parser *p) +_tmp_102_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14523,9 +14976,9 @@ _tmp_97_rule(Parser *p) return res; } -// _loop1_98: STRING +// _loop1_103: STRING static asdl_seq * -_loop1_98_rule(Parser *p) +_loop1_103_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14566,19 +15019,19 @@ _loop1_98_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_98"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_103"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_98_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_103_type, seq); return seq; } -// _tmp_99: star_named_expression ',' star_named_expressions? +// _tmp_104: star_named_expression ',' star_named_expressions? static void * -_tmp_99_rule(Parser *p) +_tmp_104_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14611,9 +15064,9 @@ _tmp_99_rule(Parser *p) return res; } -// _tmp_100: yield_expr | named_expression +// _tmp_105: yield_expr | named_expression static void * -_tmp_100_rule(Parser *p) +_tmp_105_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14647,9 +15100,9 @@ _tmp_100_rule(Parser *p) return res; } -// _loop0_102: ',' kvpair +// _loop0_107: ',' kvpair static asdl_seq * -_loop0_102_rule(Parser *p) +_loop0_107_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14694,32 +15147,32 @@ _loop0_102_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_102"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_107"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_102_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_107_type, seq); return seq; } -// _gather_101: kvpair _loop0_102 +// _gather_106: kvpair _loop0_107 static asdl_seq * -_gather_101_rule(Parser *p) +_gather_106_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // kvpair _loop0_102 + { // kvpair _loop0_107 KeyValuePair* elem; asdl_seq * seq; if ( (elem = kvpair_rule(p)) && - (seq = _loop0_102_rule(p)) + (seq = _loop0_107_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -14732,9 +15185,9 @@ _gather_101_rule(Parser *p) return res; } -// _loop1_103: (ASYNC? 'for' star_targets 'in' disjunction (('if' disjunction))*) +// _loop1_108: for_if_clause static asdl_seq * -_loop1_103_rule(Parser *p) +_loop1_108_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14749,13 +15202,13 @@ _loop1_103_rule(Parser *p) } ssize_t children_capacity = 1; ssize_t n = 0; - { // (ASYNC? 'for' star_targets 'in' disjunction (('if' disjunction))*) - void *_tmp_138_var; + { // for_if_clause + comprehension_ty for_if_clause_var; while ( - (_tmp_138_var = _tmp_138_rule(p)) + (for_if_clause_var = for_if_clause_rule(p)) ) { - res = _tmp_138_var; + res = for_if_clause_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -14775,19 +15228,117 @@ _loop1_103_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_103"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_108"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_103_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_108_type, seq); + return seq; +} + +// _loop0_109: ('if' disjunction) +static asdl_seq * +_loop0_109_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + void *res = NULL; + int mark = p->mark; + int start_mark = p->mark; + void **children = PyMem_Malloc(sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "Parser out of memory"); + return NULL; + } + ssize_t children_capacity = 1; + ssize_t n = 0; + { // ('if' disjunction) + void *_tmp_145_var; + while ( + (_tmp_145_var = _tmp_145_rule(p)) + ) + { + res = _tmp_145_var; + if (n == children_capacity) { + children_capacity *= 2; + children = PyMem_Realloc(children, children_capacity*sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "realloc None"); + return NULL; + } + } + children[n++] = res; + mark = p->mark; + } + p->mark = mark; + } + asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); + if (!seq) { + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_109"); + PyMem_Free(children); + return NULL; + } + for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); + PyMem_Free(children); + _PyPegen_insert_memo(p, start_mark, _loop0_109_type, seq); return seq; } -// _tmp_104: ',' args +// _loop0_110: ('if' disjunction) +static asdl_seq * +_loop0_110_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + void *res = NULL; + int mark = p->mark; + int start_mark = p->mark; + void **children = PyMem_Malloc(sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "Parser out of memory"); + return NULL; + } + ssize_t children_capacity = 1; + ssize_t n = 0; + { // ('if' disjunction) + void *_tmp_146_var; + while ( + (_tmp_146_var = _tmp_146_rule(p)) + ) + { + res = _tmp_146_var; + if (n == children_capacity) { + children_capacity *= 2; + children = PyMem_Realloc(children, children_capacity*sizeof(void *)); + if (!children) { + PyErr_Format(PyExc_MemoryError, "realloc None"); + return NULL; + } + } + children[n++] = res; + mark = p->mark; + } + p->mark = mark; + } + asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); + if (!seq) { + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_110"); + PyMem_Free(children); + return NULL; + } + for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); + PyMem_Free(children); + _PyPegen_insert_memo(p, start_mark, _loop0_110_type, seq); + return seq; +} + +// _tmp_111: ',' args static void * -_tmp_104_rule(Parser *p) +_tmp_111_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14817,9 +15368,9 @@ _tmp_104_rule(Parser *p) return res; } -// _tmp_105: ',' args +// _tmp_112: ',' args static void * -_tmp_105_rule(Parser *p) +_tmp_112_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14849,9 +15400,9 @@ _tmp_105_rule(Parser *p) return res; } -// _loop0_107: ',' kwarg_or_starred +// _loop0_114: ',' kwarg_or_starred static asdl_seq * -_loop0_107_rule(Parser *p) +_loop0_114_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14896,32 +15447,32 @@ _loop0_107_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_107"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_114"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_107_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_114_type, seq); return seq; } -// _gather_106: kwarg_or_starred _loop0_107 +// _gather_113: kwarg_or_starred _loop0_114 static asdl_seq * -_gather_106_rule(Parser *p) +_gather_113_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // kwarg_or_starred _loop0_107 + { // kwarg_or_starred _loop0_114 KeywordOrStarred* elem; asdl_seq * seq; if ( (elem = kwarg_or_starred_rule(p)) && - (seq = _loop0_107_rule(p)) + (seq = _loop0_114_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -14934,9 +15485,9 @@ _gather_106_rule(Parser *p) return res; } -// _loop0_109: ',' kwarg_or_double_starred +// _loop0_116: ',' kwarg_or_double_starred static asdl_seq * -_loop0_109_rule(Parser *p) +_loop0_116_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -14981,32 +15532,32 @@ _loop0_109_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_109"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_116"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_109_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_116_type, seq); return seq; } -// _gather_108: kwarg_or_double_starred _loop0_109 +// _gather_115: kwarg_or_double_starred _loop0_116 static asdl_seq * -_gather_108_rule(Parser *p) +_gather_115_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // kwarg_or_double_starred _loop0_109 + { // kwarg_or_double_starred _loop0_116 KeywordOrStarred* elem; asdl_seq * seq; if ( (elem = kwarg_or_double_starred_rule(p)) && - (seq = _loop0_109_rule(p)) + (seq = _loop0_116_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -15019,9 +15570,9 @@ _gather_108_rule(Parser *p) return res; } -// _loop0_111: ',' kwarg_or_starred +// _loop0_118: ',' kwarg_or_starred static asdl_seq * -_loop0_111_rule(Parser *p) +_loop0_118_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15066,32 +15617,32 @@ _loop0_111_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_111"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_118"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_111_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_118_type, seq); return seq; } -// _gather_110: kwarg_or_starred _loop0_111 +// _gather_117: kwarg_or_starred _loop0_118 static asdl_seq * -_gather_110_rule(Parser *p) +_gather_117_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // kwarg_or_starred _loop0_111 + { // kwarg_or_starred _loop0_118 KeywordOrStarred* elem; asdl_seq * seq; if ( (elem = kwarg_or_starred_rule(p)) && - (seq = _loop0_111_rule(p)) + (seq = _loop0_118_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -15104,9 +15655,9 @@ _gather_110_rule(Parser *p) return res; } -// _loop0_113: ',' kwarg_or_double_starred +// _loop0_120: ',' kwarg_or_double_starred static asdl_seq * -_loop0_113_rule(Parser *p) +_loop0_120_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15151,32 +15702,32 @@ _loop0_113_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_113"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_120"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_113_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_120_type, seq); return seq; } -// _gather_112: kwarg_or_double_starred _loop0_113 +// _gather_119: kwarg_or_double_starred _loop0_120 static asdl_seq * -_gather_112_rule(Parser *p) +_gather_119_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // kwarg_or_double_starred _loop0_113 + { // kwarg_or_double_starred _loop0_120 KeywordOrStarred* elem; asdl_seq * seq; if ( (elem = kwarg_or_double_starred_rule(p)) && - (seq = _loop0_113_rule(p)) + (seq = _loop0_120_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -15189,9 +15740,9 @@ _gather_112_rule(Parser *p) return res; } -// _loop0_114: (',' star_target) +// _loop0_121: (',' star_target) static asdl_seq * -_loop0_114_rule(Parser *p) +_loop0_121_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15207,12 +15758,12 @@ _loop0_114_rule(Parser *p) ssize_t children_capacity = 1; ssize_t n = 0; { // (',' star_target) - void *_tmp_139_var; + void *_tmp_147_var; while ( - (_tmp_139_var = _tmp_139_rule(p)) + (_tmp_147_var = _tmp_147_rule(p)) ) { - res = _tmp_139_var; + res = _tmp_147_var; if (n == children_capacity) { children_capacity *= 2; children = PyMem_Realloc(children, children_capacity*sizeof(void *)); @@ -15228,19 +15779,19 @@ _loop0_114_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_114"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_121"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_114_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_121_type, seq); return seq; } -// _loop0_116: ',' star_target +// _loop0_123: ',' star_target static asdl_seq * -_loop0_116_rule(Parser *p) +_loop0_123_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15285,32 +15836,32 @@ _loop0_116_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_116"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_123"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_116_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_123_type, seq); return seq; } -// _gather_115: star_target _loop0_116 +// _gather_122: star_target _loop0_123 static asdl_seq * -_gather_115_rule(Parser *p) +_gather_122_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // star_target _loop0_116 + { // star_target _loop0_123 expr_ty elem; asdl_seq * seq; if ( (elem = star_target_rule(p)) && - (seq = _loop0_116_rule(p)) + (seq = _loop0_123_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -15323,9 +15874,9 @@ _gather_115_rule(Parser *p) return res; } -// _tmp_117: !'*' star_target +// _tmp_124: !'*' star_target static void * -_tmp_117_rule(Parser *p) +_tmp_124_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15350,9 +15901,9 @@ _tmp_117_rule(Parser *p) return res; } -// _loop0_119: ',' del_target +// _loop0_126: ',' del_target static asdl_seq * -_loop0_119_rule(Parser *p) +_loop0_126_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15397,32 +15948,32 @@ _loop0_119_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_119"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_126"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_119_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_126_type, seq); return seq; } -// _gather_118: del_target _loop0_119 +// _gather_125: del_target _loop0_126 static asdl_seq * -_gather_118_rule(Parser *p) +_gather_125_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // del_target _loop0_119 + { // del_target _loop0_126 expr_ty elem; asdl_seq * seq; if ( (elem = del_target_rule(p)) && - (seq = _loop0_119_rule(p)) + (seq = _loop0_126_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -15435,9 +15986,9 @@ _gather_118_rule(Parser *p) return res; } -// _loop0_121: ',' target +// _loop0_128: ',' target static asdl_seq * -_loop0_121_rule(Parser *p) +_loop0_128_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15482,32 +16033,32 @@ _loop0_121_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_121"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_128"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_121_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_128_type, seq); return seq; } -// _gather_120: target _loop0_121 +// _gather_127: target _loop0_128 static asdl_seq * -_gather_120_rule(Parser *p) +_gather_127_rule(Parser *p) { if (p->error_indicator) { return NULL; } asdl_seq * res = NULL; int mark = p->mark; - { // target _loop0_121 + { // target _loop0_128 expr_ty elem; asdl_seq * seq; if ( (elem = target_rule(p)) && - (seq = _loop0_121_rule(p)) + (seq = _loop0_128_rule(p)) ) { res = _PyPegen_seq_insert_in_front(p, elem, seq); @@ -15520,9 +16071,9 @@ _gather_120_rule(Parser *p) return res; } -// _tmp_122: args | expression for_if_clauses +// _tmp_129: args | expression for_if_clauses static void * -_tmp_122_rule(Parser *p) +_tmp_129_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15559,9 +16110,9 @@ _tmp_122_rule(Parser *p) return res; } -// _tmp_123: '=' annotated_rhs +// _tmp_130: '=' annotated_rhs static void * -_tmp_123_rule(Parser *p) +_tmp_130_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15587,9 +16138,9 @@ _tmp_123_rule(Parser *p) return res; } -// _tmp_124: '=' | augassign +// _tmp_131: '=' | augassign static void * -_tmp_124_rule(Parser *p) +_tmp_131_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15623,9 +16174,9 @@ _tmp_124_rule(Parser *p) return res; } -// _tmp_125: yield_expr | star_expressions +// _tmp_132: yield_expr | star_expressions static void * -_tmp_125_rule(Parser *p) +_tmp_132_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15659,9 +16210,9 @@ _tmp_125_rule(Parser *p) return res; } -// _tmp_126: '[' | '(' | '{' +// _tmp_133: '[' | '(' | '{' static void * -_tmp_126_rule(Parser *p) +_tmp_133_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15706,9 +16257,9 @@ _tmp_126_rule(Parser *p) return res; } -// _loop0_127: param_no_default +// _loop0_134: param_no_default static asdl_seq * -_loop0_127_rule(Parser *p) +_loop0_134_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15745,19 +16296,19 @@ _loop0_127_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_127"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_134"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_127_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop0_134_type, seq); return seq; } -// _tmp_128: slash_with_default | param_with_default+ +// _tmp_135: slash_with_default | param_with_default+ static void * -_tmp_128_rule(Parser *p) +_tmp_135_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15776,12 +16327,12 @@ _tmp_128_rule(Parser *p) p->mark = mark; } { // param_with_default+ - asdl_seq * _loop1_140_var; + asdl_seq * _loop1_148_var; if ( - (_loop1_140_var = _loop1_140_rule(p)) + (_loop1_148_var = _loop1_148_rule(p)) ) { - res = _loop1_140_var; + res = _loop1_148_var; goto done; } p->mark = mark; @@ -15791,9 +16342,9 @@ _tmp_128_rule(Parser *p) return res; } -// _tmp_129: star_targets '=' +// _tmp_136: star_targets '=' static void * -_tmp_129_rule(Parser *p) +_tmp_136_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15823,9 +16374,9 @@ _tmp_129_rule(Parser *p) return res; } -// _tmp_130: '.' | '...' +// _tmp_137: '.' | '...' static void * -_tmp_130_rule(Parser *p) +_tmp_137_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15859,9 +16410,9 @@ _tmp_130_rule(Parser *p) return res; } -// _tmp_131: '.' | '...' +// _tmp_138: '.' | '...' static void * -_tmp_131_rule(Parser *p) +_tmp_138_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15895,9 +16446,9 @@ _tmp_131_rule(Parser *p) return res; } -// _tmp_132: '@' named_expression NEWLINE +// _tmp_139: '@' named_expression NEWLINE static void * -_tmp_132_rule(Parser *p) +_tmp_139_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15930,9 +16481,9 @@ _tmp_132_rule(Parser *p) return res; } -// _tmp_133: ',' star_expression +// _tmp_140: ',' star_expression static void * -_tmp_133_rule(Parser *p) +_tmp_140_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15962,9 +16513,9 @@ _tmp_133_rule(Parser *p) return res; } -// _tmp_134: ',' expression +// _tmp_141: ',' expression static void * -_tmp_134_rule(Parser *p) +_tmp_141_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -15994,9 +16545,9 @@ _tmp_134_rule(Parser *p) return res; } -// _tmp_135: lambda_plain_name !'=' +// _tmp_142: lambda_plain_name !'=' static void * -_tmp_135_rule(Parser *p) +_tmp_142_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -16021,9 +16572,9 @@ _tmp_135_rule(Parser *p) return res; } -// _tmp_136: 'or' conjunction +// _tmp_143: 'or' conjunction static void * -_tmp_136_rule(Parser *p) +_tmp_143_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -16053,9 +16604,9 @@ _tmp_136_rule(Parser *p) return res; } -// _tmp_137: 'and' inversion +// _tmp_144: 'and' inversion static void * -_tmp_137_rule(Parser *p) +_tmp_144_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -16085,37 +16636,57 @@ _tmp_137_rule(Parser *p) return res; } -// _tmp_138: ASYNC? 'for' star_targets 'in' disjunction (('if' disjunction))* +// _tmp_145: 'if' disjunction static void * -_tmp_138_rule(Parser *p) +_tmp_145_rule(Parser *p) { if (p->error_indicator) { return NULL; } void * res = NULL; int mark = p->mark; - { // ASYNC? 'for' star_targets 'in' disjunction (('if' disjunction))* - expr_ty a; - expr_ty b; - asdl_seq * c; + { // 'if' disjunction void *keyword; - void *keyword_1; - void *y; + expr_ty z; if ( - (y = _PyPegen_expect_token(p, ASYNC), 1) - && - (keyword = _PyPegen_expect_token(p, 517)) - && - (a = star_targets_rule(p)) - && - (keyword_1 = _PyPegen_expect_token(p, 518)) + (keyword = _PyPegen_expect_token(p, 510)) && - (b = disjunction_rule(p)) + (z = disjunction_rule(p)) + ) + { + res = z; + if (res == NULL && PyErr_Occurred()) { + p->error_indicator = 1; + return NULL; + } + goto done; + } + p->mark = mark; + } + res = NULL; + done: + return res; +} + +// _tmp_146: 'if' disjunction +static void * +_tmp_146_rule(Parser *p) +{ + if (p->error_indicator) { + return NULL; + } + void * res = NULL; + int mark = p->mark; + { // 'if' disjunction + void *keyword; + expr_ty z; + if ( + (keyword = _PyPegen_expect_token(p, 510)) && - (c = _loop0_141_rule(p)) + (z = disjunction_rule(p)) ) { - res = _Py_comprehension ( a , b , c , y != NULL , p -> arena ); + res = z; if (res == NULL && PyErr_Occurred()) { p->error_indicator = 1; return NULL; @@ -16129,9 +16700,9 @@ _tmp_138_rule(Parser *p) return res; } -// _tmp_139: ',' star_target +// _tmp_147: ',' star_target static void * -_tmp_139_rule(Parser *p) +_tmp_147_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -16161,9 +16732,9 @@ _tmp_139_rule(Parser *p) return res; } -// _loop1_140: param_with_default +// _loop1_148: param_with_default static asdl_seq * -_loop1_140_rule(Parser *p) +_loop1_148_rule(Parser *p) { if (p->error_indicator) { return NULL; @@ -16204,97 +16775,16 @@ _loop1_140_rule(Parser *p) } asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_140"); - PyMem_Free(children); - return NULL; - } - for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); - PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop1_140_type, seq); - return seq; -} - -// _loop0_141: ('if' disjunction) -static asdl_seq * -_loop0_141_rule(Parser *p) -{ - if (p->error_indicator) { - return NULL; - } - void *res = NULL; - int mark = p->mark; - int start_mark = p->mark; - void **children = PyMem_Malloc(sizeof(void *)); - if (!children) { - PyErr_Format(PyExc_MemoryError, "Parser out of memory"); - return NULL; - } - ssize_t children_capacity = 1; - ssize_t n = 0; - { // ('if' disjunction) - void *_tmp_142_var; - while ( - (_tmp_142_var = _tmp_142_rule(p)) - ) - { - res = _tmp_142_var; - if (n == children_capacity) { - children_capacity *= 2; - children = PyMem_Realloc(children, children_capacity*sizeof(void *)); - if (!children) { - PyErr_Format(PyExc_MemoryError, "realloc None"); - return NULL; - } - } - children[n++] = res; - mark = p->mark; - } - p->mark = mark; - } - asdl_seq *seq = _Py_asdl_seq_new(n, p->arena); - if (!seq) { - PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop0_141"); + PyErr_Format(PyExc_MemoryError, "asdl_seq_new _loop1_148"); PyMem_Free(children); return NULL; } for (int i = 0; i < n; i++) asdl_seq_SET(seq, i, children[i]); PyMem_Free(children); - _PyPegen_insert_memo(p, start_mark, _loop0_141_type, seq); + _PyPegen_insert_memo(p, start_mark, _loop1_148_type, seq); return seq; } -// _tmp_142: 'if' disjunction -static void * -_tmp_142_rule(Parser *p) -{ - if (p->error_indicator) { - return NULL; - } - void * res = NULL; - int mark = p->mark; - { // 'if' disjunction - void *keyword; - expr_ty z; - if ( - (keyword = _PyPegen_expect_token(p, 510)) - && - (z = disjunction_rule(p)) - ) - { - res = z; - if (res == NULL && PyErr_Occurred()) { - p->error_indicator = 1; - return NULL; - } - goto done; - } - p->mark = mark; - } - res = NULL; - done: - return res; -} - void * _PyPegen_parse(Parser *p) { diff --git a/Parser/pegen/parse_string.c b/Parser/pegen/parse_string.c index 834239e23fa87..d96303dc183fa 100644 --- a/Parser/pegen/parse_string.c +++ b/Parser/pegen/parse_string.c @@ -179,6 +179,13 @@ _PyPegen_parsestr(Parser *p, const char *s, int *bytesmode, int *rawmode, PyObje } } + /* fstrings are only allowed in Python 3.6 and greater */ + if (fmode && p->feature_version < 6) { + p->error_indicator = 1; + RAISE_SYNTAX_ERROR("Format strings are only supported in Python 3.6 and greater"); + return -1; + } + if (fmode && *bytesmode) { PyErr_BadInternalCall(); return -1; @@ -595,7 +602,8 @@ fstring_compile_expr(Parser *p, const char *expr_start, const char *expr_end, return NULL; } - Parser *p2 = _PyPegen_Parser_New(tok, Py_fstring_input, p->flags, NULL, p->arena); + Parser *p2 = _PyPegen_Parser_New(tok, Py_fstring_input, p->flags, p->feature_version, + NULL, p->arena); p2->starting_lineno = p->starting_lineno + p->tok->first_lineno - 1; p2->starting_col_offset = p->tok->first_lineno == p->tok->lineno ? p->starting_col_offset + t->col_offset : 0; diff --git a/Parser/pegen/pegen.c b/Parser/pegen/pegen.c index 5a2491c181f98..40c09ffcc3a64 100644 --- a/Parser/pegen/pegen.c +++ b/Parser/pegen/pegen.c @@ -933,11 +933,16 @@ _PyPegen_number_token(Parser *p) } char *num_raw = PyBytes_AsString(t->bytes); - if (num_raw == NULL) { return NULL; } + if (p->feature_version < 6 && strchr(num_raw, '_') != NULL) { + p->error_indicator = 1; + return RAISE_SYNTAX_ERROR("Underscores in numeric literals are only supported" + "in Python 3.6 and greater"); + } + PyObject *c = parsenumber(num_raw); if (c == NULL) { @@ -1030,12 +1035,15 @@ compute_parser_flags(PyCompilerFlags *flags) if (flags->cf_flags & PyCF_TYPE_COMMENTS) { parser_flags |= PyPARSE_TYPE_COMMENTS; } + if (flags->cf_feature_version < 7) { + parser_flags |= PyPARSE_ASYNC_HACKS; + } return parser_flags; } Parser * _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags, - int *errcode, PyArena *arena) + int feature_version, int *errcode, PyArena *arena) { Parser *p = PyMem_Malloc(sizeof(Parser)); if (p == NULL) { @@ -1077,6 +1085,7 @@ _PyPegen_Parser_New(struct tok_state *tok, int start_rule, int flags, p->starting_lineno = 0; p->starting_col_offset = 0; p->flags = flags; + p->feature_version = feature_version; return p; } @@ -1138,7 +1147,8 @@ _PyPegen_run_parser_from_file_pointer(FILE *fp, int start_rule, PyObject *filena mod_ty result = NULL; int parser_flags = compute_parser_flags(flags); - Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, errcode, arena); + Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, PY_MINOR_VERSION, + errcode, arena); if (p == NULL) { goto error; } @@ -1194,9 +1204,12 @@ _PyPegen_run_parser_from_string(const char *str, int start_rule, PyObject *filen mod_ty result = NULL; int parser_flags = compute_parser_flags(flags); + int feature_version = flags ? flags->cf_feature_version : PY_MINOR_VERSION; tok->type_comments = (parser_flags & PyPARSE_TYPE_COMMENTS) > 0; + tok->async_hacks = (parser_flags & PyPARSE_ASYNC_HACKS) > 0; - Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, NULL, arena); + Parser *p = _PyPegen_Parser_New(tok, start_rule, parser_flags, feature_version, + NULL, arena); if (p == NULL) { goto error; } diff --git a/Parser/pegen/pegen.h b/Parser/pegen/pegen.h index 3af4bb29aa177..1620f92609472 100644 --- a/Parser/pegen/pegen.h +++ b/Parser/pegen/pegen.h @@ -69,6 +69,7 @@ typedef struct { int starting_col_offset; int error_indicator; int flags; + int feature_version; growable_comment_array type_ignore_comments; } Parser; @@ -180,9 +181,26 @@ NEW_TYPE_COMMENT(Parser *p, Token *tc) return NULL; } +Py_LOCAL_INLINE(void *) +INVALID_VERSION_CHECK(Parser *p, int version, char *msg, void *node) +{ + if (node == NULL) { + p->error_indicator = 1; // Inline CHECK_CALL + return NULL; + } + if (p->feature_version < version) { + p->error_indicator = 1; + return _PyPegen_raise_error(p, PyExc_SyntaxError, "%s only supported in Python 3.%i and greater", + msg, version); + } + return node; +} + +#define CHECK_VERSION(version, msg, node) INVALID_VERSION_CHECK(p, version, msg, node) + arg_ty _PyPegen_add_type_comment_to_arg(Parser *, arg_ty, Token *); PyObject *_PyPegen_new_identifier(Parser *, char *); -Parser *_PyPegen_Parser_New(struct tok_state *, int, int, int *, PyArena *); +Parser *_PyPegen_Parser_New(struct tok_state *, int, int, int, int *, PyArena *); void _PyPegen_Parser_Free(Parser *); mod_ty _PyPegen_run_parser_from_file_pointer(FILE *, int, PyObject *, const char *, const char *, const char *, PyCompilerFlags *, int *, PyArena *);

1 0

bpo-40443: Remove unused imports in stdlib (GH-19815)
by Victor Stinner 01 May '20

01 May '20

https://github.com/python/cpython/commit/eb0d359b4b0e14552998e7af771a088b4f… commit: eb0d359b4b0e14552998e7af771a088b4fd01745 branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-05-01T02:38:00+02:00 summary: bpo-40443: Remove unused imports in stdlib (GH-19815) files: M Lib/importlib/resources.py M Lib/multiprocessing/pool.py M Lib/ssl.py diff --git a/Lib/importlib/resources.py b/Lib/importlib/resources.py index fc3a1c9cabe63..f51886557466c 100644 --- a/Lib/importlib/resources.py +++ b/Lib/importlib/resources.py @@ -8,10 +8,9 @@ from io import BytesIO, TextIOWrapper from pathlib import Path from types import ModuleType -from typing import Iterable, Iterator, Optional, Set, Union # noqa: F401 +from typing import Iterable, Iterator, Optional, Union # noqa: F401 from typing import cast from typing.io import BinaryIO, TextIO -from zipimport import ZipImportError __all__ = [ diff --git a/Lib/multiprocessing/pool.py b/Lib/multiprocessing/pool.py index b8a0b827635f0..bbe05a550c349 100644 --- a/Lib/multiprocessing/pool.py +++ b/Lib/multiprocessing/pool.py @@ -22,7 +22,6 @@ import traceback import types import warnings -from queue import Empty # If threading is available then ThreadPool should be provided. Therefore # we avoid top-level imports which are liable to fail on some systems. diff --git a/Lib/ssl.py b/Lib/ssl.py index 0726caee49aa5..30f4e5934febf 100644 --- a/Lib/ssl.py +++ b/Lib/ssl.py @@ -252,7 +252,7 @@ class _TLSMessageType(_IntEnum): if sys.platform == "win32": from _ssl import enum_certificates, enum_crls -from socket import socket, AF_INET, SOCK_STREAM, create_connection +from socket import socket, SOCK_STREAM, create_connection from socket import SOL_SOCKET, SO_TYPE import socket as _socket import base64 # for DER-to-PEM translation

1 0

bpo-40275: Fix name error in support.socket_helper (GH-19825)
by Victor Stinner 01 May '20

01 May '20

https://github.com/python/cpython/commit/2935e65c36fab1989bbda19db72c035ea2… commit: 2935e65c36fab1989bbda19db72c035ea22b044b branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-05-01T02:35:24+02:00 summary: bpo-40275: Fix name error in support.socket_helper (GH-19825) Replace TestFailed with support.TestFailed. Bug spotted by pyflakes. files: M Lib/test/support/socket_helper.py diff --git a/Lib/test/support/socket_helper.py b/Lib/test/support/socket_helper.py index 0ac8445562926..f709ffd40dd8a 100644 --- a/Lib/test/support/socket_helper.py +++ b/Lib/test/support/socket_helper.py @@ -91,13 +91,15 @@ def bind_port(sock, host=HOST): if sock.family == socket.AF_INET and sock.type == socket.SOCK_STREAM: if hasattr(socket, 'SO_REUSEADDR'): if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR) == 1: - raise TestFailed("tests should never set the SO_REUSEADDR " \ - "socket option on TCP/IP sockets!") + raise support.TestFailed("tests should never set the " + "SO_REUSEADDR socket option on " + "TCP/IP sockets!") if hasattr(socket, 'SO_REUSEPORT'): try: if sock.getsockopt(socket.SOL_SOCKET, socket.SO_REUSEPORT) == 1: - raise TestFailed("tests should never set the SO_REUSEPORT " \ - "socket option on TCP/IP sockets!") + raise support.TestFailed("tests should never set the " + "SO_REUSEPORT socket option on " + "TCP/IP sockets!") except OSError: # Python's socket module was compiled using modern headers # thus defining SO_REUSEPORT but this process is running

1 0

Remove dead code in test__xxsubinterpreters (GH-19826)
by Victor Stinner 01 May '20

01 May '20

https://github.com/python/cpython/commit/17014e45864cefd37660b054fb71fa2e17… commit: 17014e45864cefd37660b054fb71fa2e177690ef branch: master author: Victor Stinner <vstinner(a)python.org> committer: GitHub <noreply(a)github.com> date: 2020-05-01T02:34:22+02:00 summary: Remove dead code in test__xxsubinterpreters (GH-19826) files: M Lib/test/test__xxsubinterpreters.py diff --git a/Lib/test/test__xxsubinterpreters.py b/Lib/test/test__xxsubinterpreters.py index 44f4d3fa0f4c9..80eff19152f15 100644 --- a/Lib/test/test__xxsubinterpreters.py +++ b/Lib/test/test__xxsubinterpreters.py @@ -19,12 +19,6 @@ ################################## # helpers -def powerset(*sets): - return itertools.chain.from_iterable( - combinations(sets, r) - for r in range(len(sets)+1)) - - def _captured_script(script): r, w = os.pipe() indented = script.replace('\n', '\n ') @@ -90,14 +84,6 @@ def _run_interp(id, source, shared, _mainns={}): interpreters.run_string(id, source, shared) -def run_interp_threaded(id, source, **shared): - def run(): - _run(id, source, shared) - t = threading.Thread(target=run) - t.start() - t.join() - - class Interpreter(namedtuple('Interpreter', 'name id')): @classmethod @@ -786,12 +772,6 @@ def tearDown(self): self._fs.close() super().tearDown() - @property - def fs(self): - if self._fs is None: - self._fs = FSFixture(self) - return self._fs - def test_success(self): script, file = _captured_script('print("it worked!", end="")') with file:

1 0