authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-08-11 19:43:46-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2025-09-24 20:01:19-07:00
logb6930097ec5f0e79346d3a1725be56a2d1dcc568
tree37643d563ef033f1a6b685a9f887ce63c049d46d
parente5f4dbdf8aab9e5b17d2401b55493300235ab15b

translate-c: update for array list defaults

4 files changed, 14 insertions(+), 14 deletions(-)

lib/compiler/translate-c/MacroTranslator.zig+4-4
...@@ -175,7 +175,7 @@ pub fn transMacro(mt: *MacroTranslator) ParseError!void {...@@ -175,7 +175,7 @@ pub fn transMacro(mt: *MacroTranslator) ParseError!void {
175}175}
176176
177fn createMacroFn(mt: *MacroTranslator, name: []const u8, ref: ZigNode, proto_alias: *ast.Payload.Func) !ZigNode {177fn createMacroFn(mt: *MacroTranslator, name: []const u8, ref: ZigNode, proto_alias: *ast.Payload.Func) !ZigNode {
178 var fn_params = std.ArrayList(ast.Payload.Param).init(mt.t.gpa);178 var fn_params = std.array_list.Managed(ast.Payload.Param).init(mt.t.gpa);
179 defer fn_params.deinit();179 defer fn_params.deinit();
180180
181 var block_scope = try Scope.Block.init(mt.t, &mt.t.global_scope.base, false);181 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...@@ -1149,7 +1149,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo
1149 if (mt.eat(.r_paren)) {1149 if (mt.eat(.r_paren)) {
1150 node = try ZigTag.call.create(mt.t.arena, .{ .lhs = node, .args = &.{} });1150 node = try ZigTag.call.create(mt.t.arena, .{ .lhs = node, .args = &.{} });
1151 } else {1151 } else {
1152 var args = std.ArrayList(ZigNode).init(mt.t.gpa);1152 var args = std.array_list.Managed(ZigNode).init(mt.t.gpa);
1153 defer args.deinit();1153 defer args.deinit();
11541154
1155 while (true) {1155 while (true) {
...@@ -1179,7 +1179,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo...@@ -1179,7 +1179,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo
11791179
1180 // Check for designated field initializers1180 // Check for designated field initializers
1181 if (mt.peek() == .period) {1181 if (mt.peek() == .period) {
1182 var init_vals = std.ArrayList(ast.Payload.ContainerInitDot.Initializer).init(mt.t.gpa);1182 var init_vals = std.array_list.Managed(ast.Payload.ContainerInitDot.Initializer).init(mt.t.gpa);
1183 defer init_vals.deinit();1183 defer init_vals.deinit();
11841184
1185 while (true) {1185 while (true) {
...@@ -1211,7 +1211,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo...@@ -1211,7 +1211,7 @@ fn parseCPostfixExprInner(mt: *MacroTranslator, scope: *Scope, type_name: ?ZigNo
1211 continue;1211 continue;
1212 }1212 }
12131213
1214 var init_vals = std.ArrayList(ZigNode).init(mt.t.gpa);1214 var init_vals = std.array_list.Managed(ZigNode).init(mt.t.gpa);
1215 defer init_vals.deinit();1215 defer init_vals.deinit();
12161216
1217 while (true) {1217 while (true) {
lib/compiler/translate-c/PatternList.zig+3-3
...@@ -91,7 +91,7 @@ const Pattern = struct {...@@ -91,7 +91,7 @@ const Pattern = struct {
91 fn init(pl: *Pattern, allocator: mem.Allocator, template: Template) Error!void {91 fn init(pl: *Pattern, allocator: mem.Allocator, template: Template) Error!void {
92 const source = template[0];92 const source = template[0];
93 const impl = template[1];93 const impl = template[1];
94 var tok_list = std.ArrayList(CToken).init(allocator);94 var tok_list = std.array_list.Managed(CToken).init(allocator);
95 defer tok_list.deinit();95 defer tok_list.deinit();
9696
97 pl.* = .{97 pl.* = .{
...@@ -170,7 +170,7 @@ pub fn match(pl: PatternList, ms: MacroSlicer) Error!?Impl {...@@ -170,7 +170,7 @@ pub fn match(pl: PatternList, ms: MacroSlicer) Error!?Impl {
170 return null;170 return null;
171}171}
172172
173fn tokenizeMacro(source: []const u8, tok_list: *std.ArrayList(CToken)) Error!MacroSlicer {173fn tokenizeMacro(source: []const u8, tok_list: *std.array_list.Managed(CToken)) Error!MacroSlicer {
174 var param_count: u32 = 0;174 var param_count: u32 = 0;
175 var param_buf: [8][]const u8 = undefined;175 var param_buf: [8][]const u8 = undefined;
176176
...@@ -243,7 +243,7 @@ test "Macro matching" {...@@ -243,7 +243,7 @@ test "Macro matching" {
243 source: []const u8,243 source: []const u8,
244 comptime expected_match: ?Impl,244 comptime expected_match: ?Impl,
245 ) !void {245 ) !void {
246 var tok_list = std.ArrayList(CToken).init(allocator);246 var tok_list = std.array_list.Managed(CToken).init(allocator);
247 defer tok_list.deinit();247 defer tok_list.deinit();
248 const ms = try tokenizeMacro(source, &tok_list);248 const ms = try tokenizeMacro(source, &tok_list);
249 defer allocator.free(ms.tokens);249 defer allocator.free(ms.tokens);
lib/compiler/translate-c/Translator.zig+6-6
...@@ -489,10 +489,10 @@ fn transRecordDecl(t: *Translator, scope: *Scope, record_qt: QualType) Error!voi...@@ -489,10 +489,10 @@ fn transRecordDecl(t: *Translator, scope: *Scope, record_qt: QualType) Error!voi
489 break :init ZigTag.opaque_literal.init();489 break :init ZigTag.opaque_literal.init();
490 }490 }
491491
492 var fields = try std.ArrayList(ast.Payload.Container.Field).initCapacity(t.gpa, record_ty.fields.len);492 var fields = try std.array_list.Managed(ast.Payload.Container.Field).initCapacity(t.gpa, record_ty.fields.len);
493 defer fields.deinit();493 defer fields.deinit();
494494
495 var functions = std.ArrayList(ZigNode).init(t.gpa);495 var functions = std.array_list.Managed(ZigNode).init(t.gpa);
496 defer functions.deinit();496 defer functions.deinit();
497497
498 var unnamed_field_count: u32 = 0;498 var unnamed_field_count: u32 = 0;
...@@ -1789,7 +1789,7 @@ fn transSwitch(t: *Translator, scope: *Scope, switch_stmt: Node.SwitchStmt) Tran...@@ -1789,7 +1789,7 @@ fn transSwitch(t: *Translator, scope: *Scope, switch_stmt: Node.SwitchStmt) Tran
1789 defer cond_scope.deinit();1789 defer cond_scope.deinit();
1790 const switch_expr = try t.transExpr(&cond_scope.base, switch_stmt.cond, .used);1790 const switch_expr = try t.transExpr(&cond_scope.base, switch_stmt.cond, .used);
17911791
1792 var cases = std.ArrayList(ZigNode).init(t.gpa);1792 var cases = std.array_list.Managed(ZigNode).init(t.gpa);
1793 defer cases.deinit();1793 defer cases.deinit();
1794 var has_default = false;1794 var has_default = false;
17951795
...@@ -1803,7 +1803,7 @@ fn transSwitch(t: *Translator, scope: *Scope, switch_stmt: Node.SwitchStmt) Tran...@@ -1803,7 +1803,7 @@ fn transSwitch(t: *Translator, scope: *Scope, switch_stmt: Node.SwitchStmt) Tran
1803 for (body, 0..) |stmt, i| {1803 for (body, 0..) |stmt, i| {
1804 switch (stmt.get(t.tree)) {1804 switch (stmt.get(t.tree)) {
1805 .case_stmt => {1805 .case_stmt => {
1806 var items = std.ArrayList(ZigNode).init(t.gpa);1806 var items = std.array_list.Managed(ZigNode).init(t.gpa);
1807 defer items.deinit();1807 defer items.deinit();
1808 const sub = try t.transCaseStmt(base_scope, stmt, &items);1808 const sub = try t.transCaseStmt(base_scope, stmt, &items);
1809 const res = try t.transSwitchProngStmt(base_scope, sub, body[i..]);1809 const res = try t.transSwitchProngStmt(base_scope, sub, body[i..]);
...@@ -1861,7 +1861,7 @@ fn transCaseStmt(...@@ -1861,7 +1861,7 @@ fn transCaseStmt(
1861 t: *Translator,1861 t: *Translator,
1862 scope: *Scope,1862 scope: *Scope,
1863 stmt: Node.Index,1863 stmt: Node.Index,
1864 items: *std.ArrayList(ZigNode),1864 items: *std.array_list.Managed(ZigNode),
1865) TransError!Node.Index {1865) TransError!Node.Index {
1866 var sub = stmt;1866 var sub = stmt;
1867 var seen_default = false;1867 var seen_default = false;
...@@ -3986,7 +3986,7 @@ fn createFlexibleMemberFn(...@@ -3986,7 +3986,7 @@ fn createFlexibleMemberFn(
3986// =================3986// =================
39873987
3988fn transMacros(t: *Translator) !void {3988fn transMacros(t: *Translator) !void {
3989 var tok_list = std.ArrayList(CToken).init(t.gpa);3989 var tok_list = std.array_list.Managed(CToken).init(t.gpa);
3990 defer tok_list.deinit();3990 defer tok_list.deinit();
39913991
3992 var pattern_list = try PatternList.init(t.gpa);3992 var pattern_list = try PatternList.init(t.gpa);
lib/compiler/translate-c/main.zig+1-1
...@@ -202,7 +202,7 @@ fn translate(d: *aro.Driver, tc: *aro.Toolchain, args: [][:0]u8) !void {...@@ -202,7 +202,7 @@ fn translate(d: *aro.Driver, tc: *aro.Toolchain, args: [][:0]u8) !void {
202 out_file_path = path;202 out_file_path = path;
203 }203 }
204204
205 var out_writer = out_file.writer(&out_buf);205 var out_writer = out_file.writer(&.{});
206 out_writer.interface.writeAll(rendered_zig) catch206 out_writer.interface.writeAll(rendered_zig) catch
207 return d.fatal("failed to write result to '{s}': {s}", .{ out_file_path, aro.Driver.errorDescription(out_writer.err.?) });207 return d.fatal("failed to write result to '{s}': {s}", .{ out_file_path, aro.Driver.errorDescription(out_writer.err.?) });
208208