From b6930097ec5f0e79346d3a1725be56a2d1dcc568 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Mon, 11 Aug 2025 19:43:46 -0700 Subject: [PATCH] translate-c: update for array list defaults --- lib/compiler/translate-c/MacroTranslator.zig | 8 ++++---- lib/compiler/translate-c/PatternList.zig | 6 +++--- lib/compiler/translate-c/Translator.zig | 12 ++++++------ lib/compiler/translate-c/main.zig | 2 +- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/lib/compiler/translate-c/MacroTranslator.zig b/lib/compiler/translate-c/MacroTranslator.zig index 2d1824d8a5..c205a23828 100644 --- a/lib/compiler/translate-c/MacroTranslator.zig +++ b/lib/compiler/translate-c/MacroTranslator.zig @@ -175,7 +175,7 @@ pub fn transMacro(mt: *MacroTranslator) ParseError!void { } fn createMacroFn(mt: *MacroTranslator, name: []const u8, ref: ZigNode, proto_alias: *ast.Payload.Func) !ZigNode { - var fn_params = std.ArrayList(ast.Payload.Param).init(mt.t.gpa); + var fn_params = std.array_list.Managed(ast.Payload.Param).init(mt.t.gpa); defer fn_params.deinit(); var block_scope = try Scope.Block.init(mt.t, &mt.t.global_scope.base, false); @@ -1149,7 +1149,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo if (mt.eat(.r_paren)) { node = try ZigTag.call.create(mt.t.arena, .{ .lhs = node, .args = &.{} }); } else { - var args = std.ArrayList(ZigNode).init(mt.t.gpa); + var args = std.array_list.Managed(ZigNode).init(mt.t.gpa); defer args.deinit(); while (true) { @@ -1179,7 +1179,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo // Check for designated field initializers if (mt.peek() == .period) { - var init_vals = std.ArrayList(ast.Payload.ContainerInitDot.Initializer).init(mt.t.gpa); + var init_vals = std.array_list.Managed(ast.Payload.ContainerInitDot.Initializer).init(mt.t.gpa); defer init_vals.deinit(); while (true) { @@ -1211,7 +1211,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo continue; } - var init_vals = std.ArrayList(ZigNode).init(mt.t.gpa); + var init_vals = std.array_list.Managed(ZigNode).init(mt.t.gpa); defer init_vals.deinit(); while (true) { diff --git a/lib/compiler/translate-c/PatternList.zig b/lib/compiler/translate-c/PatternList.zig index 28cfb7dfac..d1adf7d774 100644 --- a/lib/compiler/translate-c/PatternList.zig +++ b/lib/compiler/translate-c/PatternList.zig @@ -91,7 +91,7 @@ const Pattern = struct { fn init(pl: *Pattern, allocator: mem.Allocator, template: Template) Error!void { const source = template[0]; const impl = template[1]; - var tok_list = std.ArrayList(CToken).init(allocator); + var tok_list = std.array_list.Managed(CToken).init(allocator); defer tok_list.deinit(); pl.* = .{ @@ -170,7 +170,7 @@ pub fn match(pl: PatternList, ms: MacroSlicer) Error!?Impl { return null; } -fn tokenizeMacro(source: []const u8, tok_list: *std.ArrayList(CToken)) Error!MacroSlicer { +fn tokenizeMacro(source: []const u8, tok_list: *std.array_list.Managed(CToken)) Error!MacroSlicer { var param_count: u32 = 0; var param_buf: [8][]const u8 = undefined; @@ -243,7 +243,7 @@ test "Macro matching" { source: []const u8, comptime expected_match: ?Impl, ) !void { - var tok_list = std.ArrayList(CToken).init(allocator); + var tok_list = std.array_list.Managed(CToken).init(allocator); defer tok_list.deinit(); const ms = try tokenizeMacro(source, &tok_list); defer allocator.free(ms.tokens); diff --git a/lib/compiler/translate-c/Translator.zig b/lib/compiler/translate-c/Translator.zig index bd975bbc4e..0b7974c47b 100644 --- a/lib/compiler/translate-c/Translator.zig +++ b/lib/compiler/translate-c/Translator.zig @@ -489,10 +489,10 @@ fn transRecordDecl(t: *Translator, scope: *Scope, record_qt: QualType) Error!voi break :init ZigTag.opaque_literal.init(); } - var fields = try std.ArrayList(ast.Payload.Container.Field).initCapacity(t.gpa, record_ty.fields.len); + var fields = try std.array_list.Managed(ast.Payload.Container.Field).initCapacity(t.gpa, record_ty.fields.len); defer fields.deinit(); - var functions = std.ArrayList(ZigNode).init(t.gpa); + var functions = std.array_list.Managed(ZigNode).init(t.gpa); defer functions.deinit(); var unnamed_field_count: u32 = 0; @@ -1789,7 +1789,7 @@ fn transSwitch(t: *Translator, scope: *Scope, switch_stmt: Node.SwitchStmt) Tran defer cond_scope.deinit(); const switch_expr = try t.transExpr(&cond_scope.base, switch_stmt.cond, .used); - var cases = std.ArrayList(ZigNode).init(t.gpa); + var cases = std.array_list.Managed(ZigNode).init(t.gpa); defer cases.deinit(); var has_default = false; @@ -1803,7 +1803,7 @@ fn transSwitch(t: *Translator, scope: *Scope, switch_stmt: Node.SwitchStmt) Tran for (body, 0..) |stmt, i| { switch (stmt.get(t.tree)) { .case_stmt => { - var items = std.ArrayList(ZigNode).init(t.gpa); + var items = std.array_list.Managed(ZigNode).init(t.gpa); defer items.deinit(); const sub = try t.transCaseStmt(base_scope, stmt, &items); const res = try t.transSwitchProngStmt(base_scope, sub, body[i..]); @@ -1861,7 +1861,7 @@ fn transCaseStmt( t: *Translator, scope: *Scope, stmt: Node.Index, - items: *std.ArrayList(ZigNode), + items: *std.array_list.Managed(ZigNode), ) TransError!Node.Index { var sub = stmt; var seen_default = false; @@ -3986,7 +3986,7 @@ fn createFlexibleMemberFn( // ================= fn transMacros(t: *Translator) !void { - var tok_list = std.ArrayList(CToken).init(t.gpa); + var tok_list = std.array_list.Managed(CToken).init(t.gpa); defer tok_list.deinit(); var pattern_list = try PatternList.init(t.gpa); diff --git a/lib/compiler/translate-c/main.zig b/lib/compiler/translate-c/main.zig index 685984b985..15ec8b436c 100644 --- a/lib/compiler/translate-c/main.zig +++ b/lib/compiler/translate-c/main.zig @@ -202,7 +202,7 @@ fn translate(d: *aro.Driver, tc: *aro.Toolchain, args: [][:0]u8) !void { out_file_path = path; } - var out_writer = out_file.writer(&out_buf); + var out_writer = out_file.writer(&.{}); out_writer.interface.writeAll(rendered_zig) catch return d.fatal("failed to write result to '{s}': {s}", .{ out_file_path, aro.Driver.errorDescription(out_writer.err.?) });