Fixed the generated C# for fixed arrays of Booleans.

fixes #1004 * mend Fixed the generated C# for fixed arrays of Booleans
mono · Nov 19, 2017 · 04a1591 · 04a1591
1 parent 481bbc0
commit 04a1591
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 2 deletions.
diff --git a/src/Generator/Generators/CSharp/CSharpMarshal.cs b/src/Generator/Generators/CSharp/CSharpMarshal.cs
@@ -115,7 +115,10 @@ public override bool VisitArrayType(ArrayType array, TypeQualifiers quals)
                         }
                         else
                         {
-                            if (arrayType.IsPrimitiveType(PrimitiveType.Char) &&
+                            if (arrayType.IsPrimitiveType(PrimitiveType.Bool))
+                                supportBefore.WriteLineIndent($@"{value}[i] = {
+                                    Context.ReturnVarName}[i] != 0;");
+                            else if (arrayType.IsPrimitiveType(PrimitiveType.Char) &&
                                 Context.Context.Options.MarshalCharAsManagedChar)
                                 supportBefore.WriteLineIndent($@"{value}[i] = global::System.Convert.ToChar({
                                     Context.ReturnVarName}[i]);");
@@ -514,7 +517,11 @@ public override bool VisitArrayType(ArrayType array, TypeQualifiers quals)
                     }
                     else
                     {
-                        if (arrayType.IsPrimitiveType(PrimitiveType.Char) &&
+                        if (arrayType.IsPrimitiveType(PrimitiveType.Bool))
+                            supportBefore.WriteLineIndent($@"{
+                                Context.ReturnVarName}[i] = (byte)({
+                                Context.ArgName}[i] ? 1 : 0);");
+                        else if (arrayType.IsPrimitiveType(PrimitiveType.Char) &&
                             Context.Context.Options.MarshalCharAsManagedChar)
                             supportBefore.WriteLineIndent($@"{
                                 Context.ReturnVarName}[i] = global::System.Convert.ToSByte({

diff --git a/tests/CSharp/CSharp.Tests.cs b/tests/CSharp/CSharp.Tests.cs
@@ -281,6 +281,24 @@ public void TestCopyCtor()
         }
     }
 
+    [Test]
+    public void TestBooleanArray()
+    {
+        Foo foo = new Foo { A = 10 };
+        var new_values = new bool[5];
+        for(int i = 0; i < new_values.Length; ++i)
+        {
+            new_values[i] = i % 2 == 0;
+        }
+        foo.Btest = new_values;
+        Assert.AreEqual(true, foo.Btest[0]);
+        Assert.AreEqual(false, foo.Btest[1]);
+        Assert.AreEqual(true, foo.Btest[2]);
+        Assert.AreEqual(false, foo.Btest[3]);
+        Assert.AreEqual(true, foo.Btest[4]);
+    }
+
+
     [Test]
     public void TestImplicitCtor()
     {

diff --git a/tests/CSharp/CSharp.h b/tests/CSharp/CSharp.h
@@ -32,6 +32,8 @@ class DLL_API Foo
     int operator ++();
     int operator --();
 
+    bool btest[5];
+
 protected:
     int P;
     TemplateInAnotherUnit<int> templateInAnotherUnit;