[Jython-checkins] SF.net SVN: jython:[7270] trunk/jython/grammar/Python.g

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

Revision: 7270
          http://jython.svn.sourceforge.net/jython/?rev=7270&view=rev
Author:   fwierzbicki
Date:     2011-03-28 01:33:05 +0000 (Mon, 28 Mar 2011)

Log Message:
-----------
Convert from rewrite action to regular action for consistency, also fix some
whitespace.

Modified Paths:
--------------
    trunk/jython/grammar/Python.g

Modified: trunk/jython/grammar/Python.g
===================================================================
--- trunk/jython/grammar/Python.g	2011-03-26 16:22:17 UTC (rev 7269)
+++ trunk/jython/grammar/Python.g	2011-03-28 01:33:05 UTC (rev 7270)
@@ -613,12 +613,16 @@
     | (testlist[null] ASSIGN) => lhs=testlist[expr_contextType.Store]
         (
         | ((at=ASSIGN t+=testlist[expr_contextType.Store])+
-       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.castExpr($lhs.tree), $t),
-            actions.makeAssignValue($t)])
+            {
+                stype = new Assign($lhs.tree, actions.makeAssignTargets(
+                    actions.castExpr($lhs.tree), $t), actions.makeAssignValue($t));
+            }
           )
         | ((ay=ASSIGN y2+=yield_expr)+
-       -> ^(ASSIGN<Assign>[$lhs.start, actions.makeAssignTargets(actions.castExpr($lhs.tree), $y2),
-            actions.makeAssignValue($y2)])
+            {
+                stype = new Assign($lhs.start, actions.makeAssignTargets(
+                    actions.castExpr($lhs.tree), $y2), actions.makeAssignValue($y2));
+            }
           )
         )
     | lhs=testlist[expr_contextType.Load]
@@ -1196,7 +1200,6 @@
       }
     ;
 
-
 //expr: xor_expr ('|' xor_expr)*
 expr
     [expr_contextType ect] returns [Token leftTok]
@@ -1721,7 +1724,7 @@
     ;
 
 //arglist: (argument ',')* (argument [',']
-//                         |'*' test (',' argument)* [',' '**' test] 
+//                         |'*' test (',' argument)* [',' '**' test]
 //                         |'**' test)
 arglist
     returns [List args, List keywords, expr starargs, expr kwargs]


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