authorgravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-04-11 12:53:01+02:00
committergravatar for jhc@dismail.deJimmi Holst Christensen <jhc@dismail.de> 2018-04-11 12:53:01+02:00
log5f3ec023cd697007ff868938e3b5fe387add6af5
tree47260a86f9b846e6daed3f013a1f6cd7e704bf1f
parent281c17f6ae3c294d0b7139fe640dd0cb30123ea1

std.zig.parser: Fixed parsing of field access rhs

related: #909

1 files changed, 9 insertions(+), 2 deletions(-)

std/zig/parser.zig+9-2
...@@ -1515,17 +1515,23 @@ pub const Parser = struct {...@@ -1515,17 +1515,23 @@ pub const Parser = struct {
1515 continue;1515 continue;
1516 },1516 },
1517 Token.Id.Period => {1517 Token.Id.Period => {
1518 const identifier = try self.createLiteral(arena, ast.NodeIdentifier, Token(undefined));
1518 const node = try self.createToDestNode(arena, dest_ptr, ast.NodeInfixOp,1519 const node = try self.createToDestNode(arena, dest_ptr, ast.NodeInfixOp,
1519 ast.NodeInfixOp {1520 ast.NodeInfixOp {
1520 .base = undefined,1521 .base = undefined,
1521 .lhs = dest_ptr.get(),1522 .lhs = dest_ptr.get(),
1522 .op_token = token,1523 .op_token = token,
1523 .op = ast.NodeInfixOp.InfixOp.Period,1524 .op = ast.NodeInfixOp.InfixOp.Period,
1524 .rhs = undefined,1525 .rhs = &identifier.base,
1525 }1526 }
1526 );1527 );
1527 stack.append(State { .SuffixOpExpressionEnd = dest_ptr }) catch unreachable;1528 stack.append(State { .SuffixOpExpressionEnd = dest_ptr }) catch unreachable;
1528 try stack.append(State { .SuffixOpExpressionBegin = DestPtr { .Field = &node.rhs }});1529 try stack.append(State {
1530 .ExpectTokenSave = ExpectTokenSave {
1531 .id = Token.Id.Identifier,
1532 .ptr = &identifier.token
1533 }
1534 });
1529 continue;1535 continue;
1530 },1536 },
1531 else => {1537 else => {
...@@ -5011,6 +5017,7 @@ test "zig fmt: inline asm" {...@@ -5011,6 +5017,7 @@ test "zig fmt: inline asm" {
5011test "zig fmt: coroutines" {5017test "zig fmt: coroutines" {
5012 try testCanonical(5018 try testCanonical(
5013 \\async fn simpleAsyncFn() void {5019 \\async fn simpleAsyncFn() void {
5020 \\ const a = async a.b();
5014 \\ x += 1;5021 \\ x += 1;
5015 \\ suspend;5022 \\ suspend;
5016 \\ x += 1;5023 \\ x += 1;