*** empty log message ***

direct/src/ffi/FFIOverload.py

@@ -136,14 +136,18 @@ def inheritsFrom(type1, type2):
     else:
         return 0
 
-def getInheritanceLevel(type):
-#    if (len(type.parentTypes) == 0):
-#        return 0
-    level = 0
+def getInheritanceLevel(type, checkNested = 1):
+    #    if (len(type.parentTypes) == 0):
+    #        return 0
+    if type.isNested:
+        level = getInheritanceLevel(type.outerType, 0)
+    else:
+        level = 0
     for parentType in type.parentTypes:
         level = max(level, 1+getInheritanceLevel(parentType))
-    for nestedType in type.nestedTypes:
-        level = max(level, 1+getInheritanceLevel(nestedType))
+    if checkNested:
+        for nestedType in type.nestedTypes:
+            level = max(level, 1+getInheritanceLevel(nestedType))
     return level
 
 def inheritanceLevelSort(type1, type2):

direct/src/ffi/FFITypes.py

@@ -608,8 +608,18 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
     def outputImportsRecursively(self, parent, file, nesting):
         for parentType in parent.parentTypes:
             self.outputImportsRecursively(parentType, file, nesting)
-        indent(file, nesting, 'import ' + parent.foreignTypeName + '\n')
-        
+
+        parentTypeName = parent.foreignTypeName
+        fullNestedName = parent.getFullNestedName()
+        if (fullNestedName != parentTypeName):
+            print "full nested name: ", fullNestedName
+            nestedChain = fullNestedName.split(".") 
+            moduleName = nestedChain[0]
+            print "module name: ", moduleName
+            indent(file, nesting, 'import ' + moduleName + '\n')
+        else:
+            indent(file, nesting, 'import ' + parent.foreignTypeName + '\n')
+
         returnTypeModules = parent.getReturnTypeModules()
         if len(returnTypeModules):
             for moduleName in returnTypeModules:
@@ -634,6 +644,7 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
         indent(file, nesting, '\n')
 
 
+
     def outputClassComment(self, file, nesting):
         """
         Output the class comment to the file
@@ -678,10 +689,22 @@ class ClassTypeDescriptor(BaseTypeDescriptor):
         # Also inherit from all of your parentTypes
         for i in range(len(self.parentTypes)):
             parentTypeName = self.parentTypes[i].foreignTypeName
+            moduleName = parentTypeName
             # assuming the type "Node" is stored in module "Node.py"
             # and we have done an "import Node", we need to then
             # inherit from Node.Node
-            file.write(parentTypeName + '.' + parentTypeName)
+            # Actually it is trickier than this. If we import from a
+            # nested class, we need to inherit from something like:
+            #     parentClassModule.parentClass.nestedClass
+            fullNestedName = self.parentTypes[i].getFullNestedName()
+            if (fullNestedName != parentTypeName):
+                print "full nested name: ", fullNestedName
+                nestedChain = fullNestedName.split(".") 
+                moduleName = nestedChain[0]
+                print "module name: ", moduleName
+                parentTypeName = fullNestedName
+                print "resolved parent name: ", parentTypeName
+            file.write(moduleName + '.' + parentTypeName)
             file.write(', ')
         file.write('FFIExternalObject.FFIExternalObject):\n')