mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2026-02-14 05:20:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

zig fmt: fix Tree.lastToken() for empty *Two nodes

Browse Source
This commit is contained in:
Isaac Freund 2021-02-11 22:31:44 +01:00 committed by Andrew Kelley
parent 4c8caf3343
commit b6448a533d
1 changed files with 13 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/std/zig/ast.zig
View File

@ -676,20 +676,11 @@ pub const Tree = struct {
},
.ArrayInitDotTwo,
.BlockTwo,
.BuiltinCallTwo,
.StructInitDotTwo,
.ContainerDeclTwo,
.TaggedUnionTwo,
=> {
end_offset += 1; // for the rparen/rbrace
if (datas[n].rhs != 0) {
n = datas[n].rhs;
} else if (datas[n].lhs != 0) {
n = datas[n].lhs;
} else {
return main_tokens[n] + end_offset;
}
},
.BuiltinCallTwo => {
if (datas[n].rhs != 0) {
end_offset += 1; // for the rparen/rbrace
n = datas[n].rhs;
@ -697,7 +688,17 @@ pub const Tree = struct {
end_offset += 1; // for the rparen/rbrace
n = datas[n].lhs;
} else {
end_offset += 2; // for the lparen and rparen
switch (tags[n]) {
.ArrayInitDotTwo,
.BlockTwo,
.StructInitDotTwo,
=> end_offset += 1, // rbrace
.BuiltinCallTwo,
.ContainerDeclTwo,
=> end_offset += 2, // lparen/lbrace + rparen/rbrace
.TaggedUnionTwo => end_offset += 5, // (enum) {}
else => unreachable,
}
return main_tokens[n] + end_offset;
}
},
@ -2708,7 +2709,7 @@ pub const Node = struct {
/// `{}`. `sub_list[lhs..rhs]`.
/// main_token points at the lbrace.
Block,
/// Same as BlockTwo but there is known to be a semicolon before the rbrace.
/// Same as Block but there is known to be a semicolon before the rbrace.
BlockSemicolon,
/// `asm(lhs)`. rhs is the token index of the rparen.
AsmSimple,