gircore · badcel · Aug 24, 2023 · Aug 24, 2023
diff --git a/...neration/Generator/Renderer/Public/InstanceParameterToNativeExpression/Converter/Class.cs b/...neration/Generator/Renderer/Public/InstanceParameterToNativeExpression/Converter/Class.cs
@@ -0,0 +1,14 @@
+namespace Generator.Renderer.Public.InstanceParameterToNativeExpressions;
+
+public class Class : InstanceParameterConverter
+{
+    public bool Supports(GirModel.Type type)
+    {
+        return type is GirModel.Class;
+    }
+
+    public string GetExpression(GirModel.InstanceParameter instanceParameter)
+    {
+        return "this.Handle";
+    }
+}
diff --git a/...tion/Generator/Renderer/Public/InstanceParameterToNativeExpression/Converter/Interface.cs b/...tion/Generator/Renderer/Public/InstanceParameterToNativeExpression/Converter/Interface.cs
@@ -0,0 +1,14 @@
+namespace Generator.Renderer.Public.InstanceParameterToNativeExpressions;
+
+public class Interface : InstanceParameterConverter
+{
+    public bool Supports(GirModel.Type type)
+    {
+        return type is GirModel.Interface;
+    }
+
+    public string GetExpression(GirModel.InstanceParameter instanceParameter)
+    {
+        return "this.Handle";
+    }
+}
diff --git a/...ration/Generator/Renderer/Public/InstanceParameterToNativeExpression/Converter/Pointer.cs b/...ration/Generator/Renderer/Public/InstanceParameterToNativeExpression/Converter/Pointer.cs
@@ -0,0 +1,14 @@
+namespace Generator.Renderer.Public.InstanceParameterToNativeExpressions;
+
+public class Pointer : InstanceParameterConverter
+{
+    public bool Supports(GirModel.Type type)
+    {
+        return type is GirModel.Pointer;
+    }
+
+    public string GetExpression(GirModel.InstanceParameter instanceParameter)
+    {
+        return "this.Handle";
+    }
+}
diff --git a/...nerator/Renderer/Public/InstanceParameterToNativeExpression/InstanceParameterConverter.cs b/...nerator/Renderer/Public/InstanceParameterToNativeExpression/InstanceParameterConverter.cs
@@ -0,0 +1,7 @@
+namespace Generator.Renderer.Public.InstanceParameterToNativeExpressions;
+
+internal interface InstanceParameterConverter
+{
+    bool Supports(GirModel.Type type);
+    string GetExpression(GirModel.InstanceParameter instanceParameter);
+}
diff --git a/...enderer/Public/InstanceParameterToNativeExpression/InstanceParameterToNativeExpression.cs b/...enderer/Public/InstanceParameterToNativeExpression/InstanceParameterToNativeExpression.cs
@@ -0,0 +1,22 @@
+using System.Collections.Generic;
+
+namespace Generator.Renderer.Public;
+
+internal static class InstanceParameterToNativeExpression
+{
+    private static readonly List<InstanceParameterToNativeExpressions.InstanceParameterConverter> Converter = new()
+    {
+        new InstanceParameterToNativeExpressions.Class(),
+        new InstanceParameterToNativeExpressions.Interface(),
+        new InstanceParameterToNativeExpressions.Pointer(),
+    };
+
+    public static string Render(GirModel.InstanceParameter instanceParameter)
+    {
+        foreach (var converter in Converter)
+            if (converter.Supports(instanceParameter.Type))
+                return converter.GetExpression(instanceParameter);
+
+        throw new System.NotImplementedException($"Missing converter to convert from instance parameter to native expression: {instanceParameter}.");
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Public/MethodRenderer.cs b/src/Generation/Generator/Renderer/Public/MethodRenderer.cs
@@ -100,7 +100,7 @@ private static string RenderCallStatement(GirModel.Method method, IReadOnlyList<
             call.Append($"var {resultVariableName} = ");
 
         call.Append($"{Namespace.GetInternalName(method.Parent.Namespace)}.{method.Parent.Name}.{Method.GetInternalName(method)}(");
-        call.Append("this.Handle" + (parameters.Any() ? ", " : string.Empty));
+        call.Append(InstanceParameterToNativeExpression.Render(method.InstanceParameter) + (parameters.Any() ? ", " : string.Empty));
         call.Append(string.Join(", ", parameters.Select(x => x.GetCallName())));
         call.Append(Error.RenderParameter(method));
         call.Append(");\n");