mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-03 11:23:31 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 8

Added 'global' and new class syntax.

Browse source
This commit is contained in:
Guido van Rossum 1991-12-10 13:51:08 +00:00
parent ccf0ca2860
commit 68fc349744
1 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Grammar/Grammar
View file

@ -1,4 +1,8 @@
# Grammar for Python, version 7 # Grammar for Python, version 8
# Changes since version 7:
# New syntax to specify base classes (but old syntax retained for now)
# 'global' statement (valid only in functions but not enforced here)
# Changes since version 6: # Changes since version 6:
# Add logical operators '|', '^', '&' and '~' # Add logical operators '|', '^', '&' and '~'
@ -52,7 +56,7 @@ fpdef: NAME | '(' fplist ')'
stmt: simple_stmt | compound_stmt stmt: simple_stmt | compound_stmt
simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE simple_stmt: small_stmt (';' small_stmt)* [';'] NEWLINE
small_stmt: expr_stmt | print_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt small_stmt: expr_stmt | print_stmt | del_stmt | pass_stmt | flow_stmt | import_stmt | global_stmt
expr_stmt: (exprlist '=')* exprlist expr_stmt: (exprlist '=')* exprlist
# For assignments, additional restrictions enforced by the interpreter # For assignments, additional restrictions enforced by the interpreter
print_stmt: 'print' (test ',')* [test] print_stmt: 'print' (test ',')* [test]
@ -64,6 +68,7 @@ continue_stmt: 'continue'
return_stmt: 'return' [testlist] return_stmt: 'return' [testlist]
raise_stmt: 'raise' test [',' test] raise_stmt: 'raise' test [',' test]
import_stmt: 'import' NAME (',' NAME)* | 'from' NAME 'import' ('*' | NAME (',' NAME)*) import_stmt: 'import' NAME (',' NAME)* | 'from' NAME 'import' ('*' | NAME (',' NAME)*)
global_stmt: 'global' NAME (',' NAME)*
compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef compound_stmt: if_stmt | while_stmt | for_stmt | try_stmt | funcdef | classdef
if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite] if_stmt: 'if' test ':' suite ('elif' test ':' suite)* ['else' ':' suite]
while_stmt: 'while' test ':' suite ['else' ':' suite] while_stmt: 'while' test ':' suite ['else' ':' suite]
@ -91,6 +96,9 @@ exprlist: expr (',' expr)* [',']
testlist: test (',' test)* [','] testlist: test (',' test)* [',']
dictmaker: test ':' test (',' test ':' test)* [','] dictmaker: test ':' test (',' test ':' test)* [',']
classdef: 'class' NAME parameters ['=' baselist] ':' suite # New class syntax should be:
# classdef: class NAME ['(' testlist ')'] ':' suite
# but merged with old syntax for compatibility it becomes:
classdef: 'class' NAME ['(' testlist ')' |'(' ')' ['=' baselist]] ':' suite
baselist: atom arguments (',' atom arguments)* baselist: atom arguments (',' atom arguments)*
arguments: '(' [testlist] ')' arguments: '(' ')'