Move cpp_init_type in TypeInfo

Author: lucic71

cpp2rust/converter/rules/registry.cpp

@@ -442,7 +442,7 @@ clang::QualType GetInitType(clang::ASTContext &ctx, const clang::Expr *expr) {
   auto match = findExpr(expr);
   assert(match.rule_decl && "expression must have a translation rule");
   const auto &rule = match.rule_decl->rule;
-  if (rule.init_cpp_type.empty()) {
+  if (rule.init.cpp_type.empty()) {
     llvm::StringRef type = rule.init.type;
     unsigned n = 0;
     [[maybe_unused]] bool bad =
@@ -481,7 +481,9 @@ std::string InitCppType(Model model, const std::string &dir,
   if (!rule) {
     return {};
   }
-  auto cpp_type = rule->getString("init_cpp_type");
+  auto params = rule->getObject("params");
+  auto init = params ? params->getObject("init") : nullptr;
+  auto cpp_type = init ? init->getString("cpp_type") : std::nullopt;
   return cpp_type ? cpp_type->str() : std::string();
 }
 

cpp2rust/converter/translation_rule.cpp

@@ -20,6 +20,8 @@ TypeInfo ParseTypeInfoJSON(const llvm::json::Object &obj) {
   TypeInfo info;
   if (auto ty = obj.getString("type"))
     info.type = ty->str();
+  if (auto cpp_type = obj.getString("cpp_type"))
+    info.cpp_type = cpp_type->str();
   if (auto v = obj.getBoolean("is_refcount_pointer"))
     info.is_refcount_pointer = *v;
   if (auto v = obj.getBoolean("is_unsafe_pointer"))
@@ -355,10 +357,6 @@ ExprRule ParseExprRuleJSON(const llvm::json::Object &obj) {
     ir.body = ParseBodyFragmentsJSON(*body);
   }
 
-  if (auto init_cpp_type = obj.getString("init_cpp_type")) {
-    ir.init_cpp_type = init_cpp_type->str();
-  }
-
   return ir;
 }
 

cpp2rust/converter/translation_rule.h

@@ -92,6 +92,7 @@ bool AnyFragment(const std::vector<BodyFragment> &body,
 struct TypeInfo {
   std::vector<std::string> derives;
   std::string type;
+  std::string cpp_type;
   bool is_refcount_pointer = false;
   bool is_unsafe_pointer = false;
 
@@ -103,7 +104,6 @@ struct TypeInfo {
 struct ExprRule {
   std::vector<TypeInfo> params;
   TypeInfo init;
-  std::string init_cpp_type;
   TypeInfo return_type;
   std::vector<std::vector<Bound>> generics; // "T1" -> [Ord, Clone]
   std::vector<BodyFragment> body;

rule-preprocessor/src/ir.rs

@@ -70,6 +70,8 @@ pub struct TypeInfo {
     pub is_unsafe_pointer: bool,
     #[serde(default, skip_serializing_if = "Vec::is_empty")]
     pub derives: Vec<String>,
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub cpp_type: Option<String>,
 }
 
 #[derive(Debug, Clone, Serialize, Deserialize)]
@@ -85,8 +87,6 @@ pub struct FnIr {
     pub return_type: Option<TypeInfo>,
     #[serde(skip_serializing_if = "Option::is_none")]
     pub is_extern: Option<bool>,
-    #[serde(skip_serializing_if = "Option::is_none")]
-    pub init_cpp_type: Option<String>,
 }
 
 impl FnIr {

rule-preprocessor/src/syntactic.rs

@@ -440,6 +440,7 @@ impl<'a> FnIrBuilder<'a> {
                 is_refcount_pointer,
                 is_unsafe_pointer,
                 derives: Vec::new(),
+                cpp_type: None,
             })
         }
     }
@@ -656,6 +657,7 @@ impl<'a> FnIrBuilder<'a> {
                         is_refcount_pointer: p.is_refcount_pointer,
                         is_unsafe_pointer: p.is_unsafe_pointer,
                         derives: Vec::new(),
+                        cpp_type: p.cpp_type.clone(),
                     },
                 )
             })
@@ -692,7 +694,6 @@ impl<'a> FnIrBuilder<'a> {
             multi_statement,
             body,
             is_extern: self.is_extern().then_some(true),
-            init_cpp_type: params.iter().find_map(|p| p.cpp_type.clone()),
         };
         ir.validate(&format!("{}:{}", path.display(), fn_name));
         ir
@@ -767,6 +768,7 @@ impl<'a> TypeIrBuilder<'a> {
                 is_refcount_pointer,
                 is_unsafe_pointer,
                 derives: Vec::new(),
+                cpp_type: None,
             },
         }
     }