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

Detect actual span for getting unexpected token from parsing macros

Browse source
This commit is contained in:
yukang 2023-06-11 14:36:20 +08:00
parent b8a50010de
commit 0220c0b765
3 changed files with 27 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1013,9 +1013,15 @@ impl<'a> Parser<'a> {
}
fn error_unexpected_after_dot(&self) {
// FIXME Could factor this out into non_fatal_unexpected or something.
let actual = pprust::token_to_string(&self.token);
self.sess.emit_err(errors::UnexpectedTokenAfterDot { span: self.token.span, actual });
let span = self.token.span;
let sm = self.sess.source_map();
let (span, actual) = match (&self.token.kind, self.subparser_name) {
(token::Eof, Some(_)) if let Ok(actual) = sm.span_to_snippet(sm.next_point(span)) =>
(span.shrink_to_hi(), actual.into()),
_ => (span, actual),
};
self.sess.emit_err(errors::UnexpectedTokenAfterDot { span, actual });
}
// We need an identifier or integer, but the next token is a float.