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

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

Revision: 5087
          http://jython.svn.sourceforge.net/jython/?rev=5087&view=rev
Author:   fwierzbicki
Date:     2008-08-05 23:46:30 +0000 (Tue, 05 Aug 2008)

Log Message:
-----------
Finish out "IN" as a token.

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

Modified: branches/asm/grammar/Python.g
===================================================================
--- branches/asm/grammar/Python.g	2008-08-05 23:44:49 UTC (rev 5086)
+++ branches/asm/grammar/Python.g	2008-08-05 23:46:30 UTC (rev 5087)
@@ -777,7 +777,7 @@
             ;
 
 //exec_stmt: 'exec' expr ['in' test [',' test]]
-exec_stmt : keyEXEC expr[expr_contextType.Load] ('in' t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)?
+exec_stmt : keyEXEC expr[expr_contextType.Load] (IN t1=test[expr_contextType.Load] (COMMA t2=test[expr_contextType.Load])?)?
          -> ^(keyEXEC expr ^(Globals $t1)? ^(Locals $t2)?)
           ;
 
@@ -886,8 +886,8 @@
         | LESSEQUAL
         | ALT_NOTEQUAL
         | NOTEQUAL
-        | 'in'
-        | NOT 'in' -> NotIn
+        | IN
+        | NOT IN -> NotIn
         | 'is'
         | 'is' NOT -> IsNot
         ;
@@ -1126,7 +1126,7 @@
 keyEXEC   : {input.LT(1).getText().equals("exec")}? NAME ;
 //keyFROM   : {input.LT(1).getText().equals("from")}? NAME ;
 //keyGLOBAL : {input.LT(1).getText().equals("global")}? NAME ;
-//keyIN     : {input.LT(1).getText().equals("in")}? NAME ;
+keyIN     : {input.LT(1).getText().equals("in")}? NAME ;
 //keyIS     : {input.LT(1).getText().equals("is")}? NAME ;
 //keyLAMBDA : {input.LT(1).getText().equals("lambda")}? NAME ;
 //keyNOT    : {input.LT(1).getText().equals("not")}? NAME ;

Modified: branches/asm/grammar/PythonWalker.g
===================================================================
--- branches/asm/grammar/PythonWalker.g	2008-08-05 23:44:49 UTC (rev 5086)
+++ branches/asm/grammar/PythonWalker.g	2008-08-05 23:46:30 UTC (rev 5087)
@@ -1040,7 +1040,7 @@
     | LESSEQUAL {$op = cmpopType.LtE;}
     | ALT_NOTEQUAL {$op = cmpopType.NotEq;}
     | NOTEQUAL {$op = cmpopType.NotEq;}
-    | 'in' {$op = cmpopType.In;}
+    | IN {$op = cmpopType.In;}
     | NotIn {$op = cmpopType.NotIn;}
     | 'is' {$op = cmpopType.Is;}
     | IsNot {$op = cmpopType.IsNot;}


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