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

Rollup merge of #62887 - estebank:issue-62881, r=petrochenkov

Browse Source 
Make the parser TokenStream more resilient after mismatched delimiter recovery

Fix #62881, fix #62895.
This commit is contained in:
Mazdak Farrokhzad
2019-07-25 23:21:03 +02:00
committed by GitHub
parent a534c37b37 fe2b5bbe6d
commit c9a766ab47
5 changed files with 109 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -7671,6 +7671,11 @@ impl<'a> Parser<'a> {
let ret = f(self);
let last_token = if self.token_cursor.stack.len() == prev {
&mut self.token_cursor.frame.last_token
} else if self.token_cursor.stack.get(prev).is_none() {
// This can happen due to a bad interaction of two unrelated recovery mechanisms with
// mismatched delimiters *and* recovery lookahead on the likely typo `pub ident(`
// (#62881).
return Ok((ret?, TokenStream::new(vec![])));
} else {
&mut self.token_cursor.stack[prev].last_token
};
@@ -7678,7 +7683,15 @@ impl<'a> Parser<'a> {
// Pull out the tokens that we've collected from the call to `f` above.
let mut collected_tokens = match *last_token {
LastToken::Collecting(ref mut v) => mem::take(v),
LastToken::Was(_) => panic!("our vector went away?"),
LastToken::Was(ref was) => {
let msg = format!("our vector went away? - found Was({:?})", was);
debug!("collect_tokens: {}", msg);
self.sess.span_diagnostic.delay_span_bug(self.token.span, &msg);
// This can happen due to a bad interaction of two unrelated recovery mechanisms
// with mismatched delimiters *and* recovery lookahead on the likely typo
// `pub ident(` (#62895, different but similar to the case above).
return Ok((ret?, TokenStream::new(vec![])));
}
};
// If we're not at EOF our current token wasn't actually consumed by