Fixed the generated C# for templates derived from regular dynamic classes.

Fixes #967.

Signed-off-by: Dimitar Dobrev <[email protected]>

Author: ddobrev

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -1379,7 +1379,7 @@ public void GenerateVTable(Class @class)
 
             // Generate a delegate type for each method.
             foreach (var method in wrappedEntries.Select(e => e.Method))
-                GenerateVTableMethodDelegates(containingClass, containingClass.IsDependent ?
+                GenerateVTableMethodDelegates(containingClass, method.Namespace.IsDependent ?
                    (Method) method.InstantiatedFrom : method);
 
             WriteLine("private static void*[] __ManagedVTables;");

tests/CSharp/CSharp.Tests.cs

@@ -841,6 +841,15 @@ public void TestPropertyReturnsTemplateWithRenamedTypeArg()
         }
     }
 
+    [Test]
+    public void TestTemplateDerivedFromRegularDynamic()
+    {
+        using (var templateDerivedFromRegularDynamic = new TemplateDerivedFromRegularDynamic<RegularDynamic>())
+        {
+            templateDerivedFromRegularDynamic.VirtualFunction();
+        }
+    }
+
     [Test]
     public void TestAbstractImplementatonsInPrimaryAndSecondaryBases()
     {

tests/CSharp/CSharpTemplates.cpp

@@ -108,9 +108,24 @@ void TemplateSpecializer::completeSpecializationInParameter(TwoTemplateArgs<int
 {
 }
 
+RegularDynamic::RegularDynamic()
+{
+}
+
+RegularDynamic::~RegularDynamic()
+{
+}
+
+void RegularDynamic::virtualFunction()
+{
+}
+
 void forceUseSpecializations(IndependentFields<int> _1, IndependentFields<bool> _2,
                              IndependentFields<T1> _3, IndependentFields<std::string> _4,
-                             VirtualTemplate<int> _5, VirtualTemplate<bool> _6,
-                             HasDefaultTemplateArgument<int, int> _7, std::string s)
+                             DependentValueFields<int> _5,
+                             VirtualTemplate<int> _6, VirtualTemplate<bool> _7,
+                             HasDefaultTemplateArgument<int, int> _8, DerivedChangesTypeName<T1> _9,
+                             TemplateWithIndexer<int> _10, TemplateWithIndexer<T1> _11,
+                             TemplateWithIndexer<T2*> _12, TemplateDerivedFromRegularDynamic<RegularDynamic> _13, std::string s)
 {
 }

tests/CSharp/CSharpTemplates.h

@@ -449,14 +449,40 @@ struct MapResultType<InputSequence<T>, MapFunctor>
     typedef InputSequence<typename LazyResultType<MapFunctor>::Type> ResultType;
 };
 
+class RegularDynamic
+{
+public:
+    RegularDynamic();
+    ~RegularDynamic();
+    virtual void virtualFunction();
+};
+
+template<typename T>
+class TemplateDerivedFromRegularDynamic : public RegularDynamic
+{
+public:
+    TemplateDerivedFromRegularDynamic();
+    ~TemplateDerivedFromRegularDynamic();
+};
+
+template<typename T>
+TemplateDerivedFromRegularDynamic<T>::TemplateDerivedFromRegularDynamic()
+{
+}
+
+template<typename T>
+TemplateDerivedFromRegularDynamic<T>::~TemplateDerivedFromRegularDynamic()
+{
+}
+
 // we optimise specialisations so that only actually used ones are wrapped
 void forceUseSpecializations(IndependentFields<int> _1, IndependentFields<bool> _2,
                              IndependentFields<T1> _3, IndependentFields<std::string> _4,
                              DependentValueFields<int> _5,
                              VirtualTemplate<int> _6, VirtualTemplate<bool> _7,
                              HasDefaultTemplateArgument<int, int> _8, DerivedChangesTypeName<T1> _9,
                              TemplateWithIndexer<int> _10, TemplateWithIndexer<T1> _11,
-                             TemplateWithIndexer<T2*> _12, std::string s);
+                             TemplateWithIndexer<T2*> _12, TemplateDerivedFromRegularDynamic<RegularDynamic> _13, std::string s);
 
 // force the symbols for the template instantiations because we do not have the auto-compilation for the generated C++ source
 template class DLL_API IndependentFields<int>;
@@ -472,6 +498,7 @@ template class DLL_API DerivedChangesTypeName<T1>;
 template class DLL_API TemplateWithIndexer<int>;
 template class DLL_API TemplateWithIndexer<T1>;
 template class DLL_API TemplateWithIndexer<T2*>;
+template class DLL_API TemplateDerivedFromRegularDynamic<RegularDynamic>;
 
 class TestForwardedClassInAnotherUnit;