Skip to content

Generator: Use UntypedRecord model in untyped record renderers #1572

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
badcel merged 1 commit into from
Jul 26, 2026
Merged

Generator: Use UntypedRecord model in untyped record renderers #1572

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Generation/Generator/Renderer/Internal/ReturnType/Converter/UntypedRecord.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ public RenderableReturnType Convert(GirModel.ReturnType returnType)

var typeName = returnType switch
{
{ Transfer: Transfer.Full } => Model.TypedRecord.GetFullyQuallifiedOwnedHandle(type),
{ Transfer: Transfer.None } => Model.TypedRecord.GetFullyQuallifiedUnownedHandle(type),
{ Transfer: Transfer.Full } => Model.UntypedRecord.GetFullyQuallifiedOwnedHandle(type),
{ Transfer: Transfer.None } => Model.UntypedRecord.GetFullyQuallifiedUnownedHandle(type),
_ => throw new Exception($"Unsupported transfer type {returnType.Transfer} for untyped record {type.Name}")
};

Expand Down
2 changes: 1 addition & 1 deletion src/Generation/Generator/Renderer/Internal/UntypedRecordData.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ namespace {Namespace.GetInternalName(record.Namespace)};

{PlatformSupportAttribute.Render(record as GirModel.PlatformDependent)}
[StructLayout(LayoutKind.Sequential)]
public partial struct {Model.TypedRecord.GetDataName(record)}
public partial struct {Model.UntypedRecord.GetDataName(record)}
{{
{record.Fields
.Select(x => x.AnyTypeOrCallback)
Expand Down
4 changes: 2 additions & 2 deletions src/Generation/Generator/Renderer/Internal/UntypedRecordHandle.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ public static string Render(GirModel.Record record)
var arrayHandleType = Model.UntypedRecord.GetInternalArrayHandle(record);
var arrayUnownedHandleTypeName = Model.UntypedRecord.GetInternalArrayUnownedHandle(record);
var arrayOwnedHandleTypeName = Model.UntypedRecord.GetInternalArrayOwnedHandle(record);
var fullyQualifiedType = Model.TypedRecord.GetFullyQualifiedPublicClassName(record);
var fullyQualifiedType = Model.UntypedRecord.GetFullyQualifiedPublicClassName(record);
var fullyQuallifiedDataName = Model.UntypedRecord.GetFullyQuallifiedDataName(record);

return $@"using System;
Expand Down Expand Up @@ -186,7 +186,7 @@ public class {arrayUnownedHandleTypeName} : {arrayHandleType}
{{
var ownedHandle = new {Model.UntypedRecord.GetFullyQuallifiedUnownedHandle(record)}(currentHandle).Copy();
data[i] = new {fullyQualifiedType}(ownedHandle);
currentHandle += Marshal.SizeOf<{Model.TypedRecord.GetFullyQuallifiedDataName(record)}>();
currentHandle += Marshal.SizeOf<{Model.UntypedRecord.GetFullyQuallifiedDataName(record)}>();
}}

return data;
Expand Down
4 changes: 2 additions & 2 deletions ...ion/Generator/Renderer/Public/ParameterToNativeExpression/Converter/UntypedRecordArray.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,10 +89,10 @@ private static void StructArray(ParameterToNativeData parameter, IEnumerable<Par
parameter.SetCallName(() => nativeVariableName);

var nullable = parameter.Parameter.Nullable
? $"{parameterName} is null ? ({Model.TypedRecord.GetFullyQuallifiedArrayHandle(record)}){Model.TypedRecord.GetFullyQuallifiedArrayNullHandle(record)} : "
? $"{parameterName} is null ? ({Model.UntypedRecord.GetFullyQuallifiedArrayHandle(record)}){Model.UntypedRecord.GetFullyQuallifiedArrayNullHandle(record)} : "
: string.Empty;

parameter.SetExpression(() => $"var {nativeVariableName} = {nullable} {Model.TypedRecord.GetFullyQuallifiedArrayOwnedHandle(record)}.Create({parameterName});");
parameter.SetExpression(() => $"var {nativeVariableName} = {nullable} {Model.UntypedRecord.GetFullyQuallifiedArrayOwnedHandle(record)}.Create({parameterName});");

var lengthIndex = parameter.Parameter.AnyTypeOrVarArgs.AsT0.AsT1.Length ?? throw new Exception("Length missing");
var lengthParameter = allParameters.ElementAt(lengthIndex);
Expand Down
Loading