[pypy-svn] r24651 - pypy/dist/pypy/rpython

[pedronis at codespeak.net]

Author: pedronis
Date: Mon Mar 20 23:43:52 2006
New Revision: 24651

Modified:
   pypy/dist/pypy/rpython/llinterp.py
   pypy/dist/pypy/rpython/typesystem.py
Log:
now isCompatibleType work by delegation directly.




Modified: pypy/dist/pypy/rpython/llinterp.py
==============================================================================
--- pypy/dist/pypy/rpython/llinterp.py	(original)
+++ pypy/dist/pypy/rpython/llinterp.py	Mon Mar 20 23:43:52 2006
@@ -155,7 +155,7 @@
 
     def setvar(self, var, val):
         if var.concretetype is not lltype.Void:
-            assert self.llinterpreter.typer.type_system.isCompatibleType(lltype.typeOf(val), var.concretetype)
+            assert lltype.isCompatibleType(lltype.typeOf(val), var.concretetype)
         assert isinstance(var, Variable)
         self.bindings[var] = val
 
@@ -169,7 +169,7 @@
         except AttributeError:
             val = self.bindings[varorconst]
         if varorconst.concretetype is not lltype.Void:
-            assert self.llinterpreter.typer.type_system.isCompatibleType(lltype.typeOf(val), varorconst.concretetype)
+            assert lltype.isCompatibleType(lltype.typeOf(val), varorconst.concretetype)
         return val
 
     # _______________________________________________________

Modified: pypy/dist/pypy/rpython/typesystem.py
==============================================================================
--- pypy/dist/pypy/rpython/typesystem.py	(original)
+++ pypy/dist/pypy/rpython/typesystem.py	Mon Mar 20 23:43:52 2006
@@ -92,9 +92,6 @@
     def null_callable(self, T):
         return lltype.nullptr(T.TO)
 
-    def isCompatibleType(self, t1, t2):
-        return lltype.isCompatibleType(t1, t2)
-
     def generic_is(self, robj1, robj2, hop):
         roriginal1 = robj1
         roriginal2 = robj2
@@ -124,9 +121,6 @@
     def null_callable(self, T):
         return ootype.null(T)
 
-    def isCompatibleType(self, t1, t2):
-        return ootype.isCompatibleType(t1, t2)
-
     def generic_is(self, robj1, robj2, hop):
         roriginal1 = robj1
         roriginal2 = robj2