[Jython-checkins] SF.net SVN: jython:[5200] trunk/sandbox/wierzbicki/backup/Python.g

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

Revision: 5200
          http://jython.svn.sourceforge.net/jython/?rev=5200&view=rev
Author:   fwierzbicki
Date:     2008-08-19 03:21:51 +0000 (Tue, 19 Aug 2008)

Log Message:
-----------
factor comp_op back out.

Modified Paths:
--------------
    trunk/sandbox/wierzbicki/backup/Python.g

Modified: trunk/sandbox/wierzbicki/backup/Python.g
===================================================================
--- trunk/sandbox/wierzbicki/backup/Python.g	2008-08-19 03:11:13 UTC (rev 5199)
+++ trunk/sandbox/wierzbicki/backup/Python.g	2008-08-19 03:21:51 UTC (rev 5200)
@@ -879,35 +879,26 @@
     }
 }
     : left=expr[ctype]
-       ( ( LESS right+=expr[ctype] {cmps.add(cmpopType.Lt);}
-         |GREATER right+=expr[ctype] {cmps.add(cmpopType.Gt);}
-         |EQUAL right+=expr[ctype] {cmps.add(cmpopType.Eq);}
-         |GREATEREQUAL right+=expr[ctype] {cmps.add(cmpopType.GtE);}
-         |LESSEQUAL right+=expr[ctype] {cmps.add(cmpopType.LtE);}
-         |ALT_NOTEQUAL right+=expr[ctype] {cmps.add(cmpopType.NotEq);}
-         |NOTEQUAL right+=expr[ctype] {cmps.add(cmpopType.NotEq);}
-         |IN right+=expr[ctype] {cmps.add(cmpopType.In);}
-         |IS right+=expr[ctype] {cmps.add(cmpopType.Is);}
-         |NOT IN right+=expr[ctype] {cmps.add(cmpopType.NotIn);}
-         |IS NOT right+=expr[ctype] {cmps.add(cmpopType.IsNot);}
+       ( ( comp_op right+=expr[ctype] {cmps.add($comp_op.op);}
          )+
        |  -> $left
        )
     ;
 
 //comp_op: '<'|'>'|'=='|'>='|'<='|'<>'|'!='|'in'|'not' 'in'|'is'|'is' 'not'
-comp_op : LESS
-        | GREATER
-        | EQUAL
-        | GREATEREQUAL
-        | LESSEQUAL
-        | ALT_NOTEQUAL
-        | NOTEQUAL
-        | IN
-//        | NOT IN -> NotIn
-        | IS
-//        | IS NOT -> IsNot
-        ;
+comp_op returns [cmpopType op]
+    : LESS {$op = cmpopType.Lt;}
+    | GREATER {$op = cmpopType.Gt;}
+    | EQUAL {$op = cmpopType.Eq;}
+    | GREATEREQUAL {$op = cmpopType.GtE;}
+    | LESSEQUAL {$op = cmpopType.LtE;}
+    | ALT_NOTEQUAL {$op = cmpopType.NotEq;}
+    | NOTEQUAL {$op = cmpopType.NotEq;}
+    | IN {$op = cmpopType.In;}
+    | NOT IN {$op = cmpopType.NotIn;}
+    | IS {$op = cmpopType.Is;}
+    | IS NOT {$op = cmpopType.IsNot;}
+    ;
 
 
 //expr: xor_expr ('|' xor_expr)*


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