itsscb/rust-analyzer
1
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer.git synced 2025-09-28 11:20:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: negative nums in concat! expansion

Browse Source
This commit is contained in:
Vishruth-Thimmaiah 2025-03-23 18:05:45 +05:30
parent fdfa707807
commit 109d933736
No known key found for this signature in database
GPG Key ID: B89775C5BE008866
2 changed files with 36 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/hir-def/src/macro_expansion_tests/builtin_fn_macro.rs
View File

@ -454,13 +454,13 @@ fn test_concat_expand() {
#[rustc_builtin_macro]
macro_rules! concat {}
fn main() { concat!("fo", "o", 0, r#""bar""#, "\n", false, '"', '\0'); }
fn main() { concat!("fo", "o", 0, r#""bar""#, "\n", false, '"', -4, - 4, '\0'); }
"##,
expect![[r##"
#[rustc_builtin_macro]
macro_rules! concat {}
fn main() { "foo0\"bar\"\nfalse\"\u{0}"; }
fn main() { "foo0\"bar\"\nfalse\"-4-4\u{0}"; }
"##]],
);
}

35
crates/hir-expand/src/builtin/fn_macro.rs
View File

@ -452,7 +452,10 @@ fn concat_expand(
Some(_) => (),
None => span = Some(s),
};
for (i, mut t) in tt.iter().enumerate() {
let mut i = 0;
let mut iter = tt.iter();
while let Some(mut t) = iter.next() {
// FIXME: hack on top of a hack: `$e:expr` captures get surrounded in parentheses
// to ensure the right parsing order, so skip the parentheses here. Ideally we'd
// implement rustc's model. cc https://github.com/rust-lang/rust-analyzer/pull/10623
@ -504,10 +507,40 @@ fn concat_expand(
record_span(id.span);
}
TtElement::Leaf(tt::Leaf::Punct(punct)) if i % 2 == 1 && punct.char == ',' => (),
// handle negative numbers
TtElement::Leaf(tt::Leaf::Punct(punct)) if i % 2 == 0 && punct.char == '-' => {
let t = match iter.next() {
Some(t) => t,
None => {
err.get_or_insert(ExpandError::other(
call_site,
"unexpected end of input after '-'",
));
break;
}
};
match t {
TtElement::Leaf(tt::Leaf::Literal(it))
if matches!(it.kind, tt::LitKind::Integer | tt::LitKind::Float) =>
{
format_to!(text, "-{}", it.symbol.as_str());
record_span(punct.span.cover(it.span));
}
_ => {
err.get_or_insert(ExpandError::other(
call_site,
"expected integer or floating pointer number after '-'",
));
break;
}
}
}
_ => {
err.get_or_insert(ExpandError::other(call_site, "unexpected token"));
}
}
i += 1;
}
let span = span.unwrap_or_else(|| tt.top_subtree().delimiter.open);
ExpandResult { value: quote!(span =>#text), err }