authorgravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-04-12 18:13:09+02:00
committergravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-04-12 18:13:09+02:00
logd35a6655e0d1f5f75d882dbcd6f0e9f232a4bc24
tree8d25ec582153f409c1e5c3388936c582751a327e
parent206c0b8bdb4838010d6a1e70135134dc3edc6723

std.zig.parser: Refactored `commaOrEnd` to `expectCommaOrEnd`

* Now it returns end when found, or null if comma was found. * State should now be appended outside the function

1 files changed, 36 insertions(+), 20 deletions(-)

std/zig/parser.zig+36-20
......@@ -1012,8 +1012,9 @@ pub const Parser = struct {
10121012 });
10131013 },
10141014 State.ParamDeclComma => |fn_proto| {
1015 var discard_end: Token = undefined;
1016 try self.commaOrEnd(&stack, Token.Id.RParen, &discard_end, State { .ParamDecl = fn_proto });
1015 if ((try self.expectCommaOrEnd(Token.Id.RParen)) == null) {
1016 stack.append(State { .ParamDecl = fn_proto }) catch unreachable;
1017 }
10171018 continue;
10181019 },
10191020
......@@ -1394,7 +1395,11 @@ pub const Parser = struct {
13941395 try stack.append(State { .Expression = OptionalCtx { .Required = try list_state.list.addOne() } });
13951396 },
13961397 State.ExprListCommaOrEnd => |list_state| {
1397 try self.commaOrEnd(&stack, list_state.end, list_state.ptr, State { .ExprListItemOrEnd = list_state });
1398 if (try self.expectCommaOrEnd(list_state.end)) |end| {
1399 *list_state.ptr = end;
1400 } else {
1401 stack.append(State { .ExprListItemOrEnd = list_state }) catch unreachable;
1402 }
13981403 continue;
13991404 },
14001405 State.FieldInitListItemOrEnd => |list_state| {
......@@ -1430,12 +1435,19 @@ pub const Parser = struct {
14301435 });
14311436 },
14321437 State.FieldInitListCommaOrEnd => |list_state| {
1433 try self.commaOrEnd(&stack, Token.Id.RBrace, list_state.ptr, State { .FieldInitListItemOrEnd = list_state });
1438 if (try self.expectCommaOrEnd(Token.Id.RBrace)) |end| {
1439 *list_state.ptr = end;
1440 } else {
1441 stack.append(State { .FieldInitListItemOrEnd = list_state }) catch unreachable;
1442 }
14341443 continue;
14351444 },
14361445 State.FieldListCommaOrEnd => |container_decl| {
1437 try self.commaOrEnd(&stack, Token.Id.RBrace, &container_decl.rbrace_token,
1438 State { .ContainerDecl = container_decl });
1446 if (try self.expectCommaOrEnd(Token.Id.RBrace)) |end| {
1447 container_decl.rbrace_token = end;
1448 } else {
1449 stack.append(State { .ContainerDecl = container_decl }) catch unreachable;
1450 }
14391451 continue;
14401452 },
14411453 State.IdentifierListItemOrEnd => |list_state| {
......@@ -1448,7 +1460,11 @@ pub const Parser = struct {
14481460 try stack.append(State { .Identifier = OptionalCtx { .Required = try list_state.list.addOne() } });
14491461 },
14501462 State.IdentifierListCommaOrEnd => |list_state| {
1451 try self.commaOrEnd(&stack, Token.Id.RBrace, list_state.ptr, State { .IdentifierListItemOrEnd = list_state });
1463 if (try self.expectCommaOrEnd(Token.Id.RBrace)) |end| {
1464 *list_state.ptr = end;
1465 } else {
1466 stack.append(State { .IdentifierListItemOrEnd = list_state }) catch unreachable;
1467 }
14521468 continue;
14531469 },
14541470 State.SwitchCaseOrEnd => |list_state| {
......@@ -1473,7 +1489,11 @@ pub const Parser = struct {
14731489
14741490 },
14751491 State.SwitchCaseCommaOrEnd => |list_state| {
1476 try self.commaOrEnd(&stack, Token.Id.RBrace, list_state.ptr, State { .SwitchCaseOrEnd = list_state });
1492 if (try self.expectCommaOrEnd(Token.Id.RBrace)) |end| {
1493 *list_state.ptr = end;
1494 } else {
1495 stack.append(State { .SwitchCaseOrEnd = list_state }) catch unreachable;
1496 }
14771497 continue;
14781498 },
14791499 State.SwitchCaseFirstItem => |case_items| {
......@@ -1498,7 +1518,9 @@ pub const Parser = struct {
14981518 try stack.append(State { .RangeExpressionBegin = OptionalCtx { .Required = try case_items.addOne() } });
14991519 },
15001520 State.SwitchCaseItemCommaOrEnd => |case_items| {
1501 try self.commaOrEnd(&stack, Token.Id.EqualAngleBracketRight, null, State { .SwitchCaseItem = case_items });
1521 if ((try self.expectCommaOrEnd(Token.Id.EqualAngleBracketRight)) == null) {
1522 stack.append(State { .SwitchCaseItem = case_items }) catch unreachable;
1523 }
15021524 continue;
15031525 },
15041526
......@@ -2986,22 +3008,16 @@ pub const Parser = struct {
29863008 }
29873009 }
29883010
2989 fn commaOrEnd(self: &Parser, stack: &ArrayList(State), end: &const Token.Id, maybe_ptr: ?&Token, state_after_comma: &const State) !void {
3011 fn expectCommaOrEnd(self: &Parser, end: @TagType(Token.Id)) !?Token {
29903012 var token = self.getNextToken();
29913013 switch (token.id) {
2992 Token.Id.Comma => {
2993 stack.append(state_after_comma) catch unreachable;
2994 },
3014 Token.Id.Comma => return null,
29953015 else => {
2996 const IdTag = @TagType(Token.Id);
2997 if (IdTag(*end) == token.id) {
2998 if (maybe_ptr) |ptr| {
2999 *ptr = token;
3000 }
3001 return;
3016 if (end == token.id) {
3017 return token;
30023018 }
30033019
3004 return self.parseError(token, "expected ',' or {}, found {}", @tagName(*end), @tagName(token.id));
3020 return self.parseError(token, "expected ',' or {}, found {}", @tagName(end), @tagName(token.id));
30053021 },
30063022 }
30073023 }