[Jython-checkins] SF.net SVN: jython:[5140] branches/asm

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

Revision: 5140
          http://jython.svn.sourceforge.net/jython/?rev=5140&view=rev
Author:   fwierzbicki
Date:     2008-08-11 00:32:24 +0000 (Mon, 11 Aug 2008)

Log Message:
-----------
Can't assign to Num and better placement for checkAssign, so
lambdef and fplist also get checks for args.

Modified Paths:
--------------
    branches/asm/grammar/PythonWalker.g
    branches/asm/src/org/python/antlr/GrammarActions.java

Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g	2008-08-10 23:14:13 UTC (rev 5139)
+++ branches/asm/grammar/PythonWalker.g	2008-08-11 00:32:24 UTC (rev 5140)
@@ -171,7 +171,6 @@
 
 defparameter[List params, List defaults]
     : fpdef[expr_contextType.Param, null] (ASSIGN test[expr_contextType.Load])? {
-        actions.checkAssign($fpdef.etype);
         params.add($fpdef.etype);
         if ($ASSIGN != null) {
             defaults.add($test.etype);
@@ -186,6 +185,7 @@
 fpdef [expr_contextType ctype, List nms] returns [exprType etype]
     : NAME {
         exprType e = new Name($NAME, $NAME.text, ctype);
+        actions.checkAssign(e);
         if (nms == null) {
             $etype = e;
         } else {

Modified: branches/asm/src/org/python/antlr/GrammarActions.java
===================================================================
--- branches/asm/src/org/python/antlr/GrammarActions.java	2008-08-10 23:14:13 UTC (rev 5139)
+++ branches/asm/src/org/python/antlr/GrammarActions.java	2008-08-11 00:32:24 UTC (rev 5140)
@@ -458,6 +458,8 @@
             throw new ParseException("assignment to None", e);
         } else if (e instanceof GeneratorExp) {
             throw new ParseException("can't assign to generator expression", e);
+        } else if (e instanceof Num) {
+            throw new ParseException("can't assign to number", e);
         }
     }
 }


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