Fixed the bodies of functions overriding indirect virtuals.

Signed-off-by: Dimitar Dobrev <dpldobrev@yahoo.com>

src/AST/ClassExtensions.cs

@@ -54,23 +54,38 @@ namespace CppSharp.AST
             }
         }
 
-        public static Method GetRootBaseMethod(this Class c, Method @override, bool onlyPrimaryBase = false, bool oneLevel = false)
+        public static Method GetBaseMethod(this Class c, Method @override, bool onlyPrimaryBase = false, bool getTopmost = false)
         {
-            return (from @base in c.Bases
+            foreach (var @base in c.Bases)
-                where @base.IsClass && @base.Class.OriginalClass != c && (!onlyPrimaryBase || !@base.Class.IsInterface)
+            {
-                let baseMethod = (
+                if (!@base.IsClass || @base.Class.OriginalClass == c || (onlyPrimaryBase && @base.Class.IsInterface))
-                    from method in @base.Class.Methods
+                    continue;
+
+                Method baseMethod;
+                if (!getTopmost)
+                {
+                    baseMethod = (@base.Class.GetBaseMethod(@override, onlyPrimaryBase));
+                    if (baseMethod != null)
+                        return baseMethod;
+                }
+
+                baseMethod = (from method in @base.Class.Methods
                     where
-                        (method.OriginalName == @override.OriginalName &&
+                        (method.OriginalName == @override.OriginalName && method.ReturnType == @override.ReturnType &&
-                         method.ReturnType == @override.ReturnType &&
                          method.Parameters.SequenceEqual(@override.Parameters, new ParameterTypeComparer())) ||
                         (@override.IsDestructor && method.IsDestructor && method.IsVirtual)
-                    select method).FirstOrDefault()
+                    select method).FirstOrDefault();
-                let rootBaseMethod = oneLevel
+                if (baseMethod != null)
-                    ? baseMethod
+                    return baseMethod;
-                    : (@base.Class.GetRootBaseMethod(@override, onlyPrimaryBase) ?? baseMethod)
+
-                where rootBaseMethod != null || onlyPrimaryBase
+                if (getTopmost)
-                select rootBaseMethod).FirstOrDefault();
+                {
+                    baseMethod = (@base.Class.GetBaseMethod(@override, onlyPrimaryBase));
+                    if (baseMethod != null)
+                        return baseMethod;
+                }
+            }
+            return null;
         }
 
         public static Property GetRootBaseProperty(this Class c, Property @override, bool onlyFirstBase = false)

src/Generator/Generators/CSharp/CSharpTextTemplate.cs

@@ -301,7 +301,7 @@ namespace CppSharp.Generators.CSharp
 
         public void GenerateDebug(Declaration decl)
         {
-            if (Options.OutputDebug && !String.IsNullOrWhiteSpace(decl.DebugText))
+            if (Options.OutputDebug && !string.IsNullOrWhiteSpace(decl.DebugText))
                 WriteLine("// DEBUG: " + decl.DebugText);
         }
 
@@ -2079,7 +2079,7 @@ namespace CppSharp.Generators.CSharp
             // check if overriding a function from a secondary base
             Method rootBaseMethod;
             var isOverride = method.IsOverride &&
-                (rootBaseMethod = @class.GetRootBaseMethod(method, true)) != null &&
+                (rootBaseMethod = @class.GetBaseMethod(method, true)) != null &&
                 (rootBaseMethod.IsVirtual || rootBaseMethod.IsPure);
 
             if (method.IsVirtual && !isOverride && !method.IsOperator && !method.IsPure)
@@ -2305,7 +2305,7 @@ namespace CppSharp.Generators.CSharp
         private static AccessSpecifier GetValidMethodAccess(Method method)
         {
             return method.IsOverride
-                ? ((Class) method.Namespace).GetRootBaseMethod(method).Access
+                ? ((Class) method.Namespace).GetBaseMethod(method).Access
                 : method.Access;
         }
 
@@ -2325,7 +2325,7 @@ namespace CppSharp.Generators.CSharp
         {
             Method rootBaseMethod;
             if (method.IsOverride && !method.IsPure && method.SynthKind != FunctionSynthKind.AbstractImplCall &&
-                (rootBaseMethod = ((Class) method.Namespace).GetRootBaseMethod(method, true, true)) != null &&
+                (rootBaseMethod = ((Class) method.Namespace).GetBaseMethod(method, true, true)) != null &&
                 !rootBaseMethod.IsPure)
             {
                 GenerateManagedCall(method, true);

src/Generator/Passes/CheckIgnoredDecls.cs

@@ -169,7 +169,7 @@ namespace CppSharp.Passes
 
                 if (method.IsOverride)
                 {
-                    var baseOverride = @class.GetRootBaseMethod(method);
+                    var baseOverride = @class.GetBaseMethod(method);
                     if (baseOverride != null && !baseOverride.IsDeclared)
                     {
                         Log.Debug(

src/Generator/Passes/FixDefaultParamValuesOfOverridesPass.cs

@@ -8,7 +8,7 @@ namespace CppSharp.Passes
         {
             if (method.IsOverride && !method.IsSynthetized)
             {
-                Method rootBaseMethod = ((Class) method.Namespace).GetRootBaseMethod(method);
+                Method rootBaseMethod = ((Class) method.Namespace).GetBaseMethod(method);
                 for (int i = 0; i < method.Parameters.Count; i++)
                 {
                     method.Parameters[i].DefaultArgument = rootBaseMethod.Parameters[i].DefaultArgument;

src/Generator/Passes/GenerateAbstractImplementationsPass.cs

@@ -110,7 +110,7 @@ namespace CppSharp.Passes
                         var rootBaseMethod = abstractMethod;
                         do
                         {
-                            rootBaseMethod = @class.GetRootBaseMethod(rootBaseMethod, false, true);
+                            rootBaseMethod = @class.GetBaseMethod(rootBaseMethod, false, true);
                             if (found = (rootBaseMethod == @override))
                                 break;
                         } while (rootBaseMethod != null);

src/Generator/Passes/MultipleInheritancePass.cs

@@ -200,7 +200,7 @@ namespace CppSharp.Passes
                             parameterTypeComparer)))
                     continue;
                 var impl = new Method(method) { Namespace = @class };
-                var rootBaseMethod = @class.GetRootBaseMethod(method, true);
+                var rootBaseMethod = @class.GetBaseMethod(method, true);
                 if (rootBaseMethod != null && rootBaseMethod.IsDeclared)
                     impl.ExplicitInterfaceImpl = @interface;
                 @class.Methods.Add(impl);

src/Generator/Passes/RenamePass.cs

@@ -46,7 +46,7 @@ namespace CppSharp.Passes
             var method = decl as Method;
             if (method != null && !method.IsStatic)
             {
-                var rootBaseMethod = ((Class) method.Namespace).GetRootBaseMethod(method);
+                var rootBaseMethod = ((Class) method.Namespace).GetBaseMethod(method);
                 if (rootBaseMethod != null && rootBaseMethod != method)
                 {
                     newName = rootBaseMethod.Name;

tests/Common/Common.Tests.cs

@@ -8,7 +8,7 @@ using Enum = CommonTest.Enum;
 public class CommonTests : GeneratorTestFixture
 {
     [Test]
-    public void TestUncompilableCode()
+    public void TestCodeGeneration()
     {
         Assert.That(new ChangedAccessOfInheritedProperty().Property, Is.EqualTo(2));
         Foo.NestedAbstract a;
@@ -17,6 +17,10 @@ public class CommonTests : GeneratorTestFixture
         {
             Bar bar = foo;
         }
+        using (var overridesNonDirectVirtual = new OverridesNonDirectVirtual())
+        {
+            Assert.That(overridesNonDirectVirtual.retInt(), Is.EqualTo(3));
+        }
     }
 
     [Test]

tests/Common/Common.cpp

@@ -537,3 +537,16 @@ int DerivedClassOverrideAbstractVirtual::retInt()
 {
     return 1;
 }
+
+BufferForVirtualFunction::BufferForVirtualFunction()
+{
+}
+
+OverridesNonDirectVirtual::OverridesNonDirectVirtual()
+{
+}
+
+int OverridesNonDirectVirtual::retInt()
+{
+    return 3;
+}

tests/Common/Common.h

@@ -851,6 +851,19 @@ public:
     virtual int retInt();
 };
 
+class DLL_API BufferForVirtualFunction : public BaseClassVirtual
+{
+public:
+    BufferForVirtualFunction();
+};
+
+class DLL_API OverridesNonDirectVirtual : public BufferForVirtualFunction
+{
+public:
+    OverridesNonDirectVirtual();
+    virtual int retInt();
+};
+
 namespace boost
 {
     template <class T>         struct is_member_pointer_cv         { static const bool value = false; };