[pypy-svn] r54370 - pypy/branch/oo-jit/pypy/jit/codegen/cli

[antocuni at codespeak.net]

Author: antocuni
Date: Sat May  3 16:26:52 2008
New Revision: 54370

Modified:
   pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py
Log:
store the cliclass instead of the clitype on IntConst



Modified: pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py
==============================================================================
--- pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py	(original)
+++ pypy/branch/oo-jit/pypy/jit/codegen/cli/rgenop.py	Sat May  3 16:26:52 2008
@@ -89,9 +89,9 @@
 
 class IntConst(GenConst):
 
-    def __init__(self, value, clitype):
+    def __init__(self, value, cliclass):
         self.value = value
-        self.clitype = clitype
+        self.cliclass = cliclass
 
     @specialize.arg(1)
     def revealconst(self, T):
@@ -105,7 +105,7 @@
             assert False
 
     def getCliType(self):
-        return self.clitype
+        return class2type(self.cliclass)
 
     def load(self, builder):
         builder.il.Emit(OpCodes.Ldc_I4, self.value)
@@ -217,11 +217,11 @@
     def genconst(self, llvalue):
         T = ootype.typeOf(llvalue)
         if T is ootype.Signed:
-            return IntConst(llvalue, typeof(System.Int32))
+            return IntConst(llvalue, cInt32)
         elif T is ootype.Bool:
-            return IntConst(int(llvalue), typeof(System.Boolean))
+            return IntConst(int(llvalue), cBoolean)
         elif T is ootype.Char:
-            return IntConst(ord(llvalue), typeof(System.Char))
+            return IntConst(ord(llvalue), cChar)
         elif T is ootype.Float:
             return FloatConst(llvalue)
         elif isinstance(T, ootype.OOType):
@@ -233,7 +233,7 @@
     @staticmethod
     def genzeroconst(kind):
         if kind is cInt32:
-            return IntConst(0, typeof(System.Int32))
+            return IntConst(0, cInt32)
         else:
             return zero_const # ???