gircore · badcel · Mar 18, 2023 · Mar 18, 2023
diff --git a/src/Generation/Generator/Model/Property.cs b/src/Generation/Generator/Model/Property.cs
@@ -67,8 +67,7 @@ public static bool SupportsAccessorGetMethod(GirModel.Property property, [NotNul
 
         getter = property.Getter;
         var getterType = property.Getter.ReturnType
-            .Map(RenderableReturnTypeFactory.Create)
-            .NullableTypeName;
+            .Map(ReturnTypeRenderer.Render);
 
         return GetNullableTypeName(property) == getterType;
     }

diff --git a/src/Generation/Generator/Renderer/Internal/Callback/Callback.cs b/src/Generation/Generator/Renderer/Internal/Callback/Callback.cs
@@ -6,7 +6,7 @@ public static string Render(GirModel.Callback callback)
     {
         try
         {
-            return $"public delegate {ReturnType.RenderForCallback(callback.ReturnType)} {Model.Callback.GetInternalDelegateName(callback)}({CallbackParameters.Render(callback.Parameters)});";
+            return $"public delegate {ReturnTypeRendererCallback.Render(callback.ReturnType)} {Model.Callback.GetInternalDelegateName(callback)}({CallbackParameters.Render(callback.Parameters)});";
         }
         catch (System.Exception ex)
         {

diff --git a/src/Generation/Generator/Renderer/Internal/Callback/CallbackDelegate.cs b/src/Generation/Generator/Renderer/Internal/Callback/CallbackDelegate.cs
@@ -16,7 +16,7 @@ namespace {Namespace.GetInternalName(callback.Namespace)}
 {{
     // AUTOGENERATED FILE - DO NOT MODIFY
 
-    public delegate {ReturnType.RenderForCallback(callback.ReturnType)} {callback.Name}({CallbackParameters.Render(callback.Parameters)});
+    public delegate {ReturnTypeRendererCallback.Render(callback.ReturnType)} {callback.Name}({CallbackParameters.Render(callback.Parameters)});
 }}";
     }
 }
diff --git a/src/Generation/Generator/Renderer/Internal/Constructors.cs b/src/Generation/Generator/Renderer/Internal/Constructors.cs
@@ -27,7 +27,7 @@ private static string Render(GirModel.Constructor? constructor)
 {DocComments.Render(constructor.ReturnType)}
 {VersionAttribute.Render(constructor.Version)}
 [DllImport(ImportResolver.Library, EntryPoint = ""{constructor.CIdentifier}"")]
-public static extern {ReturnType.Render(constructor.ReturnType)} {Constructor.GetName(constructor)}({Parameters.Render(constructor.Parameters)}{Error.Render(constructor)});";
+public static extern {ReturnTypeRenderer.Render(constructor.ReturnType)} {Constructor.GetName(constructor)}({Parameters.Render(constructor.Parameters)}{Error.Render(constructor)});";
         }
         catch (Exception e)
         {

diff --git a/src/Generation/Generator/Renderer/Internal/Functions.cs b/src/Generation/Generator/Renderer/Internal/Functions.cs
@@ -28,7 +28,7 @@ public static string Render(GirModel.Function? function)
 {PlatformSupportAttribute.Render(function as GirModel.PlatformDependent)}
 {VersionAttribute.Render(function.Version)}
 [DllImport(ImportResolver.Library, EntryPoint = ""{function.CIdentifier}"")]
-public static extern {ReturnType.Render(function.ReturnType)} {Function.GetName(function)}({Parameters.Render(function.Parameters)}{Error.Render(function)});";
+public static extern {ReturnTypeRenderer.Render(function.ReturnType)} {Function.GetName(function)}({Parameters.Render(function.Parameters)}{Error.Render(function)});";
         }
         catch (Exception ex)
         {

diff --git a/src/Generation/Generator/Renderer/Internal/Methods.cs b/src/Generation/Generator/Renderer/Internal/Methods.cs
@@ -30,7 +30,7 @@ private static string Render(GirModel.Method? method)
 {DocComments.Render(method.ReturnType)}
 {VersionAttribute.Render(method.Version)}
 [DllImport(ImportResolver.Library, EntryPoint = ""{method.CIdentifier}"")]
-public static extern {ReturnType.Render(method.ReturnType)} {Method.GetInternalName(method)}({InstanceParameters.Render(method.InstanceParameter)}{separator}{Parameters.Render(method.Parameters)}{Error.Render(method)});";
+public static extern {ReturnTypeRenderer.Render(method.ReturnType)} {Method.GetInternalName(method)}({InstanceParameters.Render(method.InstanceParameter)}{separator}{Parameters.Render(method.Parameters)}{Error.Render(method)});";
         }
         catch (Exception e)
         {

diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/ArrayClassReturnTypeFactory.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/ArrayClassReturnTypeFactory.cs
diff --git a/...Generation/Generator/Renderer/Internal/ReturnType/ArrayPrimitiveValueReturnTypeFactory.cs b/...Generation/Generator/Renderer/Internal/ReturnType/ArrayPrimitiveValueReturnTypeFactory.cs
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/ArrayRecordReturnTypeFactory.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/ArrayRecordReturnTypeFactory.cs
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/ArrayStringReturnTypeFactory.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/ArrayStringReturnTypeFactory.cs
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/BitfieldReturnTypeFactory.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/BitfieldReturnTypeFactory.cs
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/ClassReturnTypeFactory.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/ClassReturnTypeFactory.cs
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/ArrayClass.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/ArrayClass.cs
@@ -0,0 +1,14 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class ArrayClass : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.IsArray<GirModel.Class>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        return new RenderableReturnType(Model.Type.PointerArray);
+    }
+}
diff --git a/.../Generator/Renderer/Internal/ReturnType/Converter/ArrayPrimitiveValueReturnTypeFactory.cs b/.../Generator/Renderer/Internal/ReturnType/Converter/ArrayPrimitiveValueReturnTypeFactory.cs
@@ -0,0 +1,14 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class ArrayPrimitiveValueType : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.IsArray<GirModel.PrimitiveValueType>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        return new RenderableReturnType(Model.ArrayType.GetName(returnType.AnyType.AsT1));
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/ArrayRecord.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/ArrayRecord.cs
@@ -0,0 +1,17 @@
+using Generator.Model;
+
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class ArrayRecord : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.IsArray<GirModel.Record>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        //Internal arrays of records (SafeHandles) are not supported by the runtime and must be converted via an IntPtr[]
+        return new RenderableReturnType(Type.PointerArray);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/ArrayString.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/ArrayString.cs
@@ -0,0 +1,20 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class ArrayString : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.IsArray<GirModel.String>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var arrayType = returnType.AnyType.AsT1;
+        var isMarshalAble = returnType.Transfer != GirModel.Transfer.None || arrayType.Length != null;
+        var nullableTypeName = isMarshalAble
+            ? Model.ArrayType.GetName(arrayType)
+            : Model.Type.Pointer;
+
+        return new RenderableReturnType(nullableTypeName);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Bitfield.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Bitfield.cs
@@ -0,0 +1,15 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class Bitfield : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.Bitfield>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var type = (GirModel.Bitfield) returnType.AnyType.AsT0;
+        return new RenderableReturnType(Model.ComplexType.GetFullyQualified(type));
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Class.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Class.cs
@@ -0,0 +1,18 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class Class : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.Class>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var nullableTypeName = returnType.IsPointer
+            ? Model.Type.Pointer
+            : Model.Type.GetName(returnType.AnyType.AsT0);
+
+        return new RenderableReturnType(nullableTypeName);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Enumeration.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Enumeration.cs
@@ -0,0 +1,15 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class Enumeration : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.Enumeration>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var type = (GirModel.Enumeration) returnType.AnyType.AsT0;
+        return new RenderableReturnType(Model.ComplexType.GetFullyQualified(type));
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Interface.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Interface.cs
@@ -0,0 +1,20 @@
+using Generator.Model;
+
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class Interface : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.Interface>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var nullableTypeName = returnType.IsPointer
+            ? Type.Pointer
+            : Type.GetName(returnType.AnyType.AsT0);
+
+        return new RenderableReturnType(nullableTypeName);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/PlatformString.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/PlatformString.cs
@@ -0,0 +1,22 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class PlatformString : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.PlatformString>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var nullableTypeName = returnType switch
+        {
+            { Nullable: true, Transfer: GirModel.Transfer.None } => Model.PlatformString.GetInternalNullableUnownedHandleName(),
+            { Nullable: false, Transfer: GirModel.Transfer.None } => Model.PlatformString.GetInternalNonNullableUnownedHandleName(),
+            { Nullable: true, Transfer: GirModel.Transfer.Full } => Model.PlatformString.GetInternalNullableOwnedHandleName(),
+            _ => Model.PlatformString.GetInternalNonNullableOwnedHandleName(),
+        };
+
+        return new RenderableReturnType(nullableTypeName);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/PlatformStringInCallback.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/PlatformStringInCallback.cs
@@ -0,0 +1,17 @@
+using Generator.Model;
+
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class PlatformStringInCallback : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.PlatformString>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        // This must be IntPtr since SafeHandle's cannot be returned from managed to unmanaged.
+        return new RenderableReturnType(Type.Pointer);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Pointer.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Pointer.cs
@@ -0,0 +1,16 @@
+using Generator.Model;
+
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class Pointer : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.Pointer>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        return new RenderableReturnType(Type.Pointer);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/PrimitiveValueType.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/PrimitiveValueType.cs
@@ -0,0 +1,18 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class PrimitiveValueType : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.PrimitiveValueType>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var nullableTypeName = returnType.IsPointer
+            ? Model.Type.Pointer
+            : Model.Type.GetName(returnType.AnyType.AsT0);
+
+        return new RenderableReturnType(nullableTypeName);
+    }
+}
diff --git a/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Record.cs b/src/Generation/Generator/Renderer/Internal/ReturnType/Converter/Record.cs
@@ -0,0 +1,22 @@
+namespace Generator.Renderer.Internal.ReturnType;
+
+internal class Record : ReturnTypeConverter
+{
+    public bool Supports(GirModel.ReturnType returnType)
+    {
+        return returnType.AnyType.Is<GirModel.Record>();
+    }
+
+    public RenderableReturnType Convert(GirModel.ReturnType returnType)
+    {
+        var type = (GirModel.Record) returnType.AnyType.AsT0;
+
+        var nullableTypeName = !returnType.IsPointer
+            ? Model.Record.GetFullyQualifiedInternalStructName(type)
+            : returnType.Transfer == GirModel.Transfer.None
+                ? Model.Record.GetFullyQualifiedInternalUnownedHandle(type)
+                : Model.Record.GetFullyQualifiedInternalOwnedHandle(type);
+
+        return new RenderableReturnType(nullableTypeName);
+    }
+}
-Original file line number
+Diff line change
@@ Expand Up / @@ -6,7 +6,7 @@ public static string Render(GirModel.Callback callback) @@
         {
             try
             {
-                return $"public delegate {ReturnType.RenderForCallback(callback.ReturnType)} {Model.Callback.GetInternalDelegateName(callback)}({CallbackParameters.Render(callback.Parameters)});";
+                return $"public delegate {ReturnTypeRendererCallback.Render(callback.ReturnType)} {Model.Callback.GetInternalDelegateName(callback)}({CallbackParameters.Render(callback.Parameters)});";
             }
             catch (System.Exception ex)
             {
@@ Expand Down @@