diff --git a/crates/ra_mbe/src/lib.rs b/crates/ra_mbe/src/lib.rs index 2f47e32d3b7..4cfa1f95537 100644 --- a/crates/ra_mbe/src/lib.rs +++ b/crates/ra_mbe/src/lib.rs @@ -37,9 +37,15 @@ pub enum ExpandError { NoMatchingRule, UnexpectedToken, BindingError(String), + ConversionError, } -pub use crate::syntax_bridge::{ast_to_token_tree, token_tree_to_ast_item_list, syntax_node_to_token_tree}; +pub use crate::syntax_bridge::{ + ast_to_token_tree, + token_tree_to_ast_item_list, + syntax_node_to_token_tree, + token_tree_to_macro_items, +}; /// This struct contains AST for a single `macro_rules` definition. What might /// be very confusing is that AST has almost exactly the same shape as @@ -192,21 +198,21 @@ impl_froms!(TokenTree: Leaf, Subtree); pub(crate) fn expand_to_syntax( rules: &MacroRules, invocation: &str, - ) -> ra_syntax::TreeArc { + ) -> ra_syntax::TreeArc { let expanded = expand(rules, invocation); - token_tree_to_ast_item_list(&expanded) + token_tree_to_macro_items(&expanded) } pub(crate) fn assert_expansion(rules: &MacroRules, invocation: &str, expansion: &str) { let expanded = expand(rules, invocation); assert_eq!(expanded.to_string(), expansion); - let tree = token_tree_to_ast_item_list(&expanded); + let tree = token_tree_to_macro_items(&expanded); // Eat all white space by parse it back and forth let expansion = ast::SourceFile::parse(expansion); let expansion = syntax_node_to_token_tree(expansion.syntax()).unwrap().0; - let file = token_tree_to_ast_item_list(&expansion); + let file = token_tree_to_macro_items(&expansion); assert_eq!(tree.syntax().debug_dump().trim(), file.syntax().debug_dump().trim()); } @@ -346,11 +352,11 @@ impl_froms!(TokenTree: Leaf, Subtree); ", ); let expansion = expand(&rules, "structs!(Foo, Bar)"); - let tree = token_tree_to_ast_item_list(&expansion); + let tree = token_tree_to_macro_items(&expansion); assert_eq!( tree.syntax().debug_dump().trim(), r#" -SOURCE_FILE@[0; 40) +MACRO_ITEMS@[0; 40) STRUCT_DEF@[0; 20) STRUCT_KW@[0; 6) "struct" NAME@[6; 9) @@ -527,7 +533,7 @@ SOURCE_FILE@[0; 40) assert_eq!( expand_to_syntax(&rules, "foo! { 1 + 1 }").syntax().debug_dump().trim(), - r#"SOURCE_FILE@[0; 15) + r#"MACRO_ITEMS@[0; 15) FN_DEF@[0; 15) FN_KW@[0; 2) "fn" NAME@[2; 5) diff --git a/crates/ra_mbe/src/syntax_bridge.rs b/crates/ra_mbe/src/syntax_bridge.rs index 28ded7870e1..19e09be80ed 100644 --- a/crates/ra_mbe/src/syntax_bridge.rs +++ b/crates/ra_mbe/src/syntax_bridge.rs @@ -30,6 +30,29 @@ pub fn syntax_node_to_token_tree(node: &SyntaxNode) -> Option<(tt::Subtree, Toke Some((tt, token_map)) } +// The following items are what `rustc` macro can be parsed into : +// link: https://github.com/rust-lang/rust/blob/9ebf47851a357faa4cd97f4b1dc7835f6376e639/src/libsyntax/ext/expand.rs#L141 +// * Expr(P) +// * Pat(P) +// * Ty(P) +// * Stmts(SmallVec<[ast::Stmt; 1]>) +// * Items(SmallVec<[P; 1]>) +// +// * TraitItems(SmallVec<[ast::TraitItem; 1]>) +// * ImplItems(SmallVec<[ast::ImplItem; 1]>) +// * ForeignItems(SmallVec<[ast::ForeignItem; 1]> +// +// + +/// Parses the token tree (result of macro expansion) as a sequence of items +pub fn token_tree_to_macro_items(tt: &tt::Subtree) -> TreeArc { + let token_source = SubtreeTokenSource::new(tt); + let mut tree_sink = TtTreeSink::new(token_source.querier()); + ra_parser::parse_macro_items(&token_source, &mut tree_sink); + let syntax = tree_sink.inner.finish(); + ast::MacroItems::cast(&syntax).unwrap().to_owned() +} + /// Parses the token tree (result of macro expansion) as a sequence of items pub fn token_tree_to_ast_item_list(tt: &tt::Subtree) -> TreeArc { let token_source = SubtreeTokenSource::new(tt); diff --git a/crates/ra_parser/src/grammar.rs b/crates/ra_parser/src/grammar.rs index f8ed1299a90..1adc27b80f0 100644 --- a/crates/ra_parser/src/grammar.rs +++ b/crates/ra_parser/src/grammar.rs @@ -49,6 +49,12 @@ pub(crate) fn root(p: &mut Parser) { m.complete(p, SOURCE_FILE); } +pub(crate) fn macro_items(p: &mut Parser) { + let m = p.start(); + items::mod_contents(p, false); + m.complete(p, MACRO_ITEMS); +} + pub(crate) fn path(p: &mut Parser) { paths::type_path(p); } diff --git a/crates/ra_parser/src/lib.rs b/crates/ra_parser/src/lib.rs index 11b5b9a75c6..d6bcc4d8cd6 100644 --- a/crates/ra_parser/src/lib.rs +++ b/crates/ra_parser/src/lib.rs @@ -98,6 +98,10 @@ pub fn parse_item(token_source: &dyn TokenSource, tree_sink: &mut dyn TreeSink) parse_from_tokens(token_source, tree_sink, grammar::item); } +pub fn parse_macro_items(token_source: &dyn TokenSource, tree_sink: &mut dyn TreeSink) { + parse_from_tokens(token_source, tree_sink, grammar::macro_items); +} + /// A parsing function for a specific braced-block. pub struct Reparser(fn(&mut parser::Parser)); diff --git a/crates/ra_parser/src/syntax_kind/generated.rs b/crates/ra_parser/src/syntax_kind/generated.rs index 498b0e164a6..6f984aea16f 100644 --- a/crates/ra_parser/src/syntax_kind/generated.rs +++ b/crates/ra_parser/src/syntax_kind/generated.rs @@ -233,6 +233,8 @@ pub enum SyntaxKind { ARG_LIST, TYPE_BOUND, TYPE_BOUND_LIST, + MACRO_ITEMS, + MACRO_STMTS, // Technical kind so that we can cast from u16 safely #[doc(hidden)] __LAST, @@ -592,6 +594,8 @@ impl SyntaxKind { ARG_LIST => &SyntaxInfo { name: "ARG_LIST" }, TYPE_BOUND => &SyntaxInfo { name: "TYPE_BOUND" }, TYPE_BOUND_LIST => &SyntaxInfo { name: "TYPE_BOUND_LIST" }, + MACRO_ITEMS => &SyntaxInfo { name: "MACRO_ITEMS" }, + MACRO_STMTS => &SyntaxInfo { name: "MACRO_STMTS" }, TOMBSTONE => &SyntaxInfo { name: "TOMBSTONE" }, EOF => &SyntaxInfo { name: "EOF" }, __LAST => &SyntaxInfo { name: "__LAST" }, diff --git a/crates/ra_syntax/src/ast/generated.rs b/crates/ra_syntax/src/ast/generated.rs index 774d9bcc848..17de4f05808 100644 --- a/crates/ra_syntax/src/ast/generated.rs +++ b/crates/ra_syntax/src/ast/generated.rs @@ -1770,6 +1770,72 @@ impl MacroCall { } } +// MacroItems +#[derive(Debug, PartialEq, Eq, Hash)] +#[repr(transparent)] +pub struct MacroItems { + pub(crate) syntax: SyntaxNode, +} +unsafe impl TransparentNewType for MacroItems { + type Repr = rowan::SyntaxNode; +} + +impl AstNode for MacroItems { + fn cast(syntax: &SyntaxNode) -> Option<&Self> { + match syntax.kind() { + MACRO_ITEMS => Some(MacroItems::from_repr(syntax.into_repr())), + _ => None, + } + } + fn syntax(&self) -> &SyntaxNode { &self.syntax } +} + +impl ToOwned for MacroItems { + type Owned = TreeArc; + fn to_owned(&self) -> TreeArc { TreeArc::cast(self.syntax.to_owned()) } +} + + +impl ast::ModuleItemOwner for MacroItems {} +impl ast::FnDefOwner for MacroItems {} +impl MacroItems {} + +// MacroStmts +#[derive(Debug, PartialEq, Eq, Hash)] +#[repr(transparent)] +pub struct MacroStmts { + pub(crate) syntax: SyntaxNode, +} +unsafe impl TransparentNewType for MacroStmts { + type Repr = rowan::SyntaxNode; +} + +impl AstNode for MacroStmts { + fn cast(syntax: &SyntaxNode) -> Option<&Self> { + match syntax.kind() { + MACRO_STMTS => Some(MacroStmts::from_repr(syntax.into_repr())), + _ => None, + } + } + fn syntax(&self) -> &SyntaxNode { &self.syntax } +} + +impl ToOwned for MacroStmts { + type Owned = TreeArc; + fn to_owned(&self) -> TreeArc { TreeArc::cast(self.syntax.to_owned()) } +} + + +impl MacroStmts { + pub fn statements(&self) -> impl Iterator { + super::children(self) + } + + pub fn expr(&self) -> Option<&Expr> { + super::child_opt(self) + } +} + // MatchArm #[derive(Debug, PartialEq, Eq, Hash)] #[repr(transparent)] diff --git a/crates/ra_syntax/src/grammar.ron b/crates/ra_syntax/src/grammar.ron index b412412879b..663e3a2f9ec 100644 --- a/crates/ra_syntax/src/grammar.ron +++ b/crates/ra_syntax/src/grammar.ron @@ -247,6 +247,10 @@ Grammar( "ARG_LIST", "TYPE_BOUND", "TYPE_BOUND_LIST", + + // macro related + "MACRO_ITEMS", + "MACRO_STMTS", ], ast: { "SourceFile": ( @@ -668,5 +672,16 @@ Grammar( "TypeArg": (options: ["TypeRef"]), "AssocTypeArg": (options: ["NameRef", "TypeRef"]), "LifetimeArg": (), + + "MacroItems": ( + traits: [ "ModuleItemOwner", "FnDefOwner" ], + ), + + "MacroStmts" : ( + options: [ "Expr" ], + collections: [ + ["statements", "Stmt"], + ], + ) }, )