Fixed the renaming of methods in forwarded types from secondary bases…

… in dependencies. Signed-off-by: Dimitar Dobrev <dpldobrev@protonmail.com>
mono · Jul 28, 2017 · d2426a7 · d2426a7
1 parent 8b9c3ab
commit d2426a7
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 4 deletions.
diff --git a/src/Generator/Passes/RenamePass.cs b/src/Generator/Passes/RenamePass.cs
@@ -30,6 +30,7 @@ public int GetHashCode(Parameter obj)
 
         protected RenamePass()
         {
+            VisitOptions.VisitFunctionParameters = false;
             VisitOptions.VisitFunctionReturnType = false;
             VisitOptions.VisitTemplateArguments = false;
             // these need to be visited but in a different order (see VisitClassDecl) so disable the default order
@@ -226,6 +227,9 @@ public override bool VisitClassDecl(Class @class)
             if (!base.VisitClassDecl(@class))
                 return false;
 
+            if (@class.OriginalClass != null)
+                VisitClassDecl(@class.OriginalClass);
+
             foreach (var property in @class.Properties.OrderByDescending(p => p.Access))
                 VisitProperty(property);
 

diff --git a/tests/NamespacesBase/NamespacesBase.cpp b/tests/NamespacesBase/NamespacesBase.cpp
@@ -36,3 +36,15 @@ int HasVirtualInCore::virtualInCore(int parameter)
 {
     return 1;
 }
+
+SecondaryBase::SecondaryBase()
+{
+}
+
+SecondaryBase::~SecondaryBase()
+{
+}
+
+void SecondaryBase::function()
+{
+}
diff --git a/tests/NamespacesBase/NamespacesBase.h b/tests/NamespacesBase/NamespacesBase.h
@@ -65,3 +65,14 @@ class DLL_API HasVirtualInCore
     HasVirtualInCore();
     virtual int virtualInCore(int parameter);
 };
+
+class DLL_API DerivedFromSecondaryBaseInDependency;
+typedef DerivedFromSecondaryBaseInDependency RenameDerivedBeforeBase;
+
+class DLL_API SecondaryBase
+{
+public:
+    SecondaryBase();
+    ~SecondaryBase();
+    void function();
+};
diff --git a/tests/NamespacesDerived/NamespacesDerived.Tests.cs b/tests/NamespacesDerived/NamespacesDerived.Tests.cs
@@ -4,6 +4,12 @@
 [TestFixture]
 public class NamespaceDerivedTests
 {
+    [Test]
+    public void TestCodeGeneration()
+    {
+        using (new DerivedFromSecondaryBaseInDependency()) { }
+    }
+
     [Test]
     public void TestNonRenamedMethod()
     {
@@ -27,9 +33,6 @@ public void TestOverrideMethodFromDependency()
 
     private class OverrideMethodFromDependency : HasVirtualInDependency
     {
-        public override int VirtualInCore(int parameter)
-        {
-            return 2;
-        }
+        public override int VirtualInCore(int parameter) => 2;
     }
 }
diff --git a/tests/NamespacesDerived/NamespacesDerived.cpp b/tests/NamespacesDerived/NamespacesDerived.cpp
@@ -70,3 +70,11 @@ int HasVirtualInDependency::callManagedOverride()
 {
     return managedObject->virtualInCore(0);
 }
+
+DerivedFromSecondaryBaseInDependency::DerivedFromSecondaryBaseInDependency()
+{
+}
+
+DerivedFromSecondaryBaseInDependency::~DerivedFromSecondaryBaseInDependency()
+{
+}
diff --git a/tests/NamespacesDerived/NamespacesDerived.h b/tests/NamespacesDerived/NamespacesDerived.h
@@ -71,6 +71,13 @@ class DLL_API HasVirtualInDependency : public HasVirtualInCore
     int callManagedOverride();
 };
 
+class DLL_API DerivedFromSecondaryBaseInDependency : public Derived, public SecondaryBase
+{
+public:
+    DerivedFromSecondaryBaseInDependency();
+    ~DerivedFromSecondaryBaseInDependency();
+};
+
 namespace NamespacesBase
 {
     class DLL_API ClassInNamespaceNamedAfterDependency