Commit c77fee03448817366a2cda98915bc31ba8f2b451 | zig

author	Veikka Tuominen <git@vexu.eu> 2020-05-14 19:56:55+03:00
committer	Veikka Tuominen <git@vexu.eu> 2020-05-14 19:56:55+03:00
log	c77fee03448817366a2cda98915bc31ba8f2b451
tree	01adc52f94627b21c6f212f8a0babd8de7dea63e
parent	c4552ee8edec961defb161e1b828a818f8d407bb
signature	Commit is signed but in an unrecognized format.

fix infinite loop

findToken wasn't as generic as I thought it was

2 files changed, 26 insertions(+), 12 deletions(-)

lib
- std
  - zig
    parse.zig
    parser_test.zig

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

 @@ -213,7 +213,7 @@ fn parseContainerMembers(arena: *Allocator, it: *TokenIterator, tree: *Tree) All
                             .ExpectedToken = .{ .token = index, .expected_id = .Comma },
                         });
                         continue;
-                    }
+                    },
                 }
             };
             if (try parseAppendedDocComment(arena, it, tree, comma)) |appended_comment|
 @@ -245,6 +245,7 @@ fn parseContainerMembers(arena: *Allocator, it: *TokenIterator, tree: *Tree) All
     return list;
 }
+/// Attempts to find next container member by searching for certain tokens
 fn findNextContainerMember(it: *TokenIterator) void {
     var level: u32 = 0;
     while (true) {
 @@ -294,27 +295,30 @@ fn findNextContainerMember(it: *TokenIterator) void {
     }
 }
-/// Attempts to find `wanted` token, keeps track of parentheses.
+/// Attempts to find the next statement by searching for a semicolon
-fn findToken(it: *TokenIterator, wanted: Token.Id) void {
+fn findNextStmt(it: *TokenIterator) void {
-    var count: u32 = 0;
+    var level: u32 = 0;
     while (true) {
         const tok = nextToken(it);
         switch (tok.ptr.id) {
-            .LParen, .LBracket, .LBrace => count += 1,
+            .LBrace => level += 1,
-            .RParen, .RBracket, .RBrace => {
+            .RBrace => {
-                if (count == 0) {
+                if (level == 0) {
                     putBackToken(it, tok.index);
                     return;
                 }
-                count -= 1;
+                level -= 1;
+            },
+            .Semicolon => {
+                if (level == 0) {
+                    return;
+                }
             },
             .Eof => {
                 putBackToken(it, tok.index);
                 return;
             },
-            else => {
+            else => {},
-                if (tok.ptr.id == wanted and count == 0) return;
-            },
         }
     }
 }
 @@ -1186,7 +1190,7 @@ fn parseBlock(arena: *Allocator, it: *TokenIterator, tree: *Tree) !?*Node {
             error.OutOfMemory => return error.OutOfMemory,
             error.ParseError => {
                 // try to skip to the next statement
-                findToken(it, .Semicolon);
+                findNextStmt(it);
                 continue;
             },
         }) orelse break;

lib/std/zig/parser_test.zig+10

...	@@ -138,6 +138,16 @@ test "recovery: invalid container members" {	...	@@ -138,6 +138,16 @@ test "recovery: invalid container members" {
138	});	138	});
139	}	139	}
140		140
		141	test "recovery: invalid parameter" {
		142	try testError(
		143	\\fn main() void {
		144	\\ a(comptime T: type)
		145	\\}
		146	, &[_]Error{
		147	.ExpectedToken,
		148	});
		149	}
		150
141	test "zig fmt: top-level fields" {	151	test "zig fmt: top-level fields" {
142	try testCanonical(	152	try testCanonical(
143	\\a: did_you_know,	153	\\a: did_you_know,