aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2021-02-19 18:04:52 -0700
committerAndrew Kelley <andrew@ziglang.org>2021-02-19 18:04:52 -0700
commit8fee41b1d528d598521525574206e200fd332c67 (patch)
tree2c5ad20494b34a9391474d06a7d1e97b6732612d /src
parent74878565e5112fed04336089ed769443e08e605b (diff)
downloadzig-8fee41b1d528d598521525574206e200fd332c67.tar.gz
zig-8fee41b1d528d598521525574206e200fd332c67.zip
stage2: AST: clean up parse errors
* struct instead of tagged union * delete dead code * simplify parser code * remove unnecessary metaprogramming
Diffstat (limited to 'src')
-rw-r--r--src/Module.zig2
-rw-r--r--src/main.zig2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Module.zig b/src/Module.zig
index 35819c5d44..8f2ac3721e 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -1723,7 +1723,7 @@ pub fn getAstTree(self: *Module, root_scope: *Scope.File) !*const ast.Tree {
err_msg.* = .{
.src_loc = .{
.file_scope = root_scope,
- .byte_offset = tree.tokens.items(.start)[parse_err.loc()],
+ .byte_offset = tree.tokens.items(.start)[parse_err.token],
},
.msg = msg.toOwnedSlice(),
};
diff --git a/src/main.zig b/src/main.zig
index c0ac41d9bf..09d791cfb5 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -2898,7 +2898,7 @@ fn printErrMsgToFile(
.on => true,
.off => false,
};
- const lok_token = parse_error.loc();
+ const lok_token = parse_error.token;
const token_starts = tree.tokens.items(.start);
const token_tags = tree.tokens.items(.tag);