mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-16 11:13:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

parser: fix infinite loop on missing comma in param list

Browse Source
This commit is contained in:
Isaac Freund 2021-03-01 21:07:07 +01:00 committed by Andrew Kelley
parent cd7c870bd8
commit 7b5b7bda87
2 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
lib/std/zig/parse.zig
View File

@ -3714,7 +3714,6 @@ const Parser = struct {
if (p.eatToken(.r_paren)) |_| { if (p.eatToken(.r_paren)) |_| {
return SmallSpan{ .zero_or_one = 0 }; return SmallSpan{ .zero_or_one = 0 };
} }
continue;
}, },
.r_paren => return SmallSpan{ .zero_or_one = 0 }, .r_paren => return SmallSpan{ .zero_or_one = 0 },
else => { else => {
@ -3728,14 +3727,7 @@ const Parser = struct {
const param_two = while (true) { const param_two = while (true) {
switch (p.token_tags[p.nextToken()]) { switch (p.token_tags[p.nextToken()]) {
.comma => { .comma => {},
if (p.eatToken(.r_paren)) |_| {
return SmallSpan{ .zero_or_one = param_one };
}
const param = try p.expectParamDecl();
if (param != 0) break param;
continue;
},
.r_paren => return SmallSpan{ .zero_or_one = param_one }, .r_paren => return SmallSpan{ .zero_or_one = param_one },
.colon, .r_brace, .r_bracket => { .colon, .r_brace, .r_bracket => {
p.tok_i -= 1; p.tok_i -= 1;
@ -3748,6 +3740,11 @@ const Parser = struct {
try p.warnExpected(.comma); try p.warnExpected(.comma);
}, },
} }
if (p.eatToken(.r_paren)) |_| {
return SmallSpan{ .zero_or_one = param_one };
}
const param = try p.expectParamDecl();
if (param != 0) break param;
} else unreachable; } else unreachable;
var list = std.ArrayList(Node.Index).init(p.gpa); var list = std.ArrayList(Node.Index).init(p.gpa);
@ -3757,17 +3754,7 @@ const Parser = struct {
while (true) { while (true) {
switch (p.token_tags[p.nextToken()]) { switch (p.token_tags[p.nextToken()]) {
.comma => { .comma => {},
if (p.token_tags[p.tok_i] == .r_paren) {
p.tok_i += 1;
return SmallSpan{ .multi = list.toOwnedSlice() };
}
const param = try p.expectParamDecl();
if (param != 0) {
try list.append(param);
}
continue;
},
.r_paren => return SmallSpan{ .multi = list.toOwnedSlice() }, .r_paren => return SmallSpan{ .multi = list.toOwnedSlice() },
.colon, .r_brace, .r_bracket => { .colon, .r_brace, .r_bracket => {
p.tok_i -= 1; p.tok_i -= 1;
@ -3780,6 +3767,11 @@ const Parser = struct {
try p.warnExpected(.comma); try p.warnExpected(.comma);
}, },
} }
if (p.eatToken(.r_paren)) |_| {
return SmallSpan{ .multi = list.toOwnedSlice() };
}
const param = try p.expectParamDecl();
if (param != 0) try list.append(param);
} }
} }

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

@ -4549,6 +4549,18 @@ test "recovery: missing for payload" {
}); });
} }
test "recovery: missing comma in params" {
try testError(
\\fn foo(comptime bool what what) void { }
\\fn bar(a: i32, b: i32 c) void { }
\\
, &[_]Error{
.expected_token,
.expected_token,
.expected_token,
});
}
const std = @import("std"); const std = @import("std");
const mem = std.mem; const mem = std.mem;
const warn = std.debug.warn; const warn = std.debug.warn;