bjoernager/rust
bjoernager/rust
1
Fork 0
Code Issues Pull requests Activity

Add checks for a block before a unary plus. Fix failing tests

Browse source
This commit is contained in:
Theodore Luo Wang 2021-09-01 11:54:06 -04:00
parent e7fb98e725
commit 5a863d594c
9 changed files with 73 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

30
compiler/rustc_parse/src/parser/expr.rs
View file

@ -165,9 +165,12 @@ impl<'a> Parser<'a> {
if [token::DotDot, token::DotDotDot, token::DotDotEq].contains(&self.token.kind) {
return self.parse_prefix_range_expr(attrs);
} else {
self.parse_prefix_expr(attrs)?
let result = self.parse_prefix_expr(attrs);
debug!("parse_prefix_expr result: {:?}", &result);
result?
}
};
debug!("parse_assoc_expr_with(lhs = {:?})", &lhs);
let last_type_ascription_set = self.last_type_ascription.is_some();
if !self.should_continue_as_assoc_expr(&lhs) {
@ -175,8 +178,11 @@ impl<'a> Parser<'a> {
return Ok(lhs);
}
debug!("continue_as_assoc_expr");
self.expected_tokens.push(TokenType::Operator);
while let Some(op) = self.check_assoc_op() {
debug!("op: {:?}", op);
// Adjust the span for interpolated LHS to point to the `$lhs` token
// and not to what it refers to.
let lhs_span = match self.prev_token.kind {
@ -520,17 +526,25 @@ impl<'a> Parser<'a> {
make_it!(this, attrs, |this, _| this.parse_borrow_expr(lo))
}
token::BinOp(token::Plus) => {
this.struct_span_err(lo, "leading `+` is not supported")
.span_label(lo, "unexpected `+`")
.span_suggestion_short(
debug!("leading + detected: {:?}", lo);
let mut err = this.struct_span_err(lo, "leading `+` is not supported");
err.span_label(lo, "unexpected `+`");
// a block on the LHS might have been intended to be an expression instead
let sp = this.sess.source_map().start_point(lo);
if let Some(sp) = this.sess.ambiguous_block_expr_parse.borrow().get(&sp) {
this.sess.expr_parentheses_needed(&mut err, *sp);
} else {
err.span_suggestion(
lo,
"remove the `+`",
"try removing the `+`",
"".to_string(),
Applicability::MachineApplicable,
)
.emit();
this.bump();
);
}
err.emit();
this.bump();
this.parse_prefix_expr(None)
} // `+expr`
token::Ident(..) if this.token.is_keyword(kw::Box) => {

3
compiler/rustc_parse/src/parser/stmt.rs
View file

@ -21,6 +21,8 @@ use rustc_span::symbol::{kw, sym};
use std::mem;
use tracing::debug;
impl<'a> Parser<'a> {
/// Parses a statement. This stops just before trailing semicolons on everything but items.
/// e.g., a `StmtKind::Semi` parses to a `StmtKind::Expr`, leaving the trailing `;` unconsumed.
@ -418,6 +420,7 @@ impl<'a> Parser<'a> {
if self.token == token::Eof {
break;
}
debug!("parsing statements, stmts: {:?}", &stmts);
let stmt = match self.parse_full_stmt(recover) {
Err(mut err) if recover.yes() => {
self.maybe_annotate_with_ascription(&mut err, false);