Fix FunctionToInstanceMethod

Author: josetr

src/Generator/Generators/CSharp/CSharpMarshal.cs

@@ -728,14 +728,6 @@ public override bool VisitClassDecl(Class @class)
         private void MarshalRefClass(Class @class)
         {
             var method = Context.Function as Method;
-            if (method != null
-                && method.Conversion == MethodConversionKind.FunctionToInstanceMethod
-                && Context.ParameterIndex == 0)
-            {
-                Context.Return.Write("{0}", Helpers.InstanceIdentifier);
-                return;
-            }
-
             string param = Context.Parameter.Name;
             Type type = Context.Parameter.Type.Desugar(resolveTemplateSubstitution: false);
             string paramInstance;

tests/CSharp/CSharp.Gen.cs

@@ -31,6 +31,10 @@ public override void Setup(Driver driver)
         public override void SetupPasses(Driver driver)
         {
             driver.Context.TranslationUnitPasses.AddPass(new TestAttributesPass());
+            var moveFunctionToClassPass = driver.Context.TranslationUnitPasses.FindPass<MoveFunctionToClassPass>();
+            driver.Context.TranslationUnitPasses.RemovePass(moveFunctionToClassPass);
+            driver.Context.TranslationUnitPasses.AddPass(new FunctionToInstanceMethodPass());
+            driver.Context.TranslationUnitPasses.AddPass(new MoveFunctionToClassPass());
             driver.Options.MarshalCharAsManagedChar = true;
             driver.Options.GenerateDefaultValuesForArguments = true;
             driver.Options.GenerateClassTemplates = true;

tests/CSharp/CSharp.Tests.cs

@@ -1894,6 +1894,13 @@ public void TestFunctionToStaticMethod()
         Assert.That(CSharp.CSharp.TestFunctionToStaticMethodConstRefStruct(new FTIStruct(), new FTIStruct() { A = 6 }), Is.EqualTo(6));
     }
 
+    [Test]
+    public void TestFunctionToInstanceMethod()
+    {
+        Assert.That(new TestClass().FunctionToInstanceMethod(5), Is.EqualTo(25));
+        Assert.That(new TestClass().FunctionToInstanceMethod(new FTIStruct() { A = 5 }), Is.EqualTo(25));
+    }
+
     [TestCase(typeof(FTIStruct), ExpectedResult = true)]
     [TestCase(typeof(ClassWithoutNativeToManaged), ExpectedResult = false)]
     public bool TestClassGenerateNativeToManaged(Type type)

tests/CSharp/CSharp.cpp

@@ -1692,6 +1692,9 @@ DLL_API int TestFunctionToStaticMethodRefStruct(FTIStruct* bb, FTIStruct& defaul
 DLL_API int TestFunctionToStaticMethodConstStruct(FTIStruct* bb, const FTIStruct defaultValue) { return defaultValue.a; }
 DLL_API int TestFunctionToStaticMethodConstRefStruct(FTIStruct* bb, const FTIStruct& defaultValue) { return defaultValue.a; }
 
+DLL_API int TestClassFunctionToInstanceMethod(TestClass* bb, int value) { return value * value; }
+DLL_API int TestClassFunctionToInstanceMethod(TestClass* bb, FTIStruct& value) { return value.a * value.a; }
+
 int RuleOfThreeTester::constructorCalls = 0;
 int RuleOfThreeTester::destructorCalls = 0;
 int RuleOfThreeTester::copyConstructorCalls = 0;

tests/CSharp/CSharp.h

@@ -1535,6 +1535,11 @@ DLL_API int TestFunctionToStaticMethodRefStruct(FTIStruct* bb, FTIStruct& defaul
 DLL_API int TestFunctionToStaticMethodConstStruct(FTIStruct* bb, const FTIStruct defaultValue);
 DLL_API int TestFunctionToStaticMethodConstRefStruct(FTIStruct* bb, const FTIStruct& defaultValue);
 
+class DLL_API TestClass { int a; };
+
+DLL_API int TestClassFunctionToInstanceMethod(TestClass* bb, int value);
+DLL_API int TestClassFunctionToInstanceMethod(TestClass* bb, FTIStruct& cc);
+
 class ClassWithoutNativeToManaged { };
 
 struct DLL_API ClassWithIntValue {