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

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

Revision: 5031
          http://jython.svn.sourceforge.net/jython/?rev=5031&view=rev
Author:   fwierzbicki
Date:     2008-07-31 20:13:12 +0000 (Thu, 31 Jul 2008)

Log Message:
-----------
Fixed generator args check (antlr3.1b2 broke this, fixed it again).

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

Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g	2008-07-31 19:50:45 UTC (rev 5030)
+++ branches/asm/grammar/Python.g	2008-07-31 20:13:12 UTC (rev 5031)
@@ -1051,17 +1051,14 @@
             | DOUBLESTAR kwargs=test[expr_contextType.Load]
             )?
           )? { if ($a2 != null) {
-                   if ($a1.gen) {
+                   if ($a1.tree.getType() == GenFor) {
                        throwGenExpNotSoleArg($a1.tree);
                    }
-                   //FIXME: not working in 3.1b2
-                   /*
                    for (int i=0;i<$a2.size();i++) {
-                       if (((argument_return)$a2.get(i)).gen) {
+                       if (((PythonTree)$a2.get(i)).getType() == GenFor) {
                            throwGenExpNotSoleArg(((argument_return)$a2.get(i)).tree);
                        }
                    }
-                   */
                }
              }
        -> ^(Args argument+) ^(StarArgs $starargs)? ^(KWArgs $kwargs)?
@@ -1072,13 +1069,12 @@
         ;
 
 //argument: test [gen_for] | test '=' test  # Really [keyword '='] test
-argument[boolean first] returns [boolean gen]
+argument[boolean first]
     : t1=test[expr_contextType.Load]
          ( (ASSIGN t2=test[expr_contextType.Load]) -> ^(Keyword ^(Arg $t1) ^(Value $t2)?)
          | gen_for { if (!first) {
                            throwGenExpNotSoleArg($gen_for.tree);
                      }
-                     $gen = true;
                    }
         -> ^(GenFor $t1 gen_for)
          | -> ^(Arg $t1)


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