[Jython-checkins] SF.net SVN: jython:[5160] branches/asm/grammar/Python.g

[<fwi...@us...>]

Revision: 5160
          http://jython.svn.sourceforge.net/jython/?rev=5160&view=rev
Author:   fwierzbicki
Date:     2008-08-12 18:40:38 +0000 (Tue, 12 Aug 2008)

Log Message:
-----------
Trailing commas not allowed outside of parens.

Modified Paths:
--------------
    branches/asm/grammar/Python.g

Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g	2008-08-12 18:24:24 UTC (rev 5159)
+++ branches/asm/grammar/Python.g	2008-08-12 18:40:38 UTC (rev 5160)
@@ -582,13 +582,13 @@
              -> ^(FROM ^(Level DOT*)? ^(Value dotted_name)? ^(IMPORT STAR))
               | import_as_names
              -> ^(FROM ^(Level DOT*)? ^(Value dotted_name)? ^(IMPORT import_as_names))
-              | LPAREN import_as_names RPAREN
+              | LPAREN import_as_names COMMA? RPAREN
              -> ^(FROM ^(Level DOT*)? ^(Value dotted_name)? ^(IMPORT import_as_names))
               )
            ;
 
 //import_as_names: import_as_name (',' import_as_name)* [',']
-import_as_names : import_as_name (COMMA! import_as_name)* (COMMA!)?
+import_as_names : import_as_name (COMMA! import_as_name)*
                 ;
 
 //import_as_name: NAME [('as' | NAME) NAME]


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.