bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Only early return if recovered

Browse source
This commit is contained in:
Catherine Flores 2023-07-25 19:15:19 +00:00
parent faa73953c0
commit 79b6ed0e08
1 changed files with 21 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

37
compiler/rustc_parse/src/parser/diagnostics.rs
View file

@ -500,8 +500,7 @@ impl<'a> Parser<'a> {
// Special-case "expected `;`" errors // Special-case "expected `;`" errors
if expected.contains(&TokenType::Token(token::Semi)) { if expected.contains(&TokenType::Token(token::Semi)) {
if self.prev_token.kind == token::Question { if self.prev_token == token::Question && self.maybe_recover_from_ternary_operator() {
self.maybe_recover_from_ternary_operator();
return Ok(true); return Ok(true);
} }
@ -1336,26 +1335,30 @@ impl<'a> Parser<'a> {
} }
/// Rust has no ternary operator (`cond ? then : else`). Parse it and try /// Rust has no ternary operator (`cond ? then : else`). Parse it and try
/// to recover from it if `then` and `else` are valid expressions. /// to recover from it if `then` and `else` are valid expressions. Returns
pub(super) fn maybe_recover_from_ternary_operator(&mut self) { /// whether it was a ternary operator.
let snapshot = self.create_snapshot_for_diagnostic(); pub(super) fn maybe_recover_from_ternary_operator(&mut self) -> bool {
let lo = self.prev_token.span.lo(); if self.prev_token != token::Question {
return false;
}
if self.prev_token == token::Question let lo = self.prev_token.span.lo();
&& match self.parse_expr() { let snapshot = self.create_snapshot_for_diagnostic();
Ok(_) => true,
Err(err) => { if match self.parse_expr() {
err.cancel(); Ok(_) => true,
// The colon can sometimes be mistaken for type Err(err) => {
// ascription. Catch when this happens and continue. err.cancel();
self.token == token::Colon // The colon can sometimes be mistaken for type
} // ascription. Catch when this happens and continue.
self.token == token::Colon
} }
{ } {
if self.eat_noexpect(&token::Colon) { if self.eat_noexpect(&token::Colon) {
match self.parse_expr() { match self.parse_expr() {
Ok(_) => { Ok(_) => {
self.sess.emit_err(TernaryOperator { span: self.token.span.with_lo(lo) }); self.sess.emit_err(TernaryOperator { span: self.token.span.with_lo(lo) });
return true;
} }
Err(err) => { Err(err) => {
err.cancel(); err.cancel();
@ -1366,6 +1369,8 @@ impl<'a> Parser<'a> {
} else { } else {
self.restore_snapshot(snapshot); self.restore_snapshot(snapshot);
}; };
false
} }
pub(super) fn maybe_recover_from_bad_type_plus(&mut self, ty: &Ty) -> PResult<'a, ()> { pub(super) fn maybe_recover_from_bad_type_plus(&mut self, ty: &Ty) -> PResult<'a, ()> {