[pypy-svn] r65111 - in pypy/branch/pyjitpl5/pypy: jit/metainterp/test rpython rpython/ootypesystem

[antocuni at codespeak.net]

Author: antocuni
Date: Wed May  6 17:54:29 2009
New Revision: 65111

Modified:
   pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py
   pypy/branch/pyjitpl5/pypy/rpython/ootypesystem/rvirtualizable2.py
   pypy/branch/pyjitpl5/pypy/rpython/rvirtualizable2.py
Log:
smooth some more ootype/lltype differences, and let two more tests to pass


Modified: pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py	(original)
+++ pypy/branch/pyjitpl5/pypy/jit/metainterp/test/test_virtualizable.py	Wed May  6 17:54:29 2009
@@ -615,8 +615,6 @@
     def skip(self):
         py.test.skip('in-progress')
 
-    test_virtualizable_hierarchy = skip
-    test_external_pass = skip
     test_pass_always_virtual_to_bridge = skip
 
 

Modified: pypy/branch/pyjitpl5/pypy/rpython/ootypesystem/rvirtualizable2.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/ootypesystem/rvirtualizable2.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/ootypesystem/rvirtualizable2.py	Wed May  6 17:54:29 2009
@@ -7,6 +7,9 @@
 
 class VirtualizableAccessor(AbstractVirtualizableAccessor):
 
+    def initialize(self, TYPE, redirected_fields, PARENT=None):
+        pass # TODO
+
     def prepare_getsets(self):
         self.getsets = {} # TODO
 

Modified: pypy/branch/pyjitpl5/pypy/rpython/rvirtualizable2.py
==============================================================================
--- pypy/branch/pyjitpl5/pypy/rpython/rvirtualizable2.py	(original)
+++ pypy/branch/pyjitpl5/pypy/rpython/rvirtualizable2.py	Wed May  6 17:54:29 2009
@@ -85,9 +85,9 @@
         if self.top_of_virtualizable_hierarchy:
             self.accessor.initialize(self.object_type, my_redirected_fields)
         else:
+            BASE = self.rtyper.type_system.derefType(self.rbase.lowleveltype)
             self.accessor.initialize(self.object_type, my_redirected_fields,
-                                     self.rbase.lowleveltype.TO)
-
+                                     BASE)
 
     def new_instance(self, llops, classcallhop=None):
         vptr = self._super().new_instance(llops, classcallhop)