Use rule function name in AddrOf context

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1381,6 +1381,25 @@ void Converter::EmitFnPtrCall(clang::Expr *callee) {
   StrCat(").unwrap()");
 }
 
+void Converter::EmitFnAsValue(const clang::FunctionDecl *fn_decl) {
+  StrCat(std::format("Some({} as _)", Mapper::GetFnRefName(fn_decl)));
+}
+
+std::string Converter::GetPointeeRustType(clang::QualType ptr_type) {
+  auto pointee = ptr_type->getPointeeType();
+  if (pointee->isIntegerType()) {
+    return ToString(pointee);
+  }
+  auto str = ToString(ptr_type);
+  while (!str.empty() && std::isspace(str.back())) {
+    str.pop_back();
+  }
+  if (str.starts_with("Ptr<") && str.ends_with(">")) {
+    return str.substr(4, str.size() - 5);
+  }
+  return ToString(pointee);
+}
+
 void Converter::ConvertGenericCallExpr(clang::CallExpr *expr) {
   clang::Expr *callee = expr->getCallee();
   auto convert_param_ty = [&](clang::QualType param_type, clang::Expr *expr) {
@@ -2000,7 +2019,8 @@ std::string Converter::ConvertDeclRefExpr(clang::DeclRefExpr *expr) {
   }
 
   auto *decl = expr->getDecl();
-  if (Mapper::Contains(expr)) {
+  if (!(clang::isa<clang::FunctionDecl>(decl) && isAddrOf()) &&
+      Mapper::Contains(expr)) {
     return GetMappedAsString(expr);
   } else if (auto *function = decl->getAsFunction()) {
     if (auto method = clang::dyn_cast<clang::CXXMethodDecl>(function)) {
@@ -2037,9 +2057,9 @@ bool Converter::VisitDeclRefExpr(clang::DeclRefExpr *expr) {
     return false;
   }
 
-  if (clang::isa<clang::FunctionDecl>(decl)) {
+  if (auto *fn_decl = clang::dyn_cast<clang::FunctionDecl>(decl)) {
     if (isAddrOf()) {
-      StrCat(std::format("Some({} as _)", str));
+      EmitFnAsValue(fn_decl);
       return false;
     }
   }

cpp2rust/converter/converter.h

@@ -201,6 +201,10 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual void EmitFnPtrCall(clang::Expr *callee);
 
+  virtual void EmitFnAsValue(const clang::FunctionDecl *fn_decl);
+
+  std::string GetPointeeRustType(clang::QualType ptr_type);
+
   virtual void ConvertPrintf(clang::CallExpr *expr);
 
   void ConvertVAArgCall(clang::CallExpr *expr);

cpp2rust/converter/models/converter_refcount.cpp

@@ -192,15 +192,15 @@ std::string ConverterRefCount::BuildFnAdapter(
   closure += "{ ";
 
   // Build adapter body: src_fn(convert(a0), convert(a1), ...)
-  closure += GetNamedDeclAsString(src_fn->getCanonicalDecl()) + "(";
+  closure += Mapper::GetFnRefName(src_fn) + "(";
   for (unsigned i = 0; i < src_proto->getNumParams(); ++i) {
     auto src_pty = src_proto->getParamType(i);
     auto tgt_pty = target_proto->getParamType(i);
     if (ToString(src_pty) == ToString(tgt_pty)) {
       closure += std::format("a{}", i);
     } else if (src_pty->isPointerType() && tgt_pty->isVoidPointerType()) {
       closure += std::format("a{}.cast::<{}>().unwrap()", i,
-                             ToString(src_pty->getPointeeType()));
+                             GetPointeeRustType(src_pty));
     } else if (src_pty->isVoidPointerType() && tgt_pty->isPointerType()) {
       closure += std::format("a{}.to_any()", i);
     } else {
@@ -622,19 +622,18 @@ bool ConverterRefCount::VisitDeclRefExpr(clang::DeclRefExpr *expr) {
     }
   }
 
-  if (Mapper::Contains(expr)) {
+  auto str = ConvertDeclRefExpr(expr);
+  auto decl = expr->getDecl();
+
+  if (!(clang::isa<clang::FunctionDecl>(decl) && isAddrOf()) &&
+      Mapper::Contains(expr)) {
     StrCat(GetMappedAsString(expr));
     return false;
   }
 
-  auto str = ConvertDeclRefExpr(expr);
-  auto decl = expr->getDecl();
-
-  if (clang::isa<clang::FunctionDecl>(decl)) {
+  if (auto *fn_decl = clang::dyn_cast<clang::FunctionDecl>(decl)) {
     if (isAddrOf()) {
-      auto proto = decl->getType()->getAs<clang::FunctionProtoType>();
-      auto fn_type = GetFnTypeString(proto);
-      StrCat(std::format("fn_ptr!({}, {})", str, fn_type));
+      EmitFnAsValue(fn_decl);
     } else {
       StrCat(str);
     }
@@ -1030,6 +1029,12 @@ void ConverterRefCount::EmitFnPtrCall(clang::Expr *callee) {
   StrCat(".call()");
 }
 
+void ConverterRefCount::EmitFnAsValue(const clang::FunctionDecl *fn_decl) {
+  StrCat(std::format(
+      "fn_ptr!({}, {})", Mapper::GetFnRefName(fn_decl),
+      GetFnTypeString(fn_decl->getType()->getAs<clang::FunctionProtoType>())));
+}
+
 std::string ConverterRefCount::GetFunctionPointerDefaultAsString(
     clang::QualType qual_type) {
   return "FnPtr::null()";

cpp2rust/converter/models/converter_refcount.h

@@ -61,6 +61,8 @@ class ConverterRefCount final : public Converter {
 
   void EmitFnPtrCall(clang::Expr *callee) override;
 
+  void EmitFnAsValue(const clang::FunctionDecl *fn_decl) override;
+
   bool VisitCallExpr(clang::CallExpr *expr) override;
 
   bool VisitStringLiteral(clang::StringLiteral *expr) override;