# HG changeset patch
# User Thinker K.F. Li <thinker@codemud.net>
# Date 1307004792 -28800
# Node ID fff40aabefab536a640c6959a30afabb6ca539bd
# Parent  61855daafecee275e50fca50c3f78d55893c69b9
Move collect_dependencies() to dex_deptracker.py

diff -r 61855daafece -r fff40aabefab paraspace/dex_deptracker.py
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/paraspace/dex_deptracker.py	Thu Jun 02 16:53:12 2011 +0800
@@ -0,0 +1,94 @@
+from paraspace import dexfile
+
+
+_nest_types = (dexfile.array,
+               dexfile.cond,
+               dexfile.switch)
+
+
+def _dig_clazz(name_path, clazz, dex_types):
+    deps = {}
+
+    for attr in dir(clazz):
+        namelist = [name_path, attr]
+        
+        digged_flag = False
+        
+        value_type = getattr(clazz, attr)
+        while isinstance(value_type, _nest_types) or \
+                (type(value_type) == type and
+                 issubclass(value_type, _nest_types)):
+            if isinstance(value_type, dexfile.array):
+                namelist.append('items')
+                value_type = value_type.child_type
+            elif isinstance(value_type, dexfile.cond):
+                namelist.append('value')
+                value_type = value_type.child_type
+            elif isinstance(value_type, dexfile.switch):
+                for key, child_type in value_type.map.items():
+                    if child_type in dex_types.values():
+                        continue
+                    child_name_path = '.'.join(namelist) + '.' + repr(key)
+                    child_deps = \
+                        _dig_clazz(child_name_path, child_type, dex_types)
+                    deps.update(child_deps)
+                    pass
+                digged_flag = True
+                break
+            pass
+
+        if digged_flag:
+            continue
+        
+        if isinstance(value_type, dexfile.depend):
+            from_name = '.'.join(namelist)
+            if isinstance(value_type, dexfile.depend_off):
+                depend_name = value_type.depend_on
+                deps[from_name] = (dexfile.depend_off, depend_name)
+            elif isinstance(value_type, dexfile.depend_off_rel):
+                depend_name = value_type.depend_on
+                relative_to = value_type.relative_to
+                deps[from_name] = (dexfile.depend_off_rel,
+                                   depend_name,
+                                   relative_to)
+            elif isinstance(value_type, dexfile.depend_idx):
+                depend_name = value_type.depend_on
+                deps[from_name] = (dexfile.depend_idx, depend_name)
+                pass
+            pass
+        pass
+    return deps
+
+
+def all_dex_types():
+    dex_types = dict([(name, value)
+                       for name, value in dexfile.__dict__.items()
+                       if name.startswith('_DEX_')])
+    dex_types['DEXFile'] = dexfile.DEXFile
+    return dex_types
+
+
+def collect_dependencies():
+    dex_types = all_dex_types()
+
+    all_deps = {}
+    for name_path, clazz in dex_types.items():
+        deps = _dig_clazz(name_path, clazz, dex_types)
+        all_deps.update(deps)
+        pass
+    
+    return all_deps
+
+
+
+def _install_offset_keepers():
+    
+    pass
+
+if __name__ == '__main__':
+    dex = dexfile.DEXFile.open('../data/testdata1.dex')
+    
+    import pprint
+    print
+    print 'Dependencies'
+    pprint.pprint(collect_dependencies())
diff -r 61855daafece -r fff40aabefab paraspace/dexfile.py
--- a/paraspace/dexfile.py	Thu Jun 02 09:09:26 2011 +0800
+++ b/paraspace/dexfile.py	Thu Jun 02 16:53:12 2011 +0800
@@ -1350,81 +1350,6 @@
     pass
 
 
-_nest_types = (array, cond, switch)
-
-
-def _dig_clazz(name_path, clazz, dex_types):
-    deps = {}
-
-    for attr in dir(clazz):
-        namelist = [name_path, attr]
-        
-        digged_flag = False
-        
-        value_type = getattr(clazz, attr)
-        while isinstance(value_type, _nest_types) or \
-                (type(value_type) == type and
-                 issubclass(value_type, _nest_types)):
-            if isinstance(value_type, array):
-                namelist.append('items')
-                value_type = value_type.child_type
-            elif isinstance(value_type, cond):
-                namelist.append('value')
-                value_type = value_type.child_type
-            elif isinstance(value_type, switch):
-                for key, child_type in value_type.map.items():
-                    if child_type in dex_types.values():
-                        continue
-                    child_name_path = '.'.join(namelist) + '.' + repr(key)
-                    child_deps = \
-                        _dig_clazz(child_name_path, child_type, dex_types)
-                    deps.update(child_deps)
-                    pass
-                digged_flag = True
-                break
-            pass
-
-        if digged_flag:
-            continue
-        
-        if isinstance(value_type, depend):
-            from_name = '.'.join(namelist)
-            if isinstance(value_type, depend_off):
-                depend_name = value_type.depend_on
-                deps[from_name] = (depend_off, depend_name)
-            elif isinstance(value_type, depend_off_rel):
-                depend_name = value_type.depend_on
-                relative_to = value_type.relative_to
-                deps[from_name] = (depend_off_rel, depend_name, relative_to)
-            elif isinstance(value_type, depend_idx):
-                depend_name = value_type.depend_on
-                deps[from_name] = (depend_idx, depend_name)
-                pass
-            pass
-        pass
-    return deps
-
-
-def all_dex_types():
-    dex_types = dict([(name, value)
-                       for name, value in globals().items()
-                       if name.startswith('_DEX_')])
-    dex_types['DEXFile'] = DEXFile
-    return dex_types
-
-
-def collect_dependencies():
-    dex_types = all_dex_types()
-
-    all_deps = {}
-    for name_path, clazz in dex_types.items():
-        deps = _dig_clazz(name_path, clazz, dex_types)
-        all_deps.update(deps)
-        pass
-    
-    return all_deps
-
-
 if __name__ == '__main__':
     dex = DEXFile.open('../data/testdata1.dex')
     
diff -r 61855daafece -r fff40aabefab paraspace/tests/dexfile_test.py
--- a/paraspace/tests/dexfile_test.py	Thu Jun 02 09:09:26 2011 +0800
+++ b/paraspace/tests/dexfile_test.py	Thu Jun 02 16:53:12 2011 +0800
@@ -25,12 +25,9 @@
 
 
 def dependencies_test():
-    srcdir = os.path.dirname(__file__)
-    srcroot = os.path.join(srcdir, '..', '..')
-    testdatapath = os.path.join(srcroot, 'data', 'testdata1.dex')
-    dex = dexfile.DEXFile.open(testdatapath)
-
-    deps = dexfile.collect_dependencies()
+    import dex_deptracker
+    
+    deps = dex_deptracker.collect_dependencies()
     assert deps['_DEX_AnnotationItem.typeIdx'][0] == dexfile.depend_idx
     assert deps['_DEX_AnnotationItem.typeIdx'][1] == 'DEXFile.typeIds'
     assert deps['_DEX_FieldId.typeIdx'][0] == dexfile.depend_idx