bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Minor cleanup in parse_assoc_expr_with.

Browse source
This commit is contained in:
Mazdak Farrokhzad 2019-05-12 02:17:34 +02:00
parent b680b66ddd
commit 4aa4a8f776
1 changed files with 14 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

38
src/libsyntax/parse/parser.rs
View file

@ -3573,7 +3573,8 @@ impl<'a> Parser<'a> {
} else { } else {
self.restrictions self.restrictions
}; };
if op.precedence() < min_prec { let prec = op.precedence();
if prec < min_prec {
break; break;
} }
// Check for deprecated `...` syntax // Check for deprecated `...` syntax
@ -3614,8 +3615,7 @@ impl<'a> Parser<'a> {
// We have 2 alternatives here: `x..y`/`x..=y` and `x..`/`x..=` The other // We have 2 alternatives here: `x..y`/`x..=y` and `x..`/`x..=` The other
// two variants are handled with `parse_prefix_range_expr` call above. // two variants are handled with `parse_prefix_range_expr` call above.
let rhs = if self.is_at_start_of_range_notation_rhs() { let rhs = if self.is_at_start_of_range_notation_rhs() {
Some(self.parse_assoc_expr_with(op.precedence() + 1, Some(self.parse_assoc_expr_with(prec + 1, LhsExpr::NotYetParsed)?)
LhsExpr::NotYetParsed)?)
} else { } else {
None None
}; };
@ -3635,28 +3635,18 @@ impl<'a> Parser<'a> {
break break
} }
let rhs = match op.fixity() { let fixity = op.fixity();
Fixity::Right => self.with_res( let prec_adjustment = match fixity {
restrictions - Restrictions::STMT_EXPR, Fixity::Right => 0,
|this| { Fixity::Left => 1,
this.parse_assoc_expr_with(op.precedence(),
LhsExpr::NotYetParsed)
}),
Fixity::Left => self.with_res(
restrictions - Restrictions::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 // We currently have no non-associative operators that are not handled above by
// the special cases. The code is here only for future convenience. // the special cases. The code is here only for future convenience.
Fixity::None => self.with_res( Fixity::None => 1,
restrictions - Restrictions::STMT_EXPR, };
|this| { let rhs = self.with_res(
this.parse_assoc_expr_with(op.precedence() + 1, restrictions - Restrictions::STMT_EXPR,
LhsExpr::NotYetParsed) |this| this.parse_assoc_expr_with(prec + prec_adjustment, LhsExpr::NotYetParsed)
}), )?;
}?;
// Make sure that the span of the parent node is larger than the span of lhs and rhs, // Make sure that the span of the parent node is larger than the span of lhs and rhs,
// including the attributes. // including the attributes.
@ -3702,7 +3692,7 @@ impl<'a> Parser<'a> {
} }
}; };
if op.fixity() == Fixity::None { break } if let Fixity::None = fixity { break }
} }
Ok(lhs) Ok(lhs)
} }