bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Add TtParser::macro_name.

Browse source 
Instead of passing it into `parse_tt`.
This commit is contained in:
Nicholas Nethercote 2022-03-19 08:03:48 +11:00
parent 354bd1071c
commit 39810a85da
2 changed files with 35 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

20
compiler/rustc_expand/src/mbe/macro_parser.rs
View file

@ -492,9 +492,15 @@ fn token_name_eq(t1: &Token, t2: &Token) -> bool {
}
}
pub struct TtParser;
pub struct TtParser {
macro_name: Ident,
}
impl TtParser {
pub(super) fn new(macro_name: Ident) -> Self {
Self { macro_name }
}
/// Process the matcher positions of `cur_items` until it is empty. In the process, this will
/// produce more items in `next_items` and `bb_items`.
///
@ -693,7 +699,6 @@ impl TtParser {
&self,
parser: &mut Cow<'_, Parser<'_>>,
ms: &[TokenTree],
macro_name: Ident,
) -> NamedParseResult {
// A queue of possible matcher positions. We initialize it with the matcher position in
// which the "dot" is before the first token of the first token tree in `ms`.
@ -779,12 +784,7 @@ impl TtParser {
(_, _) => {
// Too many possibilities!
return self.ambiguity_error(
macro_name,
next_items,
bb_items,
parser.token.span,
);
return self.ambiguity_error(next_items, bb_items, parser.token.span);
}
}
@ -794,7 +794,6 @@ impl TtParser {
fn ambiguity_error<'root, 'tt>(
&self,
macro_name: Ident,
next_items: SmallVec<[MatcherPosHandle<'root, 'tt>; 1]>,
bb_items: SmallVec<[MatcherPosHandle<'root, 'tt>; 1]>,
token_span: rustc_span::Span,
@ -813,7 +812,8 @@ impl TtParser {
Error(
token_span,
format!(
"local ambiguity when calling macro `{macro_name}`: multiple parsing options: {}",
"local ambiguity when calling macro `{}`: multiple parsing options: {}",
self.macro_name,
match next_items.len() {
0 => format!("built-in NTs {}.", nts),
1 => format!("built-in NTs {} or 1 other option.", nts),