authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2021-06-17 23:25:05-04:00
committergravatar for noreply@github.comGitHub <noreply@github.com> 2021-06-17 23:25:05-04:00
logb9e78593bbb1a92f282795a12462b17ad18ecc8a
treef5fa59cd1abf3d7cd4a6ed9cef4eb617ed3b76a3
parent9ff15e24f8691e216194c0fc3dc890eb86a00bc6
parent3150458f2f4aa06c6cd99cb6ec06791f1ca05505
signaturebadge-question-mark Signed by PGP key 4AEE18F83AFDEB23

Merge pull request #9117 from greenfork/unify-compiler-error-printing

stage2: Unify compiler error printing

1 files changed, 23 insertions(+), 35 deletions(-)

src/main.zig+23-35
......@@ -2960,7 +2960,6 @@ const Fmt = struct {
29602960};
29612961
29622962pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
2963 const stderr_file = io.getStdErr();
29642963 var color: Color = .auto;
29652964 var stdin_flag: bool = false;
29662965 var check_flag: bool = false;
......@@ -3018,7 +3017,7 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
30183017 defer tree.deinit(gpa);
30193018
30203019 for (tree.errors) |parse_error| {
3021 try printErrMsgToFile(gpa, parse_error, tree, "<stdin>", stderr_file, color);
3020 try printErrMsgToStdErr(gpa, parse_error, tree, "<stdin>", color);
30223021 }
30233022 if (tree.errors.len != 0) {
30243023 process.exit(1);
......@@ -3163,7 +3162,7 @@ fn fmtPathFile(
31633162 defer tree.deinit(fmt.gpa);
31643163
31653164 for (tree.errors) |parse_error| {
3166 try printErrMsgToFile(fmt.gpa, parse_error, tree, file_path, std.io.getStdErr(), fmt.color);
3165 try printErrMsgToStdErr(fmt.gpa, parse_error, tree, file_path, fmt.color);
31673166 }
31683167 if (tree.errors.len != 0) {
31693168 fmt.any_error = true;
......@@ -3239,25 +3238,16 @@ fn fmtPathFile(
32393238 }
32403239}
32413240
3242fn printErrMsgToFile(
3241fn printErrMsgToStdErr(
32433242 gpa: *mem.Allocator,
32443243 parse_error: ast.Error,
32453244 tree: ast.Tree,
32463245 path: []const u8,
3247 file: fs.File,
32483246 color: Color,
32493247) !void {
3250 const color_on = switch (color) {
3251 .auto => file.isTty(),
3252 .on => true,
3253 .off => false,
3254 };
32553248 const lok_token = parse_error.token;
3256
3257 const token_starts = tree.tokens.items(.start);
3258 const token_tags = tree.tokens.items(.tag);
3259 const first_token_start = token_starts[lok_token];
32603249 const start_loc = tree.tokenLocation(0, lok_token);
3250 const source_line = tree.source[start_loc.line_start..start_loc.line_end];
32613251
32623252 var text_buf = std.ArrayList(u8).init(gpa);
32633253 defer text_buf.deinit();
......@@ -3265,26 +3255,24 @@ fn printErrMsgToFile(
32653255 try tree.renderError(parse_error, writer);
32663256 const text = text_buf.items;
32673257
3268 const stream = file.writer();
3269 try stream.print("{s}:{d}:{d}: error: {s}\n", .{ path, start_loc.line + 1, start_loc.column + 1, text });
3258 const message: Compilation.AllErrors.Message = .{
3259 .src = .{
3260 .src_path = path,
3261 .msg = text,
3262 .byte_offset = @intCast(u32, start_loc.line_start),
3263 .line = @intCast(u32, start_loc.line),
3264 .column = @intCast(u32, start_loc.column),
3265 .source_line = source_line,
3266 },
3267 };
32703268
3271 if (!color_on) return;
3269 const ttyconf: std.debug.TTY.Config = switch (color) {
3270 .auto => std.debug.detectTTYConfig(),
3271 .on => .escape_codes,
3272 .off => .no_color,
3273 };
32723274
3273 // Print \r and \t as one space each so that column counts line up
3274 for (tree.source[start_loc.line_start..start_loc.line_end]) |byte| {
3275 try stream.writeByte(switch (byte) {
3276 '\r', '\t' => ' ',
3277 else => byte,
3278 });
3279 }
3280 try stream.writeByte('\n');
3281 try stream.writeByteNTimes(' ', start_loc.column);
3282 if (token_tags[lok_token].lexeme()) |lexeme| {
3283 try stream.writeByteNTimes('~', lexeme.len);
3284 try stream.writeByte('\n');
3285 } else {
3286 try stream.writeAll("^\n");
3287 }
3275 message.renderToStdErr(ttyconf);
32883276}
32893277
32903278pub const info_zen =
......@@ -3800,7 +3788,7 @@ pub fn cmdAstCheck(
38003788 defer file.tree.deinit(gpa);
38013789
38023790 for (file.tree.errors) |parse_error| {
3803 try printErrMsgToFile(gpa, parse_error, file.tree, file.sub_file_path, io.getStdErr(), color);
3791 try printErrMsgToStdErr(gpa, parse_error, file.tree, file.sub_file_path, color);
38043792 }
38053793 if (file.tree.errors.len != 0) {
38063794 process.exit(1);
......@@ -3921,7 +3909,7 @@ pub fn cmdChangelist(
39213909 defer file.tree.deinit(gpa);
39223910
39233911 for (file.tree.errors) |parse_error| {
3924 try printErrMsgToFile(gpa, parse_error, file.tree, old_source_file, io.getStdErr(), .auto);
3912 try printErrMsgToStdErr(gpa, parse_error, file.tree, old_source_file, .auto);
39253913 }
39263914 if (file.tree.errors.len != 0) {
39273915 process.exit(1);
......@@ -3958,7 +3946,7 @@ pub fn cmdChangelist(
39583946 defer new_tree.deinit(gpa);
39593947
39603948 for (new_tree.errors) |parse_error| {
3961 try printErrMsgToFile(gpa, parse_error, new_tree, new_source_file, io.getStdErr(), .auto);
3949 try printErrMsgToStdErr(gpa, parse_error, new_tree, new_source_file, .auto);
39623950 }
39633951 if (new_tree.errors.len != 0) {
39643952 process.exit(1);