aboutsummaryrefslogtreecommitdiff
path: root/src/main.zig
diff options
context:
space:
mode:
authorVeikka Tuominen <git@vexu.eu>2022-07-15 11:38:16 +0300
committerVeikka Tuominen <git@vexu.eu>2022-07-15 15:11:43 +0300
commit1463144fc88550ba1dca3888acdcdd4903781222 (patch)
tree19aa9a5f957b04d095afc7d6009eaf26877d19a4 /src/main.zig
parentb5a838247bd7d66037ba48378c34ba4460747deb (diff)
downloadzig-1463144fc88550ba1dca3888acdcdd4903781222.tar.gz
zig-1463144fc88550ba1dca3888acdcdd4903781222.zip
Compilation: point caret in error message at the main token
Diffstat (limited to 'src/main.zig')
-rw-r--r--src/main.zig14
1 files changed, 11 insertions, 3 deletions
diff --git a/src/main.zig b/src/main.zig
index 7187dac3e7..a95c3c5dd7 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -4381,7 +4381,7 @@ fn printErrsMsgToStdErr(
.msg = try std.fmt.allocPrint(arena, "invalid byte: '{'}'", .{
std.zig.fmtEscapes(tree.source[byte_offset..][0..1]),
}),
- .span = .{ .start = byte_offset, .end = byte_offset + 1 },
+ .span = .{ .start = byte_offset, .end = byte_offset + 1, .main = byte_offset },
.line = @intCast(u32, start_loc.line),
.column = @intCast(u32, start_loc.column) + bad_off,
.source_line = source_line,
@@ -4401,7 +4401,11 @@ fn printErrsMsgToStdErr(
.src = .{
.src_path = path,
.msg = try arena.dupe(u8, text_buf.items),
- .span = .{ .start = byte_offset, .end = byte_offset + @intCast(u32, tree.tokenSlice(note.token).len) },
+ .span = .{
+ .start = byte_offset,
+ .end = byte_offset + @intCast(u32, tree.tokenSlice(note.token).len),
+ .main = byte_offset,
+ },
.line = @intCast(u32, note_loc.line),
.column = @intCast(u32, note_loc.column),
.source_line = tree.source[note_loc.line_start..note_loc.line_end],
@@ -4417,7 +4421,11 @@ fn printErrsMsgToStdErr(
.src = .{
.src_path = path,
.msg = text,
- .span = .{ .start = byte_offset, .end = byte_offset + @intCast(u32, tree.tokenSlice(lok_token).len) },
+ .span = .{
+ .start = byte_offset,
+ .end = byte_offset + @intCast(u32, tree.tokenSlice(lok_token).len),
+ .main = byte_offset,
+ },
.line = @intCast(u32, start_loc.line),
.column = @intCast(u32, start_loc.column) + extra_offset,
.source_line = source_line,