diff options
| author | Raymond Hettinger <python@rcn.com> | 2004-05-19 08:20:33 +0000 |
|---|---|---|
| committer | Raymond Hettinger <python@rcn.com> | 2004-05-19 08:20:33 +0000 |
| commit | 7499e562f0c628d4e608f4069ad20a0086c15534 (patch) | |
| tree | 78ad1b9c52166983ecb01bf8fd7fc8df3ffd3618 /Grammar | |
| parent | ae0d7cddf3c960fcc302e2296447f5f236af10e5 (diff) | |
| download | cpython-7499e562f0c628d4e608f4069ad20a0086c15534.tar.gz | |
SF patch #872326: Generator expression implementation
(Code contributed by Jiwon Seo.)
The documentation portion of the patch is being re-worked and will be
checked-in soon. Likewise, PEP 289 will be updated to reflect Guido's
rationale for the design decisions on binding behavior (as described in
in his patch comments and in discussions on python-dev).
The test file, test_genexps.py, is written in doctest format and is
meant to exercise all aspects of the the patch. Further additions are
welcome from everyone. Please stress test this new feature as much as
possible before the alpha release.
Diffstat (limited to 'Grammar')
| -rw-r--r-- | Grammar/Grammar | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Grammar/Grammar b/Grammar/Grammar index e52a544bc8..ce75ba8014 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -80,8 +80,9 @@ arith_expr: term (('+'|'-') term)* term: factor (('*'|'/'|'%'|'//') factor)* factor: ('+'|'-'|'~') factor | power power: atom trailer* ['**' factor] -atom: '(' [testlist] ')' | '[' [listmaker] ']' | '{' [dictmaker] '}' | '`' testlist1 '`' | NAME | NUMBER | STRING+ +atom: '(' [testlist_gexp] ')' | '[' [listmaker] ']' | '{' [dictmaker] '}' | '`' testlist1 '`' | NAME | NUMBER | STRING+ listmaker: test ( list_for | (',' test)* [','] ) +testlist_gexp: test ( gen_for | (',' test)* [','] ) lambdef: 'lambda' [varargslist] ':' test trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME subscriptlist: subscript (',' subscript)* [','] @@ -95,12 +96,16 @@ dictmaker: test ':' test (',' test ':' test)* [','] classdef: 'class' NAME ['(' testlist ')'] ':' suite arglist: (argument ',')* (argument [',']| '*' test [',' '**' test] | '**' test) -argument: [test '='] test # Really [keyword '='] test +argument: [test '='] test [gen_for] # Really [keyword '='] test list_iter: list_for | list_if list_for: 'for' exprlist 'in' testlist_safe [list_iter] list_if: 'if' test [list_iter] +gen_iter: gen_for | gen_if +gen_for: 'for' exprlist 'in' test [gen_iter] +gen_if: 'if' test [gen_iter] + testlist1: test (',' test)* # not used in grammar, but may appear in "node" passed from Parser to Compiler |