bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Fix generated tokens hygiene

Browse source
This commit is contained in:
Caio 2022-03-21 19:45:55 -03:00
parent 44628f7273
commit 74e7313e0e
1 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

14
compiler/rustc_expand/src/mbe/transcribe.rs
View file

@ -257,7 +257,7 @@ pub(super) fn transcribe<'a>(
// Replace meta-variable expressions with the result of their expansion. // Replace meta-variable expressions with the result of their expansion.
mbe::TokenTree::MetaVarExpr(sp, expr) => { mbe::TokenTree::MetaVarExpr(sp, expr) => {
transcribe_metavar_expr(cx, expr, interp, &repeats, &mut result, &sp)?; transcribe_metavar_expr(cx, expr, interp, &mut marker, &repeats, &mut result, &sp)?;
} }
// If we are entering a new delimiter, we push its contents to the `stack` to be // If we are entering a new delimiter, we push its contents to the `stack` to be
@ -513,17 +513,23 @@ fn transcribe_metavar_expr<'a>(
cx: &ExtCtxt<'a>, cx: &ExtCtxt<'a>,
expr: MetaVarExpr, expr: MetaVarExpr,
interp: &FxHashMap<MacroRulesNormalizedIdent, NamedMatch>, interp: &FxHashMap<MacroRulesNormalizedIdent, NamedMatch>,
marker: &mut Marker,
repeats: &[(usize, usize)], repeats: &[(usize, usize)],
result: &mut Vec<TreeAndSpacing>, result: &mut Vec<TreeAndSpacing>,
sp: &DelimSpan, sp: &DelimSpan,
) -> PResult<'a, ()> { ) -> PResult<'a, ()> {
let mut visited_span = || {
let mut span = sp.entire();
marker.visit_span(&mut span);
span
};
match expr { match expr {
MetaVarExpr::Count(original_ident, depth_opt) => { MetaVarExpr::Count(original_ident, depth_opt) => {
let matched = matched_from_ident(cx, original_ident, interp)?; let matched = matched_from_ident(cx, original_ident, interp)?;
let count = count_repetitions(cx, depth_opt, matched, &repeats, sp)?; let count = count_repetitions(cx, depth_opt, matched, &repeats, sp)?;
let tt = TokenTree::token( let tt = TokenTree::token(
TokenKind::lit(token::Integer, sym::integer(count), None), TokenKind::lit(token::Integer, sym::integer(count), None),
sp.entire(), visited_span(),
); );
result.push(tt.into()); result.push(tt.into());
} }
@ -536,7 +542,7 @@ fn transcribe_metavar_expr<'a>(
result.push( result.push(
TokenTree::token( TokenTree::token(
TokenKind::lit(token::Integer, sym::integer(*index), None), TokenKind::lit(token::Integer, sym::integer(*index), None),
sp.entire(), visited_span(),
) )
.into(), .into(),
); );
@ -548,7 +554,7 @@ fn transcribe_metavar_expr<'a>(
result.push( result.push(
TokenTree::token( TokenTree::token(
TokenKind::lit(token::Integer, sym::integer(*length), None), TokenKind::lit(token::Integer, sym::integer(*length), None),
sp.entire(), visited_span(),
) )
.into(), .into(),
); );