Merge pull request #359 from ddobrev/master

Fixed the ostream type map which failed with pointers

src/Generator/Generators/CLI/CLIHeadersTemplate.cs

@@ -368,7 +368,6 @@ namespace CppSharp.Generators.CLI
 
             // Output a default constructor that takes the native pointer.
             WriteLine("{0}({1} native);", @class.Name, nativeType);
-            WriteLine("{0}({1} native);", @class.Name, "System::IntPtr");
 
             foreach (var ctor in @class.Constructors)
             {

src/Generator/Generators/CLI/CLIMarshal.cs

@@ -83,7 +83,7 @@ namespace CppSharp.Generators.CLI
 
             if (pointee.IsPrimitiveType(PrimitiveType.Void))
             {
-                Context.Return.Write(Context.ReturnVarName);
+                Context.Return.Write("::System::IntPtr({0})", Context.ReturnVarName);
                 return true;
             }
 

src/Generator/Generators/CLI/CLISourcesTemplate.cs

@@ -192,8 +192,7 @@ namespace CppSharp.Generators.CLI
                 return;
 
             // Output a default constructor that takes the native pointer.
-            GenerateClassConstructor(@class, isIntPtr: false);
+            GenerateClassConstructor(@class);
-            GenerateClassConstructor(@class, isIntPtr: true);
 
             if (Options.GenerateFinalizers && @class.IsRefType)
             {
@@ -215,7 +214,7 @@ namespace CppSharp.Generators.CLI
 
             foreach (var method in @class.Methods)
             {
-                if (ASTUtils.CheckIgnoreMethod(method, this.Options))
+                if (ASTUtils.CheckIgnoreMethod(method, Options))
                     continue;
 
                 // C++/CLI does not allow special member funtions for value types.
@@ -611,25 +610,18 @@ namespace CppSharp.Generators.CLI
                 GeneratePropertySetter(variable, @class, variable.Name, variable.Type);
         }
 
-        private void GenerateClassConstructor(Class @class, bool isIntPtr)
+        private void GenerateClassConstructor(Class @class)
         {
             Write("{0}::{1}(", QualifiedIdentifier(@class), @class.Name);
 
             var nativeType = string.Format("::{0}*", @class.QualifiedOriginalName);
-            WriteLine("{0} native)", isIntPtr ? "System::IntPtr" : nativeType);
+            WriteLine("{0} native)", nativeType);
 
-            var hasBase = GenerateClassConstructorBase(@class, isIntPtr);
+            var hasBase = GenerateClassConstructorBase(@class);
 
             WriteStartBraceIndent();
 
-            var nativePtr = "native";
+            const string nativePtr = "native";
-
-            if (isIntPtr)
-            {
-                WriteLine("auto __native = (::{0}*)native.ToPointer();",
-                    @class.QualifiedOriginalName);
-                nativePtr = "__native";
-            }
 
             if (@class.IsRefType)
             {
@@ -680,7 +672,7 @@ namespace CppSharp.Generators.CLI
             }
         }
 
-        private bool GenerateClassConstructorBase(Class @class, bool isIntPtr, Method method = null)
+        private bool GenerateClassConstructorBase(Class @class, Method method = null)
         {
             var hasBase = @class.HasBase && @class.Bases[0].IsClass && @class.Bases[0].Class.IsDeclared;
             if (!hasBase)
@@ -695,12 +687,9 @@ namespace CppSharp.Generators.CLI
 
                 // We cast the value to the base clas type since otherwise there
                 // could be ambiguous call to overloaded constructors.
-                if (!isIntPtr)
-                {
                 var cppTypePrinter = new CppTypePrinter(Driver.TypeDatabase);
                 var nativeTypeName = baseClass.Visit(cppTypePrinter);
                 Write("({0}*)", nativeTypeName);
-                }
 
                 WriteLine("{0})", method != null ? "nullptr" : "native");
 
@@ -727,7 +716,7 @@ namespace CppSharp.Generators.CLI
             WriteLine(")");
 
             if (method.IsConstructor)
-                GenerateClassConstructorBase(@class, isIntPtr: false, method: method);
+                GenerateClassConstructorBase(@class, method: method);
 
             WriteStartBraceIndent();
 

src/Generator/Generators/CLI/CLITypePrinter.cs

@@ -154,10 +154,15 @@ namespace CppSharp.Generators.CLI
             {
                 // Skip one indirection if passed by reference
                 var param = Context.Parameter;
-                if (param != null && (param.IsOut || param.IsInOut))
+                bool isRefParam = param != null && (param.IsOut || param.IsInOut);
+                if (isRefParam)
                     return pointee.Visit(this, quals);
 
-                return pointee.Visit(this, quals) + "*";
+                if (pointee.IsPrimitiveType(PrimitiveType.Void))
+                    return "::System::IntPtr";
+
+                var result = pointee.Visit(this, quals);
+                return !isRefParam && result == "::System::IntPtr" ? "void**" : result + "*";
             }
 
             Enumeration @enum;

src/Generator/Types/Std/Stdlib.cs

@@ -315,7 +315,8 @@ namespace CppSharp.Types.Std
 
         public override void CLIMarshalToNative(MarshalContext ctx)
         {
-            var marshal = ctx.MarshalToNative as CLIMarshalManagedToNativePrinter;
+            var marshal = (CLIMarshalManagedToNativePrinter) ctx.MarshalToNative;
+            if (!ctx.Parameter.Type.Desugar().IsPointer())
                 marshal.ArgumentPrefix.Write("*");
             var marshalCtxName = string.Format("ctx_{0}", ctx.Parameter.Name);
             ctx.SupportBefore.WriteLine("msclr::interop::marshal_context {0};", marshalCtxName);

tests/Basic/Basic.Tests.cs

@@ -452,5 +452,11 @@ public class BasicTests : GeneratorTestFixture
         for (int i = 0; i < foo.fixedArray.Length; i++)
             Assert.That(array[i], Is.EqualTo(foo.fixedArray[i]));
     }
+
+    [Test]
+    public void TestInternalCtorAmbiguity()
+    {
+        new InvokesInternalCtorAmbiguity().InvokeInternalCtor();
+    }
 }
  

tests/Basic/Basic.cpp

@@ -317,3 +317,18 @@ std::string HasStdString::testStdString(std::string s)
 {
     return s + "_test";
 }
+
+InternalCtorAmbiguity::InternalCtorAmbiguity(void* param)
+{
+    // cause a crash to indicate this is the incorrect ctor to invoke
+    throw;
+}
+
+InvokesInternalCtorAmbiguity::InvokesInternalCtorAmbiguity() : ptr(0)
+{
+}
+
+InternalCtorAmbiguity* InvokesInternalCtorAmbiguity::InvokeInternalCtor()
+{
+    return ptr;
+}

tests/Basic/Basic.h

@@ -30,6 +30,7 @@ public:
     float B;
     IgnoredType ignoredType;
     int fixedArray[3];
+    void* ptr;
 
 	const char* GetANSI();
 	// TODO: VC++ does not support char16
@@ -630,3 +631,18 @@ public:
     std::string testStdString(std::string s);
     std::string s;
 };
+
+class DLL_API InternalCtorAmbiguity
+{
+public:
+    InternalCtorAmbiguity(void* param);
+};
+
+class DLL_API InvokesInternalCtorAmbiguity
+{
+public:
+    InvokesInternalCtorAmbiguity();
+    InternalCtorAmbiguity* InvokeInternalCtor();
+private:
+    InternalCtorAmbiguity* ptr;
+};

tests/CSharpTemp/CSharpTemp.Tests.cs

@@ -164,12 +164,4 @@ public class CSharpTempTests : GeneratorTestFixture
             Assert.AreEqual(q1.Array[i], q2.Array[i]);
         }
     }
-
-    [Test]
-    public void TestInternalCtorAmbiguity()
-    {
-        using (new InternalCtorAmbiguity().InvokeInternalCtor())
-        {
-        }
-    }
 }

tests/CSharpTemp/CSharpTemp.cpp

@@ -302,24 +302,3 @@ void PropertyWithIgnoredType::setIgnoredType(const IgnoredType<int> &value)
 {
     _ignoredType = value;
 }
-
-InternalCtorAmbiguity::InternalCtorAmbiguity() : copy(0)
-{
-}
-
-InternalCtorAmbiguity::InternalCtorAmbiguity(void* param) : copy(0)
-{
-    // cause a crash to indicate this is the incorrect ctor to invoke
-    throw;
-}
-
-InternalCtorAmbiguity* InternalCtorAmbiguity::InvokeInternalCtor()
-{
-    return copy = new InternalCtorAmbiguity();
-}
-
-InternalCtorAmbiguity::~InternalCtorAmbiguity()
-{
-    if (copy)
-        delete copy;
-}

tests/CSharpTemp/CSharpTemp.h

@@ -261,14 +261,3 @@ public:
 private:
     IgnoredType<int> _ignoredType;
 };
-
-class DLL_API InternalCtorAmbiguity
-{
-public:
-    InternalCtorAmbiguity();
-    InternalCtorAmbiguity(void* param);
-    InternalCtorAmbiguity* InvokeInternalCtor();
-    ~InternalCtorAmbiguity();
-private:
-    InternalCtorAmbiguity* copy;
-};

tests/STL/STL.h

@@ -36,4 +36,9 @@ struct DLL_API OStreamTest
     {
         stream << s;
     };
+
+    static void WriteToOStreamPtr(std::ostream* stream, const char* s)
+    {
+        *stream << s;
+    };
 };