mirror/zig
1
0
Fork 0
mirror of https://github.com/ziglang/zig.git synced 2025-12-21 05:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

std.zig.parser changed assign expr to only be allowed in some contexts

Browse Source 
* Only allowed in while continue expr and statement expr
This commit is contained in:
Jimmi Holst Christensen 2018-04-10 09:37:29 +02:00
parent 2c7996f400
commit 5cd69ee6a4
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
std/zig/parser.zig
View File

@ -721,7 +721,7 @@ pub const Parser = struct {
}, },
else => { else => {
self.putBackToken(token); self.putBackToken(token);
stack.append(State { .AssignmentExpressionBegin = dest_ptr }) catch unreachable; stack.append(State { .UnwrapExpressionBegin = dest_ptr }) catch unreachable;
continue; continue;
} }
} }
@ -750,7 +750,7 @@ pub const Parser = struct {
State.AssignmentExpressionBegin => |dest_ptr| { State.AssignmentExpressionBegin => |dest_ptr| {
stack.append(State { .AssignmentExpressionEnd = dest_ptr }) catch unreachable; stack.append(State { .AssignmentExpressionEnd = dest_ptr }) catch unreachable;
try stack.append(State { .UnwrapExpressionBegin = dest_ptr }); try stack.append(State { .Expression = dest_ptr });
continue; continue;
}, },
@ -762,7 +762,7 @@ pub const Parser = struct {
dest_ptr.store(&node.base); dest_ptr.store(&node.base);
stack.append(State { .AssignmentExpressionEnd = dest_ptr }) catch unreachable; stack.append(State { .AssignmentExpressionEnd = dest_ptr }) catch unreachable;
try stack.append(State { .UnwrapExpressionBegin = DestPtr { .Field = &node.rhs } }); try stack.append(State { .Expression = DestPtr { .Field = &node.rhs } });
continue; continue;
} else { } else {
self.putBackToken(token); self.putBackToken(token);
@ -1895,7 +1895,7 @@ pub const Parser = struct {
_ = (try self.eatToken(&stack, Token.Id.LParen)) ?? continue; _ = (try self.eatToken(&stack, Token.Id.LParen)) ?? continue;
stack.append(State { .ExpectToken = Token.Id.RParen }) catch unreachable; stack.append(State { .ExpectToken = Token.Id.RParen }) catch unreachable;
try stack.append(State { .Expression = DestPtr { .NullableField = dest } }); try stack.append(State { .AssignmentExpressionBegin = DestPtr { .NullableField = dest } });
}, },
State.ErrorPayload => |dest| { State.ErrorPayload => |dest| {
@ -2333,7 +2333,7 @@ pub const Parser = struct {
try block.statements.append(&node.base); try block.statements.append(&node.base);
stack.append(State { .Semicolon = &node.base }) catch unreachable; stack.append(State { .Semicolon = &node.base }) catch unreachable;
try stack.append(State { .Expression = DestPtr{.Field = &node.expr } }); try stack.append(State { .AssignmentExpressionBegin = DestPtr{.Field = &node.expr } });
continue; continue;
}, },
Token.Id.LBrace => { Token.Id.LBrace => {
@ -2347,7 +2347,7 @@ pub const Parser = struct {
self.putBackToken(next); self.putBackToken(next);
const statememt = try block.statements.addOne(); const statememt = try block.statements.addOne();
stack.append(State { .Semicolon = statememt }) catch unreachable; stack.append(State { .Semicolon = statememt }) catch unreachable;
try stack.append(State { .Expression = DestPtr{.Field = statememt } }); try stack.append(State { .AssignmentExpressionBegin = DestPtr{.Field = statememt } });
continue; continue;
} }
} }
@ -4260,8 +4260,6 @@ test "zig fmt: precedence" {
\\ a or b and c; \\ a or b and c;
\\ (a or b) and c; \\ (a or b) and c;
\\ (a or b) and c; \\ (a or b) and c;
\\ a = b or c;
\\ (a = b) or c;
\\} \\}
\\ \\
); );