Rust: separate attribute macro and macro call expansions

Author: Paolo Tranquilli

rust/extractor/src/generated/.generated.list

@@ -328,7 +328,11 @@ impl<'a> Translator<'a> {
             let expand_to = ra_ap_hir_expand::ExpandTo::from_call_site(mcall);
             let kind = expanded.kind();
             if let Some(value) = self.emit_expanded_as(expand_to, expanded) {
-                generated::Item::emit_expanded(label.into(), value, &mut self.trap.writer);
+                generated::MacroCall::emit_macro_call_expansion(
+                    label,
+                    value,
+                    &mut self.trap.writer,
+                );
             } else {
                 let range = self.text_range_for_node(mcall);
                 self.emit_parse_error(mcall, &SyntaxError::new(
@@ -655,8 +659,9 @@ impl<'a> Translator<'a> {
             } = semantics.expand_attr_macro(node)?;
             // TODO emit err?
             self.emit_macro_expansion_parse_errors(node, &expanded);
-            let expanded = self.emit_expanded_as(ExpandTo::Items, expanded)?;
-            generated::Item::emit_expanded(label, expanded, &mut self.trap.writer);
+            let macro_items = ast::MacroItems::cast(expanded)?;
+            let expanded = self.emit_macro_items(&macro_items)?;
+            generated::Item::emit_attribute_macro_expansion(label, expanded, &mut self.trap.writer);
             Some(())
         })();
     }

rust/extractor/src/generated/top.rs

@@ -217,7 +217,7 @@ final class MacroCallCfgNode extends Nodes::MacroCallCfgNode {
 
   /** Gets the CFG node for the expansion of this macro call, if it exists. */
   CfgNode getExpandedNode() {
-    any(ChildMapping mapping).hasCfgChild(node, node.getExpanded(), this, result)
+    any(ChildMapping mapping).hasCfgChild(node, node.getMacroCallExpansion(), this, result)
   }
 }
 

rust/extractor/src/translate/base.rs

@@ -75,7 +75,7 @@ class StructPatChildMapping extends ParentAstNode, StructPat {
 }
 
 class MacroCallChildMapping extends ParentAstNode, MacroCall {
-  override predicate relevantChild(AstNode child) { child = this.getExpanded() }
+  override predicate relevantChild(AstNode child) { child = this.getMacroCallExpansion() }
 }
 
 class FormatArgsExprChildMapping extends ParentAstNode, CfgImpl::ExprTrees::FormatArgsExprTree {

rust/ql/.generated.list

@@ -160,7 +160,7 @@ private predicate guaranteedMatchPosition(Pat pat) {
     parent.(OrPat).getLastPat() = pat
     or
     // for macro patterns we propagate to the expanded pattern
-    parent.(MacroPat).getMacroCall().getExpanded() = pat
+    parent.(MacroPat).getMacroCall().getMacroCallExpansion() = pat
   )
 }
 

rust/ql/.gitattributes

@@ -143,7 +143,7 @@ class LetStmtTree extends PreOrderTree, LetStmt {
 }
 
 class MacroCallTree extends StandardPostOrderTree, MacroCall {
-  override AstNode getChildNode(int i) { i = 0 and result = this.getExpanded() }
+  override AstNode getChildNode(int i) { i = 0 and result = this.getMacroCallExpansion() }
 }
 
 class MacroStmtsTree extends StandardPreOrderTree, MacroStmts {
@@ -685,7 +685,7 @@ module PatternTrees {
   }
 
   class MacroPatTree extends PreOrderPatTree, MacroPat {
-    override Pat getPat(int i) { i = 0 and result = this.getMacroCall().getExpanded() }
+    override Pat getPat(int i) { i = 0 and result = this.getMacroCall().getMacroCallExpansion() }
   }
 
   class OrPatTree extends PostOrderPatTree instanceof OrPat {