Restore Zig glue argument wrapper names

Author: lukewilliamboswell

src/cli/test/parallel_cli_runner.zig

@@ -2551,9 +2551,11 @@ fn customGlueZigCompiles(io: std.Io, allocator: Allocator, env: *const CaseEnv,
         \\    var host: abi.RocHost = undefined;
         \\    var box: abi.RocBox = null;
         \\    var str: abi.RocStr = undefined;
+        \\    var builder_args: abi.BuilderPrint_valueArgs = undefined;
         \\    _ = &host;
         \\    _ = &box;
         \\    _ = &str;
+        \\    _ = &builder_args;
         \\}}
     , .{"roc_platform_abi.zig"}) catch |err|
         return customInfraFailure(allocator, timer, "failed to render test Zig source: {}", .{err});
@@ -2612,6 +2614,7 @@ fn customGlueZig(io: std.Io, allocator: Allocator, env: *const CaseEnv, timer: *
         "pub fn decrefBox",
         "pub fn decrefBoxWith",
         "pub extern fn roc_alloc(length: usize, alignment: usize) callconv(.c) ?*anyopaque;",
+        "pub const BuilderPrint_valueArgs = extern struct",
         "pub extern fn roc_stdout_line(arg0: RocStr) callconv(.c) void;",
         "pub extern fn roc_main() callconv(.c) void;",
     }) |needle| {
@@ -2811,7 +2814,12 @@ fn customGlueZigBangRecordFields(io: std.Io, allocator: Allocator, env: *const C
     const generated = std.Io.Dir.cwd().readFileAlloc(io, generated_path, allocator, .limited(1024 * 1024)) catch |err|
         return customFailure(allocator, timer, "failed to read generated Zig file: {}", .{err});
 
-    for ([_][]const u8{ "@\"init!\": *anyopaque", "@\"render!\": *anyopaque" }) |needle| {
+    for ([_][]const u8{
+        "@\"init!\": *anyopaque",
+        "@\"render!\": *anyopaque",
+        "pub const HostSet_mouseArgs = extern struct",
+        "pub extern fn roc_host_set_mouse(arg0: HostSet_mouseArgs) callconv(.c) void;",
+    }) |needle| {
         if (std.mem.find(u8, generated, needle) == null) {
             return customFailure(allocator, timer, "generated Zig file missing {s}", .{needle});
         }

src/glue/glue.zig

@@ -882,7 +882,7 @@ const CollectedTypeRepr = union(enum) {
     unit,
     list: u64,
     function: struct { arg_ids: []const u64, ret_id: u64 },
-    record: struct { name: []const u8, fields: []const CollectedRecordField, size: u64, alignment: u64 },
+    record: struct { name: []const u8, anonymous: bool, fields: []const CollectedRecordField, size: u64, alignment: u64 },
     tag_union: struct { name: []const u8, tags: []const CollectedTagInfo, size: u64, alignment: u64 },
     unknown: []const u8,
 };
@@ -1007,6 +1007,7 @@ const TypeTable = struct {
                 if (rec.name.len == 0) {
                     self.entries.items[@intCast(idx)] = .{ .record = .{
                         .name = try std.fmt.allocPrint(self.gpa, "__AnonStruct{d}", .{idx}),
+                        .anonymous = true,
                         .fields = rec.fields,
                         .size = rec.size,
                         .alignment = rec.alignment,
@@ -1124,6 +1125,7 @@ const TypeTable = struct {
         return switch (backing_repr) {
             .record => |rec| .{ .record = .{
                 .name = try self.gpa.dupe(u8, display_name),
+                .anonymous = false,
                 .fields = rec.fields,
                 .size = rec.size,
                 .alignment = rec.alignment,
@@ -1221,6 +1223,7 @@ const TypeTable = struct {
 
         return .{ .record = .{
             .name = "",
+            .anonymous = true,
             .fields = collected_fields,
             .size = record_size,
             .alignment = max_alignment,
@@ -1307,6 +1310,7 @@ const TypeTable = struct {
 
         return .{ .record = .{
             .name = "",
+            .anonymous = true,
             .fields = collected_fields,
             .size = record_size,
             .alignment = max_alignment,
@@ -1814,6 +1818,7 @@ fn writeTypeRepr(
             writer.zeroValue(value_base, payload_layout);
             const fields_slot = writer.recordField(value_base, payload_layout, "RecordRepr", "fields");
             writer.writeField(value_base, payload_layout, "RecordRepr", "alignment", u64, rec.alignment);
+            writer.writeField(value_base, payload_layout, "RecordRepr", "anonymous", bool, rec.anonymous);
             writer.writeField(value_base, payload_layout, "RecordRepr", "fields", RocList, buildRecordFieldTypeReprList(writer, rec.fields, fields_slot.layout_idx));
             writer.writeField(value_base, payload_layout, "RecordRepr", "name", RocStr, createBigRocStr(rec.name, writer.roc_ops));
             writer.writeField(value_base, payload_layout, "RecordRepr", "size", u64, rec.size);

src/glue/platform/RecordRepr.roc

@@ -1,3 +1,3 @@
 import RecordField exposing [RecordField]
 
-RecordRepr := { alignment : U64, fields : List(RecordField), name : Str, size : U64 }
+RecordRepr := { alignment : U64, anonymous : Bool, fields : List(RecordField), name : Str, size : U64 }

src/glue/src/ZigGlue.roc

@@ -839,6 +839,7 @@ generate_zig_file = |hosted_functions, type_table, provides_list| {
 		.concat(generate_element_type_structs(type_table))
 		.concat(generate_tag_union_structs(type_table))
 		.concat(generate_all_record_structs(hosted_functions, type_table))
+		.concat(generate_all_args_structs(hosted_functions, type_table))
 		.concat("\n")
 		.concat(generate_runtime_symbol_externs)
 		.concat("\n")
@@ -1262,6 +1263,34 @@ is_unit_type_id = |type_table, type_id| {
 	}
 }
 
+## Check whether a type is an explicitly anonymous record shape.
+is_anonymous_record_type_id = |type_table, type_id| {
+	match List.get(type_table, type_id) {
+		Ok(type_repr) => is_anonymous_record_repr(type_table, type_repr)
+		Err(_) => Bool.False
+	}
+}
+
+is_anonymous_record_repr = |type_table, type_repr| {
+	match type_repr {
+		RocRecord(rec) => rec.anonymous
+		RocTagUnion(tu) =>
+			if List.len(tu.tags) == 1 {
+				match List.first(tu.tags) {
+					Ok(tag) =>
+						match List.first(tag.payload) {
+							Ok(payload_id) => is_anonymous_record_type_id(type_table, payload_id)
+							_ => Bool.False
+						}
+					_ => Bool.False
+				}
+			} else {
+				Bool.False
+			}
+		_ => Bool.False
+	}
+}
+
 ## Build a natural C ABI parameter list from Roc function argument type IDs.
 direct_param_list = |type_table, arg_type_ids| {
 	var $params = ""
@@ -1283,6 +1312,42 @@ direct_param_list = |type_table, arg_type_ids| {
 	$params
 }
 
+## Build a hosted symbol parameter list, using the generated Args wrapper for
+## anonymous single-record arguments so direct-symbol glue stays readable.
+direct_hosted_param_list = |type_table, func| {
+	use_args_wrapper =
+		if List.len(func.arg_type_ids) == 1 {
+			match List.first(func.arg_type_ids) {
+				Ok(arg_id) => is_anonymous_record_type_id(type_table, arg_id)
+				Err(_) => Bool.False
+			}
+		} else {
+			Bool.False
+		}
+
+	var $params = ""
+	var $idx = 0
+
+	for arg_type_id in func.arg_type_ids {
+		if !is_unit_type_id(type_table, arg_type_id) {
+			arg_zig = if use_args_wrapper {
+				"${name_to_struct_name(func.name)}Args"
+			} else {
+				type_id_to_zig(type_table, arg_type_id)
+			}
+			sep = if $params == "" {
+				""
+			} else {
+				", "
+			}
+			$params = "${$params}${sep}arg${U64.to_str($idx)}: ${arg_zig}"
+			$idx = $idx + 1
+		}
+	}
+
+	$params
+}
+
 ## Generate direct extern declarations for the fixed runtime symbols every host defines.
 generate_runtime_symbol_externs : Str
 generate_runtime_symbol_externs =
@@ -1309,7 +1374,7 @@ generate_hosted_symbol_externs = |hosted_functions, type_table| {
 	var $result = "// =============================================================================\n// Hosted Symbols\n//\n// The platform host must export these symbols with the exact direct C ABI signatures.\n// Refcounted arguments are owned by the hosted function.\n// =============================================================================\n\n"
 
 	for func in hosted_functions {
-		params = direct_param_list(type_table, func.arg_type_ids)
+		params = direct_hosted_param_list(type_table, func)
 		ret_zig = type_id_to_zig(type_table, func.ret_type_id)
 
 		$result = Str.concat(

test/postcheck/platform_required_init/platform/Host.roc

@@ -6,4 +6,5 @@ Host := {
     },
 }.{
     read_env! : Host, Str => Try(Str, [NotFound, ..])
+    set_mouse! : { x : F32, y : F32 } => {}
 }

test/postcheck/platform_required_init/platform/main.roc

@@ -11,7 +11,10 @@ platform ""
         "roc_init_for_host": init_for_host!,
         "roc_render_for_host": render_for_host!,
     }
-    hosted { "roc_host_read_env": Host.read_env! }
+    hosted {
+        "roc_host_read_env": Host.read_env!,
+        "roc_host_set_mouse": Host.set_mouse!,
+    }
     targets: {
         inputs: "targets/",
         x64mac: { inputs: [app], output: Archive },