Commit b9e78593bbb1a92f282795a12462b17ad18ecc8a | zig

author	Andrew Kelley <andrew@ziglang.org> 2021-06-17 23:25:05-04:00
committer	GitHub <noreply@github.com> 2021-06-17 23:25:05-04:00
log	b9e78593bbb1a92f282795a12462b17ad18ecc8a
tree	f5fa59cd1abf3d7cd4a6ed9cef4eb617ed3b76a3
parent	9ff15e24f8691e216194c0fc3dc890eb86a00bc6
parent	3150458f2f4aa06c6cd99cb6ec06791f1ca05505
signature	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

src/main.zig+23-35

 @@ -2960,7 +2960,6 @@ const Fmt = struct {
 };
 pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
-    const stderr_file = io.getStdErr();
     var color: Color = .auto;
     var stdin_flag: bool = false;
     var check_flag: bool = false;
 @@ -3018,7 +3017,7 @@ pub fn cmdFmt(gpa: *Allocator, args: []const []const u8) !void {
         defer tree.deinit(gpa);
         for (tree.errors) |parse_error| {
-            try printErrMsgToFile(gpa, parse_error, tree, "<stdin>", stderr_file, color);
+            try printErrMsgToStdErr(gpa, parse_error, tree, "<stdin>", color);
         }
         if (tree.errors.len != 0) {
             process.exit(1);
 @@ -3163,7 +3162,7 @@ fn fmtPathFile(
     defer tree.deinit(fmt.gpa);
     for (tree.errors) |parse_error| {
-        try printErrMsgToFile(fmt.gpa, parse_error, tree, file_path, std.io.getStdErr(), fmt.color);
+        try printErrMsgToStdErr(fmt.gpa, parse_error, tree, file_path, fmt.color);
     }
     if (tree.errors.len != 0) {
         fmt.any_error = true;
 @@ -3239,25 +3238,16 @@ fn fmtPathFile(
     }
 }
-fn printErrMsgToFile(
+fn printErrMsgToStdErr(
     gpa: *mem.Allocator,
     parse_error: ast.Error,
     tree: ast.Tree,
     path: []const u8,
-    file: fs.File,
     color: Color,
 ) !void {
-    const color_on = switch (color) {
-        .auto => file.isTty(),
-        .on => true,
-        .off => false,
-    };
     const lok_token = parse_error.token;
-    const token_starts = tree.tokens.items(.start);
-    const token_tags = tree.tokens.items(.tag);
-    const first_token_start = token_starts[lok_token];
     const start_loc = tree.tokenLocation(0, lok_token);
+    const source_line = tree.source[start_loc.line_start..start_loc.line_end];
     var text_buf = std.ArrayList(u8).init(gpa);
     defer text_buf.deinit();
 @@ -3265,26 +3255,24 @@ fn printErrMsgToFile(
     try tree.renderError(parse_error, writer);
     const text = text_buf.items;
-    const stream = file.writer();
+    const message: Compilation.AllErrors.Message = .{
-    try stream.print("{s}:{d}:{d}: error: {s}\n", .{ path, start_loc.line + 1, start_loc.column + 1, text });
+        .src = .{
+            .src_path = path,
+            .msg = text,
+            .byte_offset = @intCast(u32, start_loc.line_start),
+            .line = @intCast(u32, start_loc.line),
+            .column = @intCast(u32, start_loc.column),
+            .source_line = source_line,
+        },
+    };
-    if (!color_on) return;
+    const ttyconf: std.debug.TTY.Config = switch (color) {
+        .auto => std.debug.detectTTYConfig(),
+        .on => .escape_codes,
+        .off => .no_color,
+    };
-    // Print \r and \t as one space each so that column counts line up
+    message.renderToStdErr(ttyconf);
-    for (tree.source[start_loc.line_start..start_loc.line_end]) |byte| {
-        try stream.writeByte(switch (byte) {
-            '\r', '\t' => ' ',
-            else => byte,
-        });
-    }
-    try stream.writeByte('\n');
-    try stream.writeByteNTimes(' ', start_loc.column);
-    if (token_tags[lok_token].lexeme()) |lexeme| {
-        try stream.writeByteNTimes('~', lexeme.len);
-        try stream.writeByte('\n');
-    } else {
-        try stream.writeAll("^\n");
-    }
 }
 pub const info_zen =
 @@ -3800,7 +3788,7 @@ pub fn cmdAstCheck(
     defer file.tree.deinit(gpa);
     for (file.tree.errors) |parse_error| {
-        try printErrMsgToFile(gpa, parse_error, file.tree, file.sub_file_path, io.getStdErr(), color);
+        try printErrMsgToStdErr(gpa, parse_error, file.tree, file.sub_file_path, color);
     }
     if (file.tree.errors.len != 0) {
         process.exit(1);
 @@ -3921,7 +3909,7 @@ pub fn cmdChangelist(
     defer file.tree.deinit(gpa);
     for (file.tree.errors) |parse_error| {
-        try printErrMsgToFile(gpa, parse_error, file.tree, old_source_file, io.getStdErr(), .auto);
+        try printErrMsgToStdErr(gpa, parse_error, file.tree, old_source_file, .auto);
     }
     if (file.tree.errors.len != 0) {
         process.exit(1);
 @@ -3958,7 +3946,7 @@ pub fn cmdChangelist(
     defer new_tree.deinit(gpa);
     for (new_tree.errors) |parse_error| {
-        try printErrMsgToFile(gpa, parse_error, new_tree, new_source_file, io.getStdErr(), .auto);
+        try printErrMsgToStdErr(gpa, parse_error, new_tree, new_source_file, .auto);
     }
     if (new_tree.errors.len != 0) {
         process.exit(1);