ast-exporter: Export macro parameter names

Author: Rua

c2rust-ast-exporter/src/AstExporter.cpp

@@ -1014,9 +1014,18 @@ class TranslateASTVisitor final
             // Extend the range to include the entire final token.
             expandSpanToFinalChar(range, Context);
             encode_entry_raw(Mac, tag, range, QualType(), false,
-                             false, false, childIds, [Name](CborEncoder *local) {
-                                 cbor_encode_string(local, Name.str());
-                             });
+                             false, false, childIds, [Name, Mac](CborEncoder *local) {
+                cbor_encode_string(local, Name.str());
+
+                CborEncoder array;
+                cbor_encoder_create_array(local, &array, Mac->getNumParams());
+
+                for (auto IdentifierInfo : Mac->params()) {
+                    cbor_encode_string(&array, IdentifierInfo->getName().str());
+                }
+
+                cbor_encoder_close_container(local, &array);
+            });
 
         }
     }

c2rust-transpile/src/c_ast/conversion.rs

@@ -2375,10 +2375,18 @@ impl ConversionContext {
                 {
                     let name = from_value::<String>(node.extras[0].clone())
                         .expect("Macros must have a name");
+                    let raw_params = from_value::<Vec<Value>>(node.extras[1].clone())
+                        .expect("Macros must have a parameter list");
+                    let params: Vec<String> = raw_params
+                        .into_iter()
+                        .map(|v| from_value(v).expect("param name"))
+                        .collect();
 
                     let mac_object = match node.tag {
                         ASTEntryTag::TagMacroObjectDef => CDeclKind::MacroObject { name },
-                        ASTEntryTag::TagMacroFunctionDef => CDeclKind::MacroFunction { name },
+                        ASTEntryTag::TagMacroFunctionDef => {
+                            CDeclKind::MacroFunction { name, params }
+                        }
                         _ => unreachable!("Unexpected tag for macro"),
                     };
 
@@ -2391,20 +2399,6 @@ impl ConversionContext {
                     self.typed_context.c_decls_top.push(CDeclId(new_id));
                 }
 
-                ASTEntryTag::TagMacroFunctionDef if expected_ty & MACRO_DECL != 0 => {
-                    let name = from_value::<String>(node.extras[0].clone())
-                        .expect("Macros must have a name");
-
-                    let mac_object = CDeclKind::MacroFunction { name };
-                    self.add_decl(new_id, located(node, mac_object));
-                    self.processed_nodes.insert(new_id, MACRO_DECL);
-
-                    // Macros aren't technically top-level decls, so clang
-                    // doesn't put them in top_nodes, but we do need to process
-                    // them early.
-                    self.typed_context.c_decls_top.push(CDeclId(new_id));
-                }
-
                 ASTEntryTag::TagNonCanonicalDecl if expected_ty & DECL != 0 => {
                     let canonical_decl =
                         node.children[0].expect("NonCanonicalDecl must point to a canonical decl");

c2rust-transpile/src/c_ast/mod.rs

@@ -1620,6 +1620,7 @@ pub enum CDeclKind {
 
     MacroFunction {
         name: String,
+        params: Vec<String>,
         // replacements: Vec<CExprId>,
     },