diff options
| author | Tim Peters <tim.peters@gmail.com> | 2001-06-18 22:08:13 +0000 |
|---|---|---|
| committer | Tim Peters <tim.peters@gmail.com> | 2001-06-18 22:08:13 +0000 |
| commit | 77a542339b4bc53879c273aa3794cc66bd5c806e (patch) | |
| tree | e2d9ac7555bb14317f1415cd1c38afe4189236df /Grammar | |
| parent | 07b110f38c58b99f98815736ac234f00a8cb4db6 (diff) | |
| download | cpython-77a542339b4bc53879c273aa3794cc66bd5c806e.tar.gz | |
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 fe3ece9c8e..c791892dff 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] |