authorgravatar for squeek502@hotmail.comRyan Liptak <squeek502@hotmail.com> 2026-03-30 01:15:11-07:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2026-04-11 15:17:46-07:00
log67c6ac947a2945974c375977c237eac073d81f56
treeaf9243577b78b47080aa19308797549309523343
parent68bf81432cd0bafc355821370268eedc91ed8eb7

Update resinator for latest aro

2 files changed, 8 insertions(+), 4 deletions(-)

lib/compiler/resinator/main.zig+7-1
...@@ -143,7 +143,13 @@ pub fn main(init: std.process.Init.Minimal) !void {...@@ -143,7 +143,13 @@ pub fn main(init: std.process.Init.Minimal) !void {
143 if (!zig_integration) io.unlockStderr();143 if (!zig_integration) io.unlockStderr();
144 }144 }
145145
146 var comp = aro.Compilation.init(aro_arena, aro_arena, io, &diagnostics, Io.Dir.cwd());146 var comp = try aro.Compilation.init(.{
147 .gpa = aro_arena,
148 .arena = aro_arena,
149 .io = io,
150 .diagnostics = &diagnostics,
151 .environ_map = &environ_map,
152 });
147 defer comp.deinit();153 defer comp.deinit();
148154
149 var argv: std.ArrayList([]const u8) = .empty;155 var argv: std.ArrayList([]const u8) = .empty;
lib/compiler/resinator/preprocess.zig+1-3
...@@ -14,8 +14,6 @@ pub fn preprocess(...@@ -14,8 +14,6 @@ pub fn preprocess(
14 argv: []const []const u8,14 argv: []const []const u8,
15 maybe_dependencies: ?*Dependencies,15 maybe_dependencies: ?*Dependencies,
16) PreprocessError!void {16) PreprocessError!void {
17 try comp.addDefaultPragmaHandlers();
18
19 var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" };17 var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" };
20 defer driver.deinit();18 defer driver.deinit();
2119
...@@ -47,7 +45,7 @@ pub fn preprocess(...@@ -47,7 +45,7 @@ pub fn preprocess(
47 if (hasAnyErrors(comp)) return error.GeneratedSourceError;45 if (hasAnyErrors(comp)) return error.GeneratedSourceError;
4846
49 comp.generated_buf.items.len = 0;47 comp.generated_buf.items.len = 0;
50 var pp = aro.Preprocessor.initDefault(comp) catch |err| switch (err) {48 var pp = aro.Preprocessor.init(comp, .{ .base_file = source.id }) catch |err| switch (err) {
51 error.FatalError => return error.GeneratedSourceError,49 error.FatalError => return error.GeneratedSourceError,
52 error.OutOfMemory => |e| return e,50 error.OutOfMemory => |e| return e,
53 };51 };