rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Auto merge of #30375 - aaronkeen:issue_28777, r=eddyb

Browse Source 
RESTRICTION_STMT_EXPR restriction to allow subsequent expressions to
contain braces.

https://github.com/rust-lang/rust/issues/28777
This commit is contained in:
bors
2015-12-30 23:20:12 +00:00
parent 0bd29f8461 cedd794d72
commit 2370d461a6
3 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/libsyntax/parse/parser.rs
View File

@@ -2809,16 +2809,25 @@ impl<'a> Parser<'a> {
}
let rhs = try!(match op.fixity() {
Fixity::Right => self.with_res(restrictions, |this|{
this.parse_assoc_expr_with(op.precedence(), LhsExpr::NotYetParsed)
Fixity::Right => self.with_res(
restrictions - Restrictions::RESTRICTION_STMT_EXPR,
|this| {
this.parse_assoc_expr_with(op.precedence(),
LhsExpr::NotYetParsed)
}),
Fixity::Left => self.with_res(restrictions, |this|{
this.parse_assoc_expr_with(op.precedence() + 1, LhsExpr::NotYetParsed)
Fixity::Left => self.with_res(
restrictions - Restrictions::RESTRICTION_STMT_EXPR,
|this| {
this.parse_assoc_expr_with(op.precedence() + 1,
LhsExpr::NotYetParsed)
}),
// We currently have no non-associative operators that are not handled above by
// the special cases. The code is here only for future convenience.
Fixity::None => self.with_res(restrictions, |this|{
this.parse_assoc_expr_with(op.precedence() + 1, LhsExpr::NotYetParsed)
Fixity::None => self.with_res(
restrictions - Restrictions::RESTRICTION_STMT_EXPR,
|this| {
this.parse_assoc_expr_with(op.precedence() + 1,
LhsExpr::NotYetParsed)
}),
});