Commit 382f87abac469db7cbc4968ca03e02cc1af5f6ee | zig

author	Dmitry Matveyev <greenfork.lists@yandex.com> 2021-06-14 22:09:07+06:00
committer	Dmitry Matveyev <greenfork.lists@yandex.com> 2021-06-14 22:09:07+06:00
log	382f87abac469db7cbc4968ca03e02cc1af5f6ee
tree	59035699a8d4c6367c629a50bd07b9c18c3639ad
parent	4173a2bc24af6839f87b4b4dfd5096f34764d7cc

Rewrite printErrMsgToFile to use Message struct from Compilation

1 files changed, 17 insertions(+), 27 deletions(-)

src
- main.zig

src/main.zig+17-27

 @@ -3227,17 +3227,9 @@ fn printErrMsgToFile(
     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();
 @@ -3245,26 +3237,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 =