Replace is_variadic with is_extern

Author: lucic71

cpp2rust/converter/translation_rule.cpp

@@ -98,14 +98,17 @@ ExprRule ParseExprRuleJSON(const llvm::json::Object &obj) {
     }
   }
 
-  if (auto *rt = obj.getObject("return_type"))
+  if (auto *rt = obj.getObject("return_type")) {
     ir.return_type = ParseTypeInfoJSON(*rt);
+  }
 
-  if (auto ms = obj.getBoolean("multi_statement"))
+  if (auto ms = obj.getBoolean("multi_statement")) {
     ir.multi_statement = *ms;
+  }
 
-  if (auto v = obj.getBoolean("is_variadic"))
-    ir.is_variadic = *v;
+  if (auto v = obj.getBoolean("is_extern")) {
+    ir.is_extern = *v;
+  }
 
   if (auto *generics = obj.getObject("generics")) {
     for (auto &[key, val] : *generics) {

cpp2rust/converter/translation_rule.h

@@ -70,7 +70,7 @@ struct ExprRule {
   std::vector<std::vector<std::string>> generics; // "T1" -> ["Ord", "Clone"]
   std::vector<BodyFragment> body;
   bool multi_statement = false;
-  bool is_variadic = false;
+  bool is_extern = false;
 
   void dump() const;
   void validate(const std::string &name) const;

rule-preprocessor/src/ir.rs

@@ -58,7 +58,7 @@ pub struct FnIr {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub return_type: Option<TypeInfo>,
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub is_variadic: Option<bool>,
+    pub is_extern: Option<bool>,
 }
 
 impl FnIr {
@@ -107,7 +107,7 @@ impl FnIr {
             &format!("Rule {name} generics"),
         );
         assert!(
-            self.is_variadic == Some(true) || !self.body.is_empty(),
+            self.is_extern == Some(true) || !self.body.is_empty(),
             "Rule {name}: body must not be empty"
         );
     }

rule-preprocessor/src/syntactic.rs

@@ -416,12 +416,11 @@ impl<'a> FnIrBuilder<'a> {
             .unwrap_or(Access::Read)
     }
 
-    fn is_variadic(&self) -> bool {
+    fn is_extern(&self) -> bool {
         self.fn_item
-            .param_list()
-            .into_iter()
-            .flat_map(|pl| pl.params())
-            .any(|p| p.dotdotdot_token().is_some())
+            .syntax()
+            .ancestors()
+            .any(|a| a.kind() == SyntaxKind::EXTERN_BLOCK)
     }
 
     fn returns_mut_ref(&self) -> bool {
@@ -525,7 +524,7 @@ impl<'a> FnIrBuilder<'a> {
             },
             multi_statement,
             body,
-            is_variadic: self.is_variadic().then_some(true),
+            is_extern: self.is_extern().then_some(true),
         };
         ir.validate(&format!("{}:{}", path.display(), fn_name));
         ir