macros: Allow parsing :tt fragments
:tt fragments stand for token trees, and are composed of either a token, or a delimited token tree, which is a token tree surrounded by delimiters (parentheses, curly brackets or square brackets). This should allow us to handle a lot more macros, including extremely powerful macro patterns such as TT munchers
This commit is contained in:
parent
8283724bc2
commit
5651331236
|
@ -497,10 +497,8 @@ MacroExpander::match_fragment (Parser<MacroInvocLexer> &parser,
|
||||||
gcc_unreachable ();
|
gcc_unreachable ();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// what is TT?
|
|
||||||
case AST::MacroFragSpec::TT:
|
case AST::MacroFragSpec::TT:
|
||||||
// parser.parse_token_tree() ?
|
parser.parse_token_tree ();
|
||||||
gcc_unreachable ();
|
|
||||||
break;
|
break;
|
||||||
|
|
||||||
// i guess we just ignore invalid and just error out
|
// i guess we just ignore invalid and just error out
|
||||||
|
|
|
@ -142,6 +142,7 @@ public:
|
||||||
std::vector<std::unique_ptr<AST::LifetimeParam> > parse_lifetime_params ();
|
std::vector<std::unique_ptr<AST::LifetimeParam> > parse_lifetime_params ();
|
||||||
AST::Visibility parse_visibility ();
|
AST::Visibility parse_visibility ();
|
||||||
std::unique_ptr<AST::IdentifierPattern> parse_identifier_pattern ();
|
std::unique_ptr<AST::IdentifierPattern> parse_identifier_pattern ();
|
||||||
|
std::unique_ptr<AST::TokenTree> parse_token_tree ();
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void skip_after_semicolon ();
|
void skip_after_semicolon ();
|
||||||
|
@ -188,7 +189,6 @@ private:
|
||||||
|
|
||||||
// Token tree or macro related
|
// Token tree or macro related
|
||||||
AST::DelimTokenTree parse_delim_token_tree ();
|
AST::DelimTokenTree parse_delim_token_tree ();
|
||||||
std::unique_ptr<AST::TokenTree> parse_token_tree ();
|
|
||||||
std::unique_ptr<AST::MacroRulesDefinition>
|
std::unique_ptr<AST::MacroRulesDefinition>
|
||||||
parse_macro_rules_def (AST::AttrVec outer_attrs);
|
parse_macro_rules_def (AST::AttrVec outer_attrs);
|
||||||
std::unique_ptr<AST::MacroInvocation>
|
std::unique_ptr<AST::MacroInvocation>
|
||||||
|
|
|
@ -0,0 +1,13 @@
|
||||||
|
macro_rules! t {
|
||||||
|
($t:tt) => {
|
||||||
|
$t
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
fn frob() -> i32 {
|
||||||
|
t!(15) + t!((14))
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() -> i32 {
|
||||||
|
frob() - 29
|
||||||
|
}
|
|
@ -0,0 +1,12 @@
|
||||||
|
macro_rules! count_tt {
|
||||||
|
($t:tt) => { 1 };
|
||||||
|
($t:tt $($ts:tt)*) => { 1 + count_tt!($($ts)*) };
|
||||||
|
}
|
||||||
|
|
||||||
|
fn main() -> i32 {
|
||||||
|
let count = count_tt!(1 2 let a = 15) + count_tt!(1 2 (let a = 15));
|
||||||
|
// ^ ^ ^^^ ^ ^ ^^ ^ ^ ^^^^^^^^^^^^
|
||||||
|
// 6 token-trees 3 token-trees
|
||||||
|
|
||||||
|
count - 9
|
||||||
|
}
|
Loading…
Reference in New Issue