ast-exporter: Export macro parameter information to Rust

Author: Rua

c2rust-ast-exporter/src/AstExporter.cpp

@@ -822,7 +822,19 @@ class TranslateASTVisitor final
         if (encodeMacroInvocations) {
             for (auto I = curMacroInvocationStack.rbegin(), E = curMacroInvocationStack.rend();
                  I != E; ++I) {
-                cbor_encode_uint(&childEnc, uintptr_t(I->macro));
+                CborEncoder expansionEnc;
+                cbor_encoder_create_array(&childEnc, &expansionEnc, 3);
+
+                cbor_encode_uint(&expansionEnc, I->key);
+                cbor_encode_uint(&expansionEnc, uintptr_t(I->macro));
+
+                if (!I->parameter.empty()) {
+                    cbor_encode_string(&expansionEnc, I->parameter.str());
+                } else {
+                    cbor_encode_null(&expansionEnc);
+                }
+
+                cbor_encoder_close_container(&childEnc, &expansionEnc);
             }
         }
         cbor_encoder_close_container(&local, &childEnc);

c2rust-ast-exporter/src/clang_ast.rs

@@ -1,3 +1,4 @@
+use serde::Deserialize;
 use serde_bytes::ByteBuf;
 use serde_cbor::error;
 use std::collections::{HashMap, VecDeque};
@@ -108,11 +109,18 @@ pub struct AstNode {
     // Stack of macros this node was expanded from, beginning with the initial
     // macro call and ending with the leaf. This needs to be a stack for nested
     // macro definitions.
-    pub macro_invocations: Vec<u64>,
+    pub macro_invocations: Vec<MacroInvocationInfoRaw>,
     pub macro_invocation_text: Option<String>,
     pub extras: Vec<Value>,
 }
 
+#[derive(Debug, Clone, Deserialize)]
+pub struct MacroInvocationInfoRaw {
+    pub key: u32,
+    pub macro_id: u64,
+    pub parameter: Option<String>,
+}
+
 #[derive(Debug, Clone)]
 pub struct TypeNode {
     pub tag: TypeTag,
@@ -260,7 +268,8 @@ pub fn process(items: Value) -> error::Result<AstContext> {
             };
 
             // entry[10]
-            let macro_invocations = from_value::<Vec<u64>>(entry.pop_front().unwrap()).unwrap();
+            let macro_invocations =
+                from_value::<Vec<MacroInvocationInfoRaw>>(entry.pop_front().unwrap()).unwrap();
 
             let macro_invocation_text = expect_opt_str(&entry.pop_front().unwrap())
                 .unwrap()

c2rust-transpile/src/c_ast/conversion.rs

@@ -1047,8 +1047,8 @@ impl ConversionContext {
             };
 
             if expected_ty & EXPR != 0 {
-                for mac_id in &node.macro_invocations {
-                    let mac = CDeclId(self.visit_node_type(*mac_id, MACRO_DECL));
+                for info in &node.macro_invocations {
+                    let mac = CDeclId(self.visit_node_type(info.macro_id, MACRO_DECL));
                     self.typed_context
                         .macro_invocations
                         .entry(CExprId(new_id))