motiejus/zig
1
Fork 0
Code Releases Activity

add bound check on for and while nodes

Browse Source
This commit is contained in:
techatrix
2023-07-28 00:18:29 +02:00
committed by Andrew Kelley
parent 282cb5ee5d
commit 7e25fb4a43
2 changed files with 20 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/std/zig/Ast.zig
View File

@@ -752,11 +752,11 @@ pub fn firstToken(tree: Ast, node: Node.Index) TokenIndex {
// Look for a label and inline.
const main_token = main_tokens[n];
var result = main_token;
if (token_tags[result - 1] == .keyword_inline) {
if (token_tags[result -| 1] == .keyword_inline) {
result -= 1;
}
if (token_tags[result - 1] == .colon) {
result -= 2;
if (token_tags[result -| 1] == .colon) {
result -|= 2;
}
return result - end_offset;
},
@@ -2246,13 +2246,13 @@ fn fullWhileComponents(tree: Ast, info: full.While.Components) full.While {
.else_token = undefined,
.error_token = null,
};
var tok_i = info.while_token - 1;
var tok_i = info.while_token -| 1;
if (token_tags[tok_i] == .keyword_inline) {
result.inline_token = tok_i;
tok_i -= 1;
tok_i -|= 1;
}
if (token_tags[tok_i] == .colon and
token_tags[tok_i - 1] == .identifier)
token_tags[tok_i -| 1] == .identifier)
{
result.label_token = tok_i - 1;
}
@@ -2280,13 +2280,13 @@ fn fullForComponents(tree: Ast, info: full.For.Components) full.For {
.payload_token = undefined,
.else_token = undefined,
};
var tok_i = info.for_token - 1;
var tok_i = info.for_token -| 1;
if (token_tags[tok_i] == .keyword_inline) {
result.inline_token = tok_i;
tok_i -= 1;
tok_i -|= 1;
}
if (token_tags[tok_i] == .colon and
token_tags[tok_i - 1] == .identifier)
token_tags[tok_i -| 1] == .identifier)
{
result.label_token = tok_i - 1;
}

11
lib/std/zig/parser_test.zig
View File

@@ -272,6 +272,17 @@ test "zig fmt: top-level enum missing 'const name ='" {
, &[_]Error{.expected_token});
}
test "zig fmt: top-level for/while loop" {
try testCanonical(
\\for (foo) |_| foo
\\
);
try testCanonical(
\\while (foo) |_| foo
\\
);
}
test "zig fmt: top-level bare asterisk+identifier" {
try testCanonical(
\\*x