bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

When encountering unclosed delimiters during parsing, check for diff markers

Browse source 
Fix #116252.
This commit is contained in:
Esteban Küber 2023-10-13 22:43:48 +00:00
parent 608e9682f0
commit 50ca5ef07f
7 changed files with 122 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_parse/src/lexer/mod.rs
View file

@ -64,10 +64,10 @@ pub(crate) fn parse_token_trees<'a>(
override_span,
nbsp_is_whitespace: false,
};
let (token_trees, unmatched_delims) =
let (stream, res, unmatched_delims) =
tokentrees::TokenTreesReader::parse_all_token_trees(string_reader);
match token_trees {
Ok(stream) if unmatched_delims.is_empty() => Ok(stream),
match res {
Ok(()) if unmatched_delims.is_empty() => Ok(stream),
_ => {
// Return error if there are unmatched delimiters or unclosed delimiters.
// We emit delimiter mismatch errors first, then emit the unclosing delimiter mismatch
@ -79,9 +79,11 @@ pub(crate) fn parse_token_trees<'a>(
err.buffer(&mut buffer);
}
}
if let Err(err) = token_trees {
// Add unclosing delimiter error
err.buffer(&mut buffer);
if let Err(errs) = res {
// Add unclosing delimiter or diff marker errors
for err in errs {
err.buffer(&mut buffer);
}
}
Err(buffer)
}