[pypy-svn] r32195 - pypy/branch/more-gckinds/pypy/rpython/lltypesystem

[mwh at codespeak.net]

Author: mwh
Date: Tue Sep 12 10:54:52 2006
New Revision: 32195

Modified:
   pypy/branch/more-gckinds/pypy/rpython/lltypesystem/llmemory.py
Log:
convert typeOf(maybeinterior).TO to maybeinterior._T.
not 100% happy.


Modified: pypy/branch/more-gckinds/pypy/rpython/lltypesystem/llmemory.py
==============================================================================
--- pypy/branch/more-gckinds/pypy/rpython/lltypesystem/llmemory.py	(original)
+++ pypy/branch/more-gckinds/pypy/rpython/lltypesystem/llmemory.py	Tue Sep 12 10:54:52 2006
@@ -47,7 +47,7 @@
     def ref(self, firstitemref):
         assert isinstance(firstitemref, _arrayitemref)
         array = firstitemref.array
-        assert lltype.typeOf(array).TO.OF == self.TYPE
+        assert array._T.OF == self.TYPE
         index = firstitemref.index + self.repeat
         return _arrayitemref(array, index)
 
@@ -76,7 +76,7 @@
 
     def ref(self, containerref):
         struct = containerref.get()
-        if lltype.typeOf(struct).TO != self.TYPE:
+        if struct._T != self.TYPE:
             struct = lltype.cast_pointer(lltype.Ptr(self.TYPE), struct)
         return _structfieldref(struct, self.fldname)
 
@@ -136,7 +136,7 @@
 
     def ref(self, arrayref):
         array = arrayref.get()
-        assert lltype.typeOf(array).TO == self.TYPE
+        assert array._T == self.TYPE
         return _arrayitemref(array, index=0)
 
     def raw_malloc(self, rest, parenttype=None):
@@ -164,7 +164,7 @@
 
     def ref(self, arrayref):
         array = arrayref.get()
-        assert lltype.typeOf(array).TO == self.TYPE
+        assert array._T == self.TYPE
         return _arraylenref(array)