From 77a542339b4bc53879c273aa3794cc66bd5c806e Mon Sep 17 00:00:00 2001 From: Tim Peters Date: Mon, 18 Jun 2001 22:08:13 +0000 Subject: 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. --- Grammar/Grammar | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'Grammar') 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] -- cgit v1.2.1