[pypy-svn] r55964 - pypy/branch/2.5-features/pypy/interpreter/pyparser/data

bgola at codespeak.net bgola at codespeak.net
Thu Jun 19 17:50:19 CEST 2008


Author: bgola
Date: Thu Jun 19 17:50:17 2008
New Revision: 55964

Removed:
   pypy/branch/2.5-features/pypy/interpreter/pyparser/data/Grammar2.5a
Modified:
   pypy/branch/2.5-features/pypy/interpreter/pyparser/data/Grammar2.5
Log:
removing Grammar2.5a and updating Grammar2.5 to match the Python2.5 Grammar (from CPython 2.5.1 src)

Modified: pypy/branch/2.5-features/pypy/interpreter/pyparser/data/Grammar2.5
==============================================================================
--- pypy/branch/2.5-features/pypy/interpreter/pyparser/data/Grammar2.5	(original)
+++ pypy/branch/2.5-features/pypy/interpreter/pyparser/data/Grammar2.5	Thu Jun 19 17:50:17 2008
@@ -62,8 +62,9 @@
 raise_stmt: 'raise' [test [',' test [',' test]]]
 import_stmt: import_name | import_from
 import_name: 'import' dotted_as_names
-import_from: 'from' dotted_name 'import' ('*' | '(' import_as_names [','] ')' | import_as_names)
-import_as_name: NAME [('as'|NAME) NAME]
+import_from: ('from' ('.'* dotted_name | '.'+)
+              'import' ('*' | '(' import_as_names ')' | import_as_names))
+import_as_name: NAME [('as' | NAME) NAME]
 dotted_as_name: dotted_name [('as' | NAME) NAME]
 import_as_names: import_as_name (',' import_as_name)* [',']
 dotted_as_names: dotted_as_name (',' dotted_as_name)*
@@ -120,7 +121,7 @@
 lambdef: 'lambda' [varargslist] ':' test
 trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME
 subscriptlist: subscript (',' subscript)* [',']
-subscript: '.' '.' '.' | [test] ':' [test] [sliceop] | test
+subscript: '.' '.' '.' | test | [test] ':' [test] [sliceop]
 sliceop: ':' [test]
 exprlist: expr (',' expr)* [',']
 testlist: test (',' test)* [',']



More information about the Pypy-commit mailing list