# HG changeset patch
# User Thinker K.F. Li <thinker@codemud.net>
# Date 1308563349 -28800
# Node ID 38fdd422f611645c9e5fb1e26de22d2dbdc8c367
# Parent  3936d223989a888f4a86dc277d3095aab7cef0f2
depend.child_type is replaced by null_relocatable.back_type

diff -r 3936d223989a -r 38fdd422f611 paraspace/dex_deptracker.py
--- a/paraspace/dex_deptracker.py	Mon Jun 20 13:34:47 2011 +0800
+++ b/paraspace/dex_deptracker.py	Mon Jun 20 17:49:09 2011 +0800
@@ -593,7 +593,7 @@
         
         clazz, pclazz = _resolve_name_path(name_path)
         while isinstance(clazz, dexfile.depend):
-            clazz = clazz.child_type
+            clazz = clazz.back_type
             pass
         
         if isinstance(clazz, dexfile.ref):
diff -r 3936d223989a -r 38fdd422f611 paraspace/dexfile.py
--- a/paraspace/dexfile.py	Mon Jun 20 13:34:47 2011 +0800
+++ b/paraspace/dexfile.py	Mon Jun 20 17:49:09 2011 +0800
@@ -417,6 +417,7 @@
 
 
 class null_relocatable(relocatable):
+    back_type = None
     pass
 
 
@@ -424,7 +425,7 @@
 #
 # It is a placeholder for storing relationship defined by an association.
 #
-class ref(null_relocatable):
+class ref(_dex_type):
     target_path = None
     target = None
 
@@ -722,32 +723,31 @@
 
 class depend(null_relocatable):
     depend_on = None
-    child_type = None
     
     def __init__(self, depend_on):
         self.depend_on = depend_on
         pass
 
-    def __call__(self, child_type):
-        self.child_type = child_type
+    def __call__(self, back_type):
+        self.back_type = back_type
         return self
 
     def parse(self, parent, data, off):
-        v = self.child_type.parse(parent, data, off)
+        v = self.back_type.parse(parent, data, off)
         return v
 
     def sizeof(self, v):
-        v = self.child_type.sizeof(v)
+        v = self.back_type.sizeof(v)
         return v
 
     def compute_size(self, child):
-        if issubclass(self.child_type, relocatable):
-            self.child_type.compute_size(child)
+        if issubclass(self.back_type, relocatable):
+            self.back_type.compute_size(child)
             pass
         pass
 
     def to_str(self, child):
-        return self.child_type.to_str(child)
+        return self.back_type.to_str(child)
     pass