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

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Jun  7 01:45:12 2005
New Revision: 13131

Modified:
   pypy/dist/pypy/rpython/lltype.py
Log:
some renaming



Modified: pypy/dist/pypy/rpython/lltype.py
==============================================================================
--- pypy/dist/pypy/rpython/lltype.py	(original)
+++ pypy/dist/pypy/rpython/lltype.py	Tue Jun  7 01:45:12 2005
@@ -336,7 +336,7 @@
         raise InvalidCast(CURTYPE, PTRTYPE)
     parent = ptr._obj._parentstructure()
     parent._check()
-    PARENTTYPE = ptr._obj._wrparent_type
+    PARENTTYPE = ptr._obj._parent_type
     if getattr(parent, PARENTTYPE._names[0]) is not ptr._obj:
         raise InvalidCast(CURTYPE, PTRTYPE)
     return _ptr(PTRTYPE, parent)
@@ -359,7 +359,7 @@
 def parentlink(container):
     parent = container._parentstructure()
     if parent is not None:
-        return parent, container._wrparent_index
+        return parent, container._parent_index
 ##        if isinstance(parent, _struct):
 ##            for name in parent._TYPE._names:
 ##                if getattr(parent, name) is container:
@@ -422,7 +422,7 @@
             self._check()
             setattr(self._obj, field_name, p._obj)
             p._obj._wrparent = weakref.ref(self._obj)
-            p._obj._wrparent_type = typeOf(self._obj)
+            p._obj._parent_type = typeOf(self._obj)
             return
         raise TypeError("%r instance has no first field" % (self._T,))
 
@@ -497,9 +497,9 @@
                 value = typ._defl()
             setattr(self, fld, value)
         if parent is not None:
-            self._wrparent_type = typeOf(parent)
+            self._parent_type = typeOf(parent)
             self._wrparent = weakref.ref(parent)
-            self._wrparent_index = parentindex
+            self._parent_index = parentindex
 
     def _parentstructure(self):
         if self._wrparent is not None:
@@ -507,7 +507,7 @@
             if parent is None:
                 raise RuntimeError("accessing substructure %r,\n"
                                    "but already garbage collected parent %r"
-                                   % (self, self._wrparent_type))
+                                   % (self, self._parent_type))
             return parent
         return None
 
@@ -545,9 +545,9 @@
         self.items = [TYPE.OF._defl(parent=self, parentindex=j)
                       for j in range(n)]
         if parent is not None:
-            self._wrparent_type = typeOf(parent)
+            self._parent_type = typeOf(parent)
             self._wrparent = weakref.ref(parent)
-            self._wrparent_index = parentindex
+            self._parent_index = parentindex
 
     def _parentstructure(self):
         if self._wrparent is not None:
@@ -555,7 +555,7 @@
             if parent is None:
                 raise RuntimeError("accessing subarray %r,\n"
                                    "but already garbage collected parent %r"
-                                   % (self, self._wrparent_type))
+                                   % (self, self._parent_type))
             return parent
         return None