Refactor into a single GetComparisonCall

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -4492,18 +4492,34 @@ std::string Converter::GetComparisonCall(const clang::FunctionDecl *op,
                                          const clang::CXXRecordDecl *decl,
                                          std::string_view lhs,
                                          std::string_view rhs) {
-  auto record = GetRecordName(decl);
-  auto arg = std::format("{} as *const {}", rhs, record);
+  auto arg = [&](unsigned i, std::string_view value) {
+    if (op->getParamDecl(i)->getType()->isReferenceType()) {
+      return GetComparisonReferenceArg(decl, value);
+    }
+    return std::format("{}.clone()", value);
+  };
   if (const auto *method = clang::dyn_cast<clang::CXXMethodDecl>(op)) {
-    auto recv = !MethodNeedsMutableReceiver(method)
-                    ? std::string(lhs)
-                    : std::format("&mut *(&raw const *{}).cast_mut()", lhs);
     return std::format("{}::{}({}, {})", GetUFCSName(method),
-                       GetMethodName(method), recv, arg);
+                       GetMethodName(method),
+                       GetComparisonReceiver(method, decl, lhs), arg(0, rhs));
+  }
+  return std::format("{}({}, {})", GetNamedDeclAsString(op->getCanonicalDecl()),
+                     arg(0, lhs), arg(1, rhs));
+}
+
+std::string
+Converter::GetComparisonReferenceArg(const clang::CXXRecordDecl *decl,
+                                     std::string_view value) {
+  return std::format("{} as *const {}", value, GetRecordName(decl));
+}
+
+std::string Converter::GetComparisonReceiver(const clang::CXXMethodDecl *method,
+                                             const clang::CXXRecordDecl *,
+                                             std::string_view lhs) {
+  if (!MethodNeedsMutableReceiver(method)) {
+    return std::string(lhs);
   }
-  return std::format("{}({} as *const {}, {})",
-                     GetNamedDeclAsString(op->getCanonicalDecl()), lhs, record,
-                     arg);
+  return std::format("&mut *(&raw const *{}).cast_mut()", lhs);
 }
 
 void Converter::ConvertOrdAndPartialOrdTraits(const clang::CXXRecordDecl *decl,

cpp2rust/converter/converter.h

@@ -612,10 +612,17 @@ class Converter : public clang::RecursiveASTVisitor<Converter> {
                                          std::string_view eq_body,
                                          std::string_view record_name);
 
-  virtual std::string GetComparisonCall(const clang::FunctionDecl *op,
-                                        const clang::CXXRecordDecl *decl,
-                                        std::string_view lhs,
-                                        std::string_view rhs);
+  std::string GetComparisonCall(const clang::FunctionDecl *op,
+                                const clang::CXXRecordDecl *decl,
+                                std::string_view lhs, std::string_view rhs);
+
+  virtual std::string
+  GetComparisonReferenceArg(const clang::CXXRecordDecl *decl,
+                            std::string_view value);
+
+  virtual std::string GetComparisonReceiver(const clang::CXXMethodDecl *method,
+                                            const clang::CXXRecordDecl *decl,
+                                            std::string_view lhs);
 
   virtual void AddCloneTrait(const clang::RecordDecl *decl);
 

cpp2rust/converter/models/converter_refcount.cpp

@@ -443,18 +443,19 @@ bool ConverterRefCount::VisitOffsetOfExpr(clang::OffsetOfExpr *expr) {
   return false;
 }
 
-std::string ConverterRefCount::GetComparisonCall(
-    const clang::FunctionDecl *op, const clang::CXXRecordDecl *decl,
-    std::string_view lhs, std::string_view rhs) {
+std::string
+ConverterRefCount::GetComparisonReferenceArg(const clang::CXXRecordDecl *decl,
+                                             std::string_view value) {
+  PushConversionKind push(*this, ConversionKind::FullRefCount);
+  return BoxValue(GetShallowCopy(decl, value)) + ".as_pointer()";
+}
+
+std::string
+ConverterRefCount::GetComparisonReceiver(const clang::CXXMethodDecl *,
+                                         const clang::CXXRecordDecl *decl,
+                                         std::string_view lhs) {
   PushConversionKind push(*this, ConversionKind::FullRefCount);
-  auto lhs_ptr = BoxValue(GetShallowCopy(decl, lhs)) + ".as_pointer()";
-  auto rhs_ptr = BoxValue(GetShallowCopy(decl, rhs)) + ".as_pointer()";
-  if (const auto *method = clang::dyn_cast<clang::CXXMethodDecl>(op)) {
-    return std::format("{}::{}(&{}, {})", GetUFCSName(method),
-                       GetMethodName(method), lhs_ptr, rhs_ptr);
-  }
-  return std::format("{}({}, {})", GetNamedDeclAsString(op->getCanonicalDecl()),
-                     lhs_ptr, rhs_ptr);
+  return std::format("&{}.as_pointer()", BoxValue(GetShallowCopy(decl, lhs)));
 }
 
 std::string ConverterRefCount::GetShallowCopy(const clang::RecordDecl *decl,

cpp2rust/converter/models/converter_refcount.h

@@ -36,10 +36,12 @@ class ConverterRefCount final : public Converter {
 
   const char *CharRustType() const override { return "u8"; }
 
-  std::string GetComparisonCall(const clang::FunctionDecl *op,
-                                const clang::CXXRecordDecl *decl,
-                                std::string_view lhs,
-                                std::string_view rhs) override;
+  std::string GetComparisonReferenceArg(const clang::CXXRecordDecl *decl,
+                                        std::string_view value) override;
+
+  std::string GetComparisonReceiver(const clang::CXXMethodDecl *method,
+                                    const clang::CXXRecordDecl *decl,
+                                    std::string_view lhs) override;
 
   std::string GetShallowCopy(const clang::RecordDecl *decl,
                              std::string_view src);