authorgravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2025-11-01 22:28:59+02:00
committergravatar for git@vexu.euVeikka Tuominen <git@vexu.eu> 2025-11-20 13:12:53+02:00
logdf50f9e28ee9e3753f89fe62eead7aa2d2ffdc93
tree282f2069cbceef46683a89aeaa815e5dc1cfaf06
parent21f3ff2a8dde0f892095f4f911c5e824cb422941

update resinator to Aro changes

1 files changed, 3 insertions(+), 2 deletions(-)

lib/compiler/resinator/preprocess.zig+3-2
...@@ -29,6 +29,7 @@ pub fn preprocess(...@@ -29,6 +29,7 @@ pub fn preprocess(
29 error.OutOfMemory => |e| return e,29 error.OutOfMemory => |e| return e,
30 error.WriteFailed => unreachable,30 error.WriteFailed => unreachable,
31 };31 };
32 try comp.initSearchPath(driver.includes.items, false);
3233
33 if (hasAnyErrors(comp)) return error.ArgError;34 if (hasAnyErrors(comp)) return error.ArgError;
3435
...@@ -59,7 +60,7 @@ pub fn preprocess(...@@ -59,7 +60,7 @@ pub fn preprocess(
59 pp.preserve_whitespace = true;60 pp.preserve_whitespace = true;
60 pp.linemarkers = .line_directives;61 pp.linemarkers = .line_directives;
6162
62 pp.preprocessSources(&.{ source, builtin_macros, user_macros }) catch |err| switch (err) {63 pp.preprocessSources(.{ .main = source, .builtin = builtin_macros, .command_line = user_macros }) catch |err| switch (err) {
63 error.FatalError => return error.PreprocessError,64 error.FatalError => return error.PreprocessError,
64 else => |e| return e,65 else => |e| return e,
65 };66 };
...@@ -71,7 +72,7 @@ pub fn preprocess(...@@ -71,7 +72,7 @@ pub fn preprocess(
71 if (maybe_dependencies) |dependencies| {72 if (maybe_dependencies) |dependencies| {
72 for (comp.sources.values()) |comp_source| {73 for (comp.sources.values()) |comp_source| {
73 if (comp_source.id == builtin_macros.id or comp_source.id == user_macros.id) continue;74 if (comp_source.id == builtin_macros.id or comp_source.id == user_macros.id) continue;
74 if (comp_source.id == .unused or comp_source.id == .generated) continue;75 if (comp_source.id.index == .unused or comp_source.id.index == .generated) continue;
75 const duped_path = try dependencies.allocator.dupe(u8, comp_source.path);76 const duped_path = try dependencies.allocator.dupe(u8, comp_source.path);
76 errdefer dependencies.allocator.free(duped_path);77 errdefer dependencies.allocator.free(duped_path);
77 try dependencies.list.append(dependencies.allocator, duped_path);78 try dependencies.list.append(dependencies.allocator, duped_path);