From 67c6ac947a2945974c375977c237eac073d81f56 Mon Sep 17 00:00:00 2001 From: Ryan Liptak Date: Mon, 30 Mar 2026 01:15:11 -0700 Subject: [PATCH] Update resinator for latest aro --- lib/compiler/resinator/main.zig | 8 +++++++- lib/compiler/resinator/preprocess.zig | 4 +--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/lib/compiler/resinator/main.zig b/lib/compiler/resinator/main.zig index ce0194759c5816c0383e17bdde7e2bf79e446d88..e962177015641502fdce3bcd6d9b6adf1195d0e3 100644 --- a/lib/compiler/resinator/main.zig +++ b/lib/compiler/resinator/main.zig @@ -143,7 +143,13 @@ pub fn main(init: std.process.Init.Minimal) !void { if (!zig_integration) io.unlockStderr(); } - var comp = aro.Compilation.init(aro_arena, aro_arena, io, &diagnostics, Io.Dir.cwd()); + var comp = try aro.Compilation.init(.{ + .gpa = aro_arena, + .arena = aro_arena, + .io = io, + .diagnostics = &diagnostics, + .environ_map = &environ_map, + }); defer comp.deinit(); var argv: std.ArrayList([]const u8) = .empty; diff --git a/lib/compiler/resinator/preprocess.zig b/lib/compiler/resinator/preprocess.zig index 0b9a2ef59ef15475d4b0ccaf1132013f1729f1e1..66c46cede38d205008cdd07eef7445f5283a5a6c 100644 --- a/lib/compiler/resinator/preprocess.zig +++ b/lib/compiler/resinator/preprocess.zig @@ -14,8 +14,6 @@ pub fn preprocess( argv: []const []const u8, maybe_dependencies: ?*Dependencies, ) PreprocessError!void { - try comp.addDefaultPragmaHandlers(); - var driver: aro.Driver = .{ .comp = comp, .diagnostics = comp.diagnostics, .aro_name = "arocc" }; defer driver.deinit(); @@ -47,7 +45,7 @@ pub fn preprocess( if (hasAnyErrors(comp)) return error.GeneratedSourceError; comp.generated_buf.items.len = 0; - var pp = aro.Preprocessor.initDefault(comp) catch |err| switch (err) { + var pp = aro.Preprocessor.init(comp, .{ .base_file = source.id }) catch |err| switch (err) { error.FatalError => return error.GeneratedSourceError, error.OutOfMemory => |e| return e, }; -- 2.54.0