nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-05-03 13:37:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix match literal

Browse Source
This commit is contained in:
Edwin Cheng 2019-05-20 18:29:02 +08:00
parent 3894eb77d8
commit ad9d2012de
2 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
crates/ra_mbe/src/mbe_expander.rs
View File

@ -281,7 +281,11 @@ fn match_lhs(pattern: &crate::Subtree, input: &mut TtCursor) -> Result<Bindings,
return Err(ExpandError::UnexpectedToken); return Err(ExpandError::UnexpectedToken);
} }
} }
_ => return Err(ExpandError::UnexpectedToken), crate::Leaf::Literal(literal) => {
if input.eat_literal().map(|i| &i.text) != Some(&literal.text) {
return Err(ExpandError::UnexpectedToken);
}
}
}, },
crate::TokenTree::Repeat(crate::Repeat { subtree, kind, separator }) => { crate::TokenTree::Repeat(crate::Repeat { subtree, kind, separator }) => {
// Dirty hack to make macro-expansion terminate. // Dirty hack to make macro-expansion terminate.

14
crates/ra_mbe/src/tests.rs
View File

@ -575,6 +575,20 @@ fn test_tt_to_stmts() {
); );
} }
#[test]
fn test_match_literal() {
let rules = create_rules(
r#"
macro_rules! foo {
('(') => {
fn foo() {}
}
}
"#,
);
assert_expansion(MacroKind::Items, &rules, "foo! ['(']", "fn foo () {}");
}
// The following tests are port from intellij-rust directly // The following tests are port from intellij-rust directly
// https://github.com/intellij-rust/intellij-rust/blob/c4e9feee4ad46e7953b1948c112533360b6087bb/src/test/kotlin/org/rust/lang/core/macros/RsMacroExpansionTest.kt // https://github.com/intellij-rust/intellij-rust/blob/c4e9feee4ad46e7953b1948c112533360b6087bb/src/test/kotlin/org/rust/lang/core/macros/RsMacroExpansionTest.kt