diff options
| author | Guido van Rossum <guido@python.org> | 2019-03-07 20:38:08 (GMT) |
|---|---|---|
| committer | Miss Islington (bot) <31488909+miss-islington@users.noreply.github.com> | 2019-03-07 20:38:08 (GMT) |
| commit | 495da292255b92dd73758fdd0e4c7d27d82b1e57 (patch) | |
| tree | 1378cf049d2d125593fa970ea1e9a9f77604fab1 /Grammar | |
| parent | bf94cc7b496a379e1f604aa2e4080bb70ca4020e (diff) | |
| download | cpython-495da292255b92dd73758fdd0e4c7d27d82b1e57.zip cpython-495da292255b92dd73758fdd0e4c7d27d82b1e57.tar.gz cpython-495da292255b92dd73758fdd0e4c7d27d82b1e57.tar.bz2 | |
bpo-35975: Support parsing earlier minor versions of Python 3 (GH-12086)
This adds a `feature_version` flag to `ast.parse()` (documented) and `compile()` (hidden) that allow tweaking the parser to support older versions of the grammar. In particular if `feature_version` is 5 or 6, the hacks for the `async` and `await` keyword from PEP 492 are reinstated. (For 7 or higher, these are unconditionally treated as keywords, but they are still special tokens rather than `NAME` tokens that the parser driver recognizes.)
https://bugs.python.org/issue35975
Diffstat (limited to 'Grammar')
| -rw-r--r-- | Grammar/Grammar | 8 | ||||
| -rw-r--r-- | Grammar/Tokens | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/Grammar/Grammar b/Grammar/Grammar index a425978..eaebdc4 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -18,7 +18,7 @@ decorator: '@' dotted_name [ '(' [arglist] ')' ] NEWLINE decorators: decorator+ decorated: decorators (classdef | funcdef | async_funcdef) -async_funcdef: 'async' funcdef +async_funcdef: ASYNC funcdef funcdef: 'def' NAME parameters ['->' test] ':' [TYPE_COMMENT] func_body_suite parameters: '(' [typedargslist] ')' @@ -70,7 +70,7 @@ nonlocal_stmt: 'nonlocal' NAME (',' NAME)* assert_stmt: 'assert' test [',' test] compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | with_stmt | funcdef | classdef | decorated | async_stmt -async_stmt: 'async' (funcdef | with_stmt | for_stmt) +async_stmt: ASYNC (funcdef | with_stmt | for_stmt) if_stmt: 'if' namedexpr_test ':' suite ('elif' namedexpr_test ':' suite)* ['else' ':' suite] while_stmt: 'while' namedexpr_test ':' suite ['else' ':' suite] for_stmt: 'for' exprlist 'in' testlist ':' [TYPE_COMMENT] suite ['else' ':' suite] @@ -106,7 +106,7 @@ arith_expr: term (('+'|'-') term)* term: factor (('*'|'@'|'/'|'%'|'//') factor)* factor: ('+'|'-'|'~') factor | power power: atom_expr ['**' factor] -atom_expr: ['await'] atom trailer* +atom_expr: [AWAIT] atom trailer* atom: ('(' [yield_expr|testlist_comp] ')' | '[' [testlist_comp] ']' | '{' [dictorsetmaker] '}' | @@ -144,7 +144,7 @@ argument: ( test [comp_for] | comp_iter: comp_for | comp_if sync_comp_for: 'for' exprlist 'in' or_test [comp_iter] -comp_for: ['async'] sync_comp_for +comp_for: [ASYNC] sync_comp_for comp_if: 'if' test_nocond [comp_iter] # not used in grammar, but may appear in "node" passed from Parser to Compiler diff --git a/Grammar/Tokens b/Grammar/Tokens index 1d45e05..9de2da5 100644 --- a/Grammar/Tokens +++ b/Grammar/Tokens @@ -55,6 +55,8 @@ ELLIPSIS '...' COLONEQUAL ':=' OP +AWAIT +ASYNC TYPE_IGNORE TYPE_COMMENT ERRORTOKEN |