Fixed the generated C# for subclasses of specialisations used as secondary bases.

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

Author: ddobrev

src/Generator/Generators/CSharp/CSharpSources.cs

@@ -1979,7 +1979,7 @@ private void GenerateDisposeMethods(Class @class)
             {
                 var @base = @class.GetNonIgnoredRootBase();
 
-                // Use interfaces if any - derived types with a this class as a seconary base, must be compatible with the map
+                // Use interfaces if any - derived types with a this class as a secondary base, must be compatible with the map
                 var @interface = @base.Namespace.Classes.FirstOrDefault(
                     c => c.IsInterface && c.OriginalClass == @base);
 

src/Generator/Passes/MultipleInheritancePass.cs

@@ -30,7 +30,7 @@ public MultipleInheritancePass()
         public override bool VisitTranslationUnit(TranslationUnit unit)
         {
             bool result = base.VisitTranslationUnit(unit);
-            foreach (var @interface in interfaces)
+            foreach (var @interface in interfaces.Where(i => !(i.Key is ClassTemplateSpecialization)))
                 @interface.Key.Namespace.Classes.Add(@interface.Value);
             interfaces.Clear();
             return result;
@@ -79,11 +79,9 @@ private Class GetNewInterface(string name, Class @base)
             else
             {
                 Class template = specialization.TemplatedDecl.TemplatedClass;
-                Class templatedInterface;
-                if (templatedInterfaces.ContainsKey(template))
-                    templatedInterface = templatedInterfaces[template];
-                else
-                    templatedInterfaces[template] = templatedInterface = GetInterface(template);
+                Class templatedInterface = GetInterface(template);
+                if (interfaces.ContainsKey(specialization))
+                    return interfaces[specialization];
                 var specializedInterface = new ClassTemplateSpecialization();
                 specializedInterface.Arguments.AddRange(specialization.Arguments);
                 specializedInterface.TemplatedDecl = new ClassTemplate { TemplatedDecl = templatedInterface };
@@ -94,11 +92,6 @@ private Class GetNewInterface(string name, Class @base)
             @interface.Access = @base.Access;
             @interface.Type = ClassType.Interface;
             @interface.OriginalClass = @base;
-            if (@base.IsTemplate)
-            {
-                @interface.IsDependent = true;
-                @interface.TemplateParameters.AddRange(@base.TemplateParameters);
-            }
 
             @interface.Bases.AddRange(
                 from b in @base.Bases
@@ -157,8 +150,15 @@ where property.IsDeclared
 
             @base.Bases.Add(new BaseClassSpecifier { Type = new TagType(@interface) });
 
-            if (specialization == null)
-                interfaces.Add(@base, @interface);
+            interfaces.Add(@base, @interface);
+            if (@base.IsTemplate)
+            {
+                @interface.IsDependent = true;
+                @interface.TemplateParameters.AddRange(@base.TemplateParameters);
+                templatedInterfaces[@base] = @interface;
+                foreach (var spec in @base.Specializations)
+                    GetNewInterface(name, spec);
+            }
             return @interface;
         }
 

tests/CSharp/CSharpTemplates.cpp

@@ -87,6 +87,14 @@ int HasVirtualTemplate::function()
     return v->function();
 }
 
+SpecializedInterfaceForMap::SpecializedInterfaceForMap()
+{
+}
+
+SpecializedInterfaceForMap::~SpecializedInterfaceForMap()
+{
+}
+
 HasSpecializationForSecondaryBase::HasSpecializationForSecondaryBase()
 {
 }

tests/CSharp/CSharpTemplates.h

@@ -432,7 +432,14 @@ class DLL_API HasVirtualTemplate
     HasDefaultTemplateArgument<bool, bool> explicitSpecialization;
 };
 
-class DLL_API HasSpecializationForSecondaryBase : T1, DependentValueFields<int>, IndependentFields<int>
+class DLL_API SpecializedInterfaceForMap : InternalWithExtension<char>
+{
+public:
+    SpecializedInterfaceForMap();
+    ~SpecializedInterfaceForMap();
+};
+
+class DLL_API HasSpecializationForSecondaryBase : T1, DependentValueFields<int>, IndependentFields<int>, InternalWithExtension<float>
 {
 public:
     HasSpecializationForSecondaryBase();
@@ -593,6 +600,7 @@ template class DLL_API TemplateWithIndexer<int>;
 template class DLL_API TemplateWithIndexer<UsedInTemplatedIndexer>;
 template class DLL_API TemplateWithIndexer<T1>;
 template class DLL_API TemplateWithIndexer<T2*>;
+template class DLL_API TemplateWithIndexer<float>;
 template class DLL_API TemplateDerivedFromRegularDynamic<RegularDynamic>;
 
 class TestForwardedClassInAnotherUnit;