By reference enum param fixes (#1321)

Fix generated C++/CLI of pointers to enums

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

Author: IIFE

src/Generator/Generators/CLI/CLIMarshal.cs

@@ -517,10 +517,15 @@ public override bool VisitPointerType(PointerType pointer, TypeQualifiers quals)
             Enumeration @enum;
             if (pointee.TryGetEnum(out @enum))
             {
-                var isRef = Context.Parameter.Usage == ParameterUsage.Out ||
+                var isRef = Context.Parameter.Type.IsReference() ||
+                    Context.Parameter.Usage == ParameterUsage.Out ||
                     Context.Parameter.Usage == ParameterUsage.InOut;
 
-                ArgumentPrefix.Write("&");
+                if(!isRef)
+                {
+                    ArgumentPrefix.Write("&");
+                }
+
                 Context.Return.Write("(::{0}){1}{2}", @enum.QualifiedOriginalName,
                     isRef ? string.Empty : "*", Context.Parameter.Name);
                 return true;

src/Generator/Generators/CLI/CLITypePrinter.cs

@@ -146,11 +146,12 @@ public override TypePrinterResult VisitPointerType(PointerType pointer,
             Enumeration @enum;
             if (pointee.TryGetEnum(out @enum))
             {
-                var typeName = @enum.Visit(this);
+                var typeName = VisitDeclaration(@enum, quals);
 
                 // Skip one indirection if passed by reference
-                if (Parameter != null && (Parameter.IsOut || Parameter.IsInOut)
-                    && pointee == finalPointee)
+                if (Parameter != null && (Parameter.Type.IsReference() 
+                    || ((Parameter.IsOut || Parameter.IsInOut)
+                    && pointee == finalPointee)))
                     return typeName;
 
                 return $"{typeName}*";

tests/CLI/CLI.Tests.cs

@@ -17,4 +17,13 @@ public void TestStdString()
     {
         Assert.AreEqual("test_test", new Date(0, 0, 0).TestStdString("test"));
     }
+
+    [Test]
+    public void TestByRefEnumParam()
+    {
+        using (var byRefEnumParam = new TestByRefEnumParam())
+        {
+            Assert.AreEqual(EnumParam.E1, byRefEnumParam.GetPassedEnumParam(EnumParam.E1));
+        }
+    }
 }

tests/CLI/CLI.cpp

@@ -25,4 +25,9 @@ IncompleteStruct* createIncompleteStruct()
 DLL_API void useIncompleteStruct(IncompleteStruct * a)
 {
     return;
-}
+}
+
+EnumParam TestByRefEnumParam::GetPassedEnumParam(EnumParam & e)
+{
+    return e;
+}

tests/CLI/CLI.h

@@ -55,4 +55,16 @@ struct CompleteIncompleteStruct;
 typedef struct IncompleteStruct IncompleteStruct;
 
 DLL_API IncompleteStruct* createIncompleteStruct();
-DLL_API void useIncompleteStruct(IncompleteStruct* a);
+DLL_API void useIncompleteStruct(IncompleteStruct* a);
+
+enum EnumParam
+{
+    E1,
+    E2
+};
+
+class DLL_API TestByRefEnumParam
+{
+public:
+    EnumParam GetPassedEnumParam(EnumParam& e);
+};