Add ConvertPointeeType

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -1391,21 +1391,6 @@ void Converter::EmitFnPtrCall(clang::Expr *callee) {
   StrCat(").unwrap()");
 }
 
-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::ConvertFunctionToFunctionPointer(
     const clang::FunctionDecl *fn_decl) {
   StrCat(std::format("Some({})", Mapper::MapFunctionName(fn_decl)));

cpp2rust/converter/converter.h

@@ -207,8 +207,6 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
 
   virtual void EmitFnPtrCall(clang::Expr *callee);
 
-  std::string GetPointeeRustType(clang::QualType ptr_type);
-
   virtual void
   ConvertFunctionToFunctionPointer(const clang::FunctionDecl *fn_decl);
 

cpp2rust/converter/converter_lib.cpp

@@ -8,7 +8,9 @@
 #include <clang/AST/ParentMapContext.h>
 #include <clang/Basic/SourceManager.h>
 
+#include <algorithm>
 #include <array>
+#include <cctype>
 #include <filesystem>
 #include <unordered_set>
 
@@ -660,4 +662,18 @@ clang::Expr *CreateConversionToBool(clang::Expr *expr, clang::ASTContext &ctx) {
       /*BasePath=*/nullptr, clang::VK_PRValue, clang::FPOptionsOverride());
 }
 
+static void Trim(std::string &s) {
+  auto is_space = [](unsigned char c) { return std::isspace(c); };
+  s.erase(s.begin(), std::find_if_not(s.begin(), s.end(), is_space));
+  s.erase(std::find_if_not(s.rbegin(), s.rend(), is_space).base(), s.end());
+}
+
+void Unwrap(std::string &s, std::string_view prefix, std::string_view suffix) {
+  Trim(s);
+  if (s.size() >= prefix.size() + suffix.size() && s.starts_with(prefix) &&
+      s.ends_with(suffix)) {
+    s = s.substr(prefix.size(), s.size() - prefix.size() - suffix.size());
+  }
+}
+
 } // namespace cpp2rust

cpp2rust/converter/converter_lib.h

@@ -12,6 +12,7 @@
 #include <optional>
 #include <regex>
 #include <string>
+#include <string_view>
 #include <vector>
 
 namespace cpp2rust {
@@ -154,4 +155,6 @@ bool ContainsVAArgExpr(const clang::Stmt *stmt);
 
 clang::Expr *CreateConversionToBool(clang::Expr *expr, clang::ASTContext &ctx);
 
+void Unwrap(std::string &s, std::string_view prefix, std::string_view suffix);
+
 } // namespace cpp2rust

cpp2rust/converter/models/converter_refcount.cpp

@@ -205,12 +205,12 @@ std::string ConverterRefCount::BuildFnAdapter(
     } else if (src_pty->isPointerType() && tgt_pty->isPointerType()) {
       if (tgt_pty->isVoidPointerType()) {
         closure += std::format("a{}.cast::<{}>().unwrap()", i,
-                               GetPointeeRustType(src_pty));
+                               ConvertPointeeType(src_pty));
       } else if (src_pty->isVoidPointerType()) {
         closure += std::format("a{}.to_any()", i);
       } else if (tgt_pty->getPointeeType()->isCharType()) {
         closure += std::format("a{}.reinterpret_cast::<{}>()", i,
-                               GetPointeeRustType(src_pty));
+                               ConvertPointeeType(src_pty));
       } else if (src_pty->getPointeeType()->isCharType()) {
         closure += std::format("a{}.reinterpret_cast::<u8>()", i);
       }
@@ -2158,4 +2158,14 @@ std::string ConverterRefCount::ConvertMappedMethodCall(
   return std::format("{}.with_mut(|__v: {}| __v{})", ptr, param_type, body);
 }
 
+std::string ConverterRefCount::ConvertPointeeType(clang::QualType ptr_type) {
+  // Pointee of a pointer to incomplete type is an incomplete type that does
+  // not have a translation rule. Hence ToString(ptr_type->getPointeeType()) is
+  // not enough
+  assert(ptr_type->isPointerType());
+  auto str = ToString(ptr_type);
+  Unwrap(str, "Ptr<", ">");
+  return str;
+}
+
 } // namespace cpp2rust

cpp2rust/converter/models/converter_refcount.h

@@ -205,6 +205,7 @@ class ConverterRefCount final : public Converter {
   std::string ConvertFreshPointer(clang::Expr *expr) override;
 
   std::string ConvertPtrType(clang::QualType type);
+  std::string ConvertPointeeType(clang::QualType ptr_type);
 
   /// The kind of conversion that should be performed.
   enum class ConversionKind : uint8_t {