[pypy-svn] r32217 - in pypy/branch/more-gckinds/pypy/rpython: lltypesystem rctypes

[mwh at codespeak.net]

Author: mwh
Date: Tue Sep 12 15:21:34 2006
New Revision: 32217

Modified:
   pypy/branch/more-gckinds/pypy/rpython/lltypesystem/llmemory.py
   pypy/branch/more-gckinds/pypy/rpython/rctypes/rmodel.py
Log:
use rawTypeOf in a few more places.  now test_transformed_gc passes!


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 15:21:34 2006
@@ -229,7 +229,7 @@
     def __ne__(self, other):
         return not (self == other)
     def type(self):
-        return lltype.typeOf(self.array).TO.OF
+        return lltype.rawTypeOf(self.array).TO.OF
 
 class _arraylenref(object):
     def __init__(self, array):
@@ -264,7 +264,7 @@
     def __ne__(self, other):
         return not (self == other)
     def type(self):
-        return getattr(lltype.typeOf(self.struct).TO, self.fieldname)
+        return getattr(lltype.rawTypeOf(self.struct).TO, self.fieldname)
 
 class _obref(object):
     def __init__(self, ob):

Modified: pypy/branch/more-gckinds/pypy/rpython/rctypes/rmodel.py
==============================================================================
--- pypy/branch/more-gckinds/pypy/rpython/rctypes/rmodel.py	(original)
+++ pypy/branch/more-gckinds/pypy/rpython/rctypes/rmodel.py	Tue Sep 12 15:21:34 2006
@@ -266,8 +266,8 @@
 
 def reccopy(source, dest):
     # copy recursively a structure or array onto another.
-    T = lltype.typeOf(source).TO
-    assert T == lltype.typeOf(dest).TO
+    T = lltype.rawTypeOf(source).TO
+    assert T == lltype.rawTypeOf(dest).TO
     if isinstance(T, (lltype.Array, lltype.FixedSizeArray)):
         assert len(source) == len(dest)
         ITEMTYPE = T.OF
@@ -295,7 +295,7 @@
         raise TypeError(T)
 
 def reccopy_arrayitem(source, destarray, destindex):
-    ITEMTYPE = lltype.typeOf(destarray).TO.OF
+    ITEMTYPE = lltype.rawTypeOf(destarray).TO.OF
     if isinstance(ITEMTYPE, lltype.Primitive):
         destarray[destindex] = source
     else: