Changeset 391 for python/trunk/Lib/lib2to3/Grammar.txt

Timestamp:

Mar 19, 2014, 11:31:01 PM (12 years ago)

Author:

dmik

Message:

python: Merge vendor 2.7.6 to trunk.

Location:

python/trunk

Files:

• . (modified) (1 prop)
• Lib/lib2to3/Grammar.txt (modified) (2 diffs)

python/trunk/Lib/lib2to3/Grammar.txt

@@ -1 @@
-# Grammar for Python
+# Grammar for 2to3. This grammar supports Python 2.x and 3.x.
 
 # Note:  Changing the grammar specified in this file will most likely
@@ -129 +129 @@
        NAME | NUMBER | STRING+ | '.' '.' '.')
 listmaker: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] )
-testlist_gexp: test ( comp_for | (',' (test|star_expr))* [','] )
+testlist_gexp: (test|star_expr) ( comp_for | (',' (test|star_expr))* [','] )
 lambdef: 'lambda' [varargslist] ':' test
 trailer: '(' [arglist] ')' | '[' subscriptlist ']' | '.' NAME