Commit 7b5b7bda87dc4121e2942042d19fd375c73f90e5 | zig

author	Isaac Freund <mail@isaacfreund.com> 2021-03-01 21:07:07+01:00
committer	Andrew Kelley <andrew@ziglang.org> 2021-03-01 16:09:57-08:00
log	7b5b7bda87dc4121e2942042d19fd375c73f90e5
tree	d4e28868de6b2d6de9b81914773020c65ad55a71
parent	cd7c870bd81391dd97c5c75eb3910382ba7280a1

parser: fix infinite loop on missing comma in param list

2 files changed, 24 insertions(+), 20 deletions(-)

lib
- std
  - zig
    parse.zig
    parser_test.zig

lib/std/zig/parse.zig+12-20

 @@ -3714,7 +3714,6 @@ const Parser = struct {
                     if (p.eatToken(.r_paren)) |_| {
                         return SmallSpan{ .zero_or_one = 0 };
                     }
-                    continue;
                 },
                 .r_paren => return SmallSpan{ .zero_or_one = 0 },
                 else => {
 @@ -3728,14 +3727,7 @@ const Parser = struct {
         const param_two = while (true) {
             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 },
                 .colon, .r_brace, .r_bracket => {
                     p.tok_i -= 1;
 @@ -3748,6 +3740,11 @@ const Parser = struct {
                     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;
         var list = std.ArrayList(Node.Index).init(p.gpa);
 @@ -3757,17 +3754,7 @@ const Parser = struct {
         while (true) {
             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() },
                 .colon, .r_brace, .r_bracket => {
                     p.tok_i -= 1;
 @@ -3780,6 +3767,11 @@ const Parser = struct {
                     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);
         }
     }

lib/std/zig/parser_test.zig+12

...	@@ -4549,6 +4549,18 @@ test "recovery: missing for payload" {	...	@@ -4549,6 +4549,18 @@ test "recovery: missing for payload" {
4549	});	4549	});
4550	}	4550	}
4551		4551
		4552	test "recovery: missing comma in params" {
		4553	try testError(
		4554	\\fn foo(comptime bool what what) void { }
		4555	\\fn bar(a: i32, b: i32 c) void { }
		4556	\\
		4557	, &[_]Error{
		4558	.expected_token,
		4559	.expected_token,
		4560	.expected_token,
		4561	});
		4562	}
		4563
4552	const std = @import("std");	4564	const std = @import("std");
4553	const mem = std.mem;	4565	const mem = std.mem;
4554	const warn = std.debug.warn;	4566	const warn = std.debug.warn;