Generate forward ref header for enum defined inside a class in C++/CLI (#1322)

Co-authored-by: Build Agent <[email protected]>

Author: IIFE

src/Generator/AST/ASTRecord.cs

@@ -150,6 +150,19 @@ public static bool IsFieldValueType(this ASTRecord record)
             return field.Type.Desugar().TryGetClass(out decl) && decl.IsValueType;
         }
 
+        public static bool IsEnumNestedInClass(this ASTRecord<Declaration> record)
+        {
+            Enumeration @enum = record.Value as Enumeration;
+            var typedDecl = record.Value as ITypedDecl;
+            if (@enum != null 
+                || (typedDecl?.Type?.TryGetEnum(out @enum)).GetValueOrDefault())
+            {
+                return @enum.Namespace is Class;
+            }
+
+            return false;
+        }
+
         public static bool IsDelegate(this ASTRecord record)
         {
             var typedef = record.Object as TypedefDecl;

src/Generator/Generators/CLI/CLITypeReferences.cs

@@ -176,7 +176,8 @@ public bool IsIncludeInHeader(ASTRecord<Declaration> record)
             if (TranslationUnit == record.Value.Namespace.TranslationUnit)
                 return false;
 
-            return record.IsBaseClass() || record.IsFieldValueType() || record.IsDelegate();
+            return record.IsBaseClass() || record.IsFieldValueType() || record.IsDelegate()
+                || record.IsEnumNestedInClass();
         }
 
         public override bool VisitDeclaration(Declaration decl)

tests/CLI/CLI.Tests.cs

@@ -35,4 +35,13 @@ public void GetEmployeeNameFromOrgTest()
             Assert.AreEqual("Employee", org.Employee.Name);
         }
     }
+
+    [Test]
+    public void TestConsumerOfEnumNestedInClass()
+    {
+        using (NestedEnumConsumer consumer = new NestedEnumConsumer())
+        {
+            Assert.AreEqual(ClassWithNestedEnum.NestedEnum.E1, consumer.GetPassedEnum(ClassWithNestedEnum.NestedEnum.E1));
+        }
+    }
 }

tests/CLI/CLI.h

@@ -3,6 +3,9 @@
 #include "UseTemplateTypeFromIgnoredClassTemplate/Employee.h"
 #include "UseTemplateTypeFromIgnoredClassTemplate/EmployeeOrg.h"
 
+#include "NestedEnumInClassTest/ClassWithNestedEnum.h"
+#include "NestedEnumInClassTest/NestedEnumConsumer.h"
+
 #include <ostream>
 
 // Tests for C++ types

tests/CLI/NestedEnumInClassTest/ClassWithNestedEnum.cpp

@@ -0,0 +1 @@
+#include "ClassWithNestedEnum.h"

tests/CLI/NestedEnumInClassTest/ClassWithNestedEnum.h

@@ -0,0 +1,13 @@
+#pragma once
+
+#include "../../Tests.h"
+
+class DLL_API ClassWithNestedEnum
+{
+public:
+    enum NestedEnum
+    {
+        E1,
+        E2
+    };
+};

tests/CLI/NestedEnumInClassTest/NestedEnumConsumer.cpp

@@ -0,0 +1,6 @@
+#include "NestedEnumConsumer.h"
+
+ClassWithNestedEnum::NestedEnum NestedEnumConsumer::GetPassedEnum(ClassWithNestedEnum::NestedEnum e)
+{
+    return e;
+}

tests/CLI/NestedEnumInClassTest/NestedEnumConsumer.h

@@ -0,0 +1,11 @@
+#pragma once
+
+#include "../../Tests.h"
+
+#include "ClassWithNestedEnum.h"
+
+class DLL_API NestedEnumConsumer
+{
+public:
+    ClassWithNestedEnum::NestedEnum GetPassedEnum(ClassWithNestedEnum::NestedEnum e);
+};

tests/CLI/premake4.lua

@@ -1,2 +1,2 @@
 group "Tests/CLI"
-  SetupTestCLI("CLI", { "Employee", "EmployeeOrg" })
+  SetupTestCLI("CLI", { "Employee", "EmployeeOrg", "ClassWithNestedEnum", "NestedEnumConsumer" })