mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-06 06:13:07 +00:00
Code Issues Packages Projects Releases Wiki Activity

update resinator to Aro changes

Browse Source
This commit is contained in:
Veikka Tuominen 2025-11-01 22:28:59 +02:00
parent 21f3ff2a8d
commit df50f9e28e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/compiler/resinator/preprocess.zig
View File

@ -29,6 +29,7 @@ pub fn preprocess(
error.OutOfMemory => |e| return e, error.OutOfMemory => |e| return e,
error.WriteFailed => unreachable, error.WriteFailed => unreachable,
}; };
try comp.initSearchPath(driver.includes.items, false);
if (hasAnyErrors(comp)) return error.ArgError; if (hasAnyErrors(comp)) return error.ArgError;
@ -59,7 +60,7 @@ pub fn preprocess(
pp.preserve_whitespace = true; pp.preserve_whitespace = true;
pp.linemarkers = .line_directives; pp.linemarkers = .line_directives;
pp.preprocessSources(&.{ source, builtin_macros, user_macros }) catch |err| switch (err) { pp.preprocessSources(.{ .main = source, .builtin = builtin_macros, .command_line = user_macros }) catch |err| switch (err) {
error.FatalError => return error.PreprocessError, error.FatalError => return error.PreprocessError,
else => |e| return e, else => |e| return e,
}; };
@ -71,7 +72,7 @@ pub fn preprocess(
if (maybe_dependencies) |dependencies| { if (maybe_dependencies) |dependencies| {
for (comp.sources.values()) |comp_source| { for (comp.sources.values()) |comp_source| {
if (comp_source.id == builtin_macros.id or comp_source.id == user_macros.id) continue; if (comp_source.id == builtin_macros.id or comp_source.id == user_macros.id) continue;
if (comp_source.id == .unused or comp_source.id == .generated) continue; if (comp_source.id.index == .unused or comp_source.id.index == .generated) continue;
const duped_path = try dependencies.allocator.dupe(u8, comp_source.path); const duped_path = try dependencies.allocator.dupe(u8, comp_source.path);
errdefer dependencies.allocator.free(duped_path); errdefer dependencies.allocator.free(duped_path);
try dependencies.list.append(dependencies.allocator, duped_path); try dependencies.list.append(dependencies.allocator, duped_path);