bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

parser: improve or-patterns recovery.

Browse source
This commit is contained in:
Mazdak Farrokhzad 2019-08-18 16:35:19 +02:00
parent 0bbea47794
commit 30b841dce0
1 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/libsyntax/parse/parser/pat.rs
View file

@ -110,18 +110,25 @@ impl<'a> Parser<'a> {
// If the next token is not a `|`, // If the next token is not a `|`,
// this is not an or-pattern and we should exit here. // this is not an or-pattern and we should exit here.
if !self.check(&token::BinOp(token::Or)) { if !self.check(&token::BinOp(token::Or)) && self.token != token::OrOr {
return Ok(first_pat) return Ok(first_pat)
} }
let lo = first_pat.span; let lo = first_pat.span;
let mut pats = vec![first_pat]; let mut pats = vec![first_pat];
loop {
if self.token == token::OrOr {
// Found `||`; Recover and pretend we parsed `|`.
self.ban_unexpected_or_or();
self.bump();
} else if self.eat(&token::BinOp(token::Or)) {
// Found `|`. Working towards a proper or-pattern.
} else {
break;
}
while self.eat(&token::BinOp(token::Or)) {
pats.push(self.parse_pat_with_range_pat(true, expected)?); pats.push(self.parse_pat_with_range_pat(true, expected)?);
} }
let or_pattern_span = lo.to(self.prev_span); let or_pattern_span = lo.to(self.prev_span);
// Feature gate the or-pattern if instructed: // Feature gate the or-pattern if instructed: