diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-06-18 22:08:13 (GMT) |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-06-18 22:08:13 (GMT) |
| commit | 5ca576ed0a0c697c7e7547adfd0b3af010fd2053 (patch) | |
| tree | 0b0db361191363b3c168a6c105030f53e181d3e5 /Grammar | |
| parent | 1dad6a86de55c38da5c356c2c6d81be8ff7884b1 (diff) | |
| download | cpython-5ca576ed0a0c697c7e7547adfd0b3af010fd2053.zip cpython-5ca576ed0a0c697c7e7547adfd0b3af010fd2053.tar.gz cpython-5ca576ed0a0c697c7e7547adfd0b3af010fd2053.tar.bz2 | |
Merging the gen-branch into the main line, at Guido's direction. Yay!
Bugfix candidate in inspect.py: it was referencing "self" outside of
a method.
Diffstat (limited to 'Grammar')
| -rw-r--r-- | Grammar/Grammar | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Grammar/Grammar b/Grammar/Grammar index fe3ece9..c791892 100644 --- a/Grammar/Grammar +++ b/Grammar/Grammar @@ -43,10 +43,11 @@ augassign: '+=' | '-=' | '*=' | '/=' | '%=' | '&=' | '|=' | '^=' | '<<=' | '>>=' print_stmt: 'print' ( [ test (',' test)* [','] ] | '>>' test [ (',' test)+ [','] ] ) del_stmt: 'del' exprlist pass_stmt: 'pass' -flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt +flow_stmt: break_stmt | continue_stmt | return_stmt | raise_stmt | yield_stmt break_stmt: 'break' continue_stmt: 'continue' return_stmt: 'return' [testlist] +yield_stmt: 'yield' testlist raise_stmt: 'raise' [test [',' test [',' test]]] import_stmt: 'import' dotted_as_name (',' dotted_as_name)* | 'from' dotted_name 'import' ('*' | import_as_name (',' import_as_name)*) import_as_name: NAME [NAME NAME] |