[pypy-svn] r78191 - in pypy/branch/ootype-virtualrefs/pypy: rlib translator/goal

dan at codespeak.net dan at codespeak.net
Fri Oct 22 10:32:43 CEST 2010


Author: dan
Date: Fri Oct 22 10:32:41 2010
New Revision: 78191

Modified:
   pypy/branch/ootype-virtualrefs/pypy/rlib/_jit_vref.py
   pypy/branch/ootype-virtualrefs/pypy/translator/goal/targetpypystandalone.py
Log:
SomeVRef now has a more correct Repr on ootypesystem

Modified: pypy/branch/ootype-virtualrefs/pypy/rlib/_jit_vref.py
==============================================================================
--- pypy/branch/ootype-virtualrefs/pypy/rlib/_jit_vref.py	(original)
+++ pypy/branch/ootype-virtualrefs/pypy/rlib/_jit_vref.py	Fri Oct 22 10:32:41 2010
@@ -24,7 +24,10 @@
         return self.s_instance
 
     def rtyper_makerepr(self, rtyper):
-        return vrefrepr
+        if rtyper.type_system.name == 'lltypesystem':
+            return vrefrepr
+        elif rtyper.type_system.name == 'ootypesystem':
+            return oovrefrepr
 
     def rtyper_makekey(self):
         return self.__class__,
@@ -54,4 +57,10 @@
                              " prebuilt virtual_ref")
         return lltype.nullptr(OBJECTPTR.TO)
 
+from pypy.rpython.ootypesystem.rclass import OBJECT
+
+class OOVRefRepr(VRefRepr):
+    lowleveltype = OBJECT
+
 vrefrepr = VRefRepr()
+oovrefrepr = OOVRefRepr()

Modified: pypy/branch/ootype-virtualrefs/pypy/translator/goal/targetpypystandalone.py
==============================================================================
--- pypy/branch/ootype-virtualrefs/pypy/translator/goal/targetpypystandalone.py	(original)
+++ pypy/branch/ootype-virtualrefs/pypy/translator/goal/targetpypystandalone.py	Fri Oct 22 10:32:41 2010
@@ -105,7 +105,6 @@
             print 'Translation to cli and jvm is known to be broken at the moment'
             print 'Please try the "cli-jit" branch at:'
             print 'http://codespeak.net/svn/pypy/branch/cli-jit/'
-            sys.exit(1)
 
         self.translateconfig = translateconfig
         # set up the objspace optimizations based on the --opt argument



More information about the Pypy-commit mailing list