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

aro_translate_c: Render errors properly

Browse Source 
The error count is not set until the diagnostics are actually rendered
This commit is contained in:
Evan Haas 2024-07-29 09:33:21 -07:00
parent 390c7d84b2
commit d7b9bbecaf
No known key found for this signature in database
1 changed files with 31 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
lib/compiler/aro_translate_c.zig
View File

@ -123,8 +123,9 @@ pub fn translate(
var tree = try pp.parse(); var tree = try pp.parse();
defer tree.deinit(); defer tree.deinit();
if (driver.comp.diagnostics.errors != 0) { // Workaround for https://github.com/Vexu/arocc/issues/603
return error.SemanticAnalyzeFail; for (comp.diagnostics.list.items) |msg| {
if (msg.kind == .@"error" or msg.kind == .@"fatal error") return error.ParsingFailed;
} }
const mapper = tree.comp.string_interner.getFastTypeMapper(tree.comp.gpa) catch tree.comp.string_interner.getSlowTypeMapper(); const mapper = tree.comp.string_interner.getFastTypeMapper(tree.comp.gpa) catch tree.comp.string_interner.getSlowTypeMapper();
@ -1622,6 +1623,33 @@ test "Macro matching" {
try helper.checkMacro(allocator, pattern_list, "IGNORE_ME(X) ((volatile const void)(X))", "DISCARD"); try helper.checkMacro(allocator, pattern_list, "IGNORE_ME(X) ((volatile const void)(X))", "DISCARD");
} }
/// Renders errors and fatal errors + associated notes (e.g. "expanded from here"); does not render warnings or associated notes
/// Terminates with exit code 1
fn renderErrorsAndExit(comp: *aro.Compilation) noreturn {
defer std.process.exit(1);
var writer = aro.Diagnostics.defaultMsgWriter(std.io.tty.detectConfig(std.io.getStdErr()));
defer writer.deinit(); // writer deinit must run *before* exit so that stderr is flushed
var saw_error = false;
for (comp.diagnostics.list.items) |msg| {
switch (msg.kind) {
.@"error", .@"fatal error" => {
saw_error = true;
aro.Diagnostics.renderMessage(comp, &writer, msg);
},
.warning => saw_error = false,
.note => {
if (saw_error) {
aro.Diagnostics.renderMessage(comp, &writer, msg);
}
},
.off => {},
.default => unreachable,
}
}
}
pub fn main() !void { pub fn main() !void {
var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator); var arena_instance = std.heap.ArenaAllocator.init(std.heap.page_allocator);
defer arena_instance.deinit(); defer arena_instance.deinit();
@ -1636,10 +1664,7 @@ pub fn main() !void {
defer aro_comp.deinit(); defer aro_comp.deinit();
var tree = translate(gpa, &aro_comp, args) catch |err| switch (err) { var tree = translate(gpa, &aro_comp, args) catch |err| switch (err) {
error.SemanticAnalyzeFail, error.FatalError => { error.ParsingFailed, error.FatalError => renderErrorsAndExit(&aro_comp),
aro.Diagnostics.render(&aro_comp, std.io.tty.detectConfig(std.io.getStdErr()));
std.process.exit(1);
},
error.OutOfMemory => return error.OutOfMemory, error.OutOfMemory => return error.OutOfMemory,
error.StreamTooLong => std.zig.fatal("StreamTooLong?", .{}), error.StreamTooLong => std.zig.fatal("StreamTooLong?", .{}),
}; };