wip fixing figouring out move ctors

Author: anderslanglands

CMakeLists.txt

@@ -4,7 +4,7 @@ project(cppmm)
 include(GNUInstallDirs)
 
 set(CPPMM_MAJOR_VERSION 0)
-set(CPPMM_MINOR_VERSION 9)
+set(CPPMM_MINOR_VERSION 10)
 set(CPPMM_PATCH_VERSION 0)
 set(CPPMM_VERSION "${CPPMM_MAJOR_VERSION}.${CPPMM_MINOR_VERSION}.${CPPMM_PATCH_VERSION}")
 
@@ -59,3 +59,4 @@ add_subdirectory(test/property)
 add_subdirectory(test/opaquebytes)
 add_subdirectory(test/deriveattr)
 add_subdirectory(test/mimpl)
+add_subdirectory(test/copymoveaccess)

astgen/src/process_binding.cpp

@@ -1024,6 +1024,24 @@ bool is_public_copy_ctor(const Decl* cmd) {
     }
 }
 
+bool is_inaccessible_copy_ctor(const Decl* cmd) {
+    if (const CXXConstructorDecl* cd = dyn_cast<CXXConstructorDecl>(cmd)) {
+        return cd->isCopyConstructor() && (cd->getAccess() != AS_public ||
+               cd->isDeleted());
+    } else {
+        return false;
+    }
+}
+
+bool is_inaccessible_move_ctor(const Decl* cmd) {
+    if (const CXXConstructorDecl* cd = dyn_cast<CXXConstructorDecl>(cmd)) {
+        return cd->isMoveConstructor() && (cd->getAccess() != AS_public ||
+               cd->isDeleted());
+    } else {
+        return false;
+    }
+}
+
 bool is_public_move_ctor(const Decl* cmd) {
     if (const CXXConstructorDecl* cd = dyn_cast<CXXConstructorDecl>(cmd)) {
         SPDLOG_DEBUG("ctor {}", cd->getQualifiedNameAsString());
@@ -1041,9 +1059,13 @@ void has_public_copy_move_ctor(const CXXRecordDecl* crd,
                                bool& has_public_copy_ctor,
                                bool& has_public_move_ctor) {
     for (const Decl* d : crd->decls()) {
-        has_public_copy_ctor |= is_public_copy_ctor(d);
-        has_public_move_ctor |= is_public_move_ctor(d);
+        // has_public_copy_ctor |= is_public_copy_ctor(d);
+        // has_public_move_ctor |= is_public_move_ctor(d);
+        has_public_copy_ctor |= is_inaccessible_copy_ctor(d);
+        has_public_move_ctor |= is_inaccessible_move_ctor(d);
     }
+    has_public_copy_ctor = !has_public_copy_ctor;
+    has_public_move_ctor = !has_public_move_ctor;
 }
 
 std::vector<std::string> get_properties(const std::vector<std::string>& attrs) {

asttoc/src/cppmm_ast_add_c.cpp

@@ -1866,8 +1866,8 @@ void to_c_copy__trivial(TranslationUnit& c_tu,
         Param("rhs", rhs, 1)};
     auto c_function = NodeFunction::n(
         function_name, PLACEHOLDER_ID, attrs, "",
-        NodeBuiltinType::n("void", 0, "void", false), std::move(params), "", "", "",
-        std::vector<NodeTypePtr>{}, std::vector<Exception>{}, false);
+        NodeBuiltinType::n("void", 0, "void", false), std::move(params), "", "",
+        "", std::vector<NodeTypePtr>{}, std::vector<Exception>{}, false);
 
     c_function->body = c_function_body;
     c_function->private_ = true;
@@ -2167,7 +2167,10 @@ void to_c_copy__constructor(TranslationUnit& c_tu, const NodeRecord& cpp_record,
 //------------------------------------------------------------------------------
 void to_c_move(TranslationUnit& c_tu, const NodeRecord& cpp_record,
                const NodeRecord& c_record) {
-    auto rhs = NodeRecordType::n("", 0, cpp_record.name, cpp_record.id, false);
+    auto rhs_inner =
+        NodeRecordType::n("", 0, cpp_record.name, cpp_record.id, false);
+    auto rhs =
+        NodePointerType::n(PointerKind::Pointer, std::move(rhs_inner), false);
 
     auto c_return =
         NodeRecordType::n("", 0, c_record.nice_name, c_record.id, false);
@@ -2176,12 +2179,13 @@ void to_c_move(TranslationUnit& c_tu, const NodeRecord& cpp_record,
         NodeBlockExpr::n(std::vector<NodeExprPtr>{NodePlacementNewExpr::n(
             NodeVarRefExpr::n("lhs"),
 
-            NodeFunctionCallExpr::n(cpp_record.name,
-                                    std::vector<NodeExprPtr>{NodeMoveExpr::n(
-                                        NodeVarRefExpr::n("rhs"))},
-                                    std::vector<NodeTypePtr>{}
+            NodeFunctionCallExpr::n(
+                cpp_record.name,
+                std::vector<NodeExprPtr>{
+                    NodeMoveExpr::n(NodeDerefExpr::n(NodeVarRefExpr::n("rhs")))},
+                std::vector<NodeTypePtr>{}
 
-                                    ))});
+                ))});
 
     auto lhs =
         NodePointerType::n(PointerKind::Pointer, std::move(c_return), false);

include/cppmm_config.hpp

@@ -1,13 +1,13 @@
 #pragma once
 
 #define CPPMM_MAJOR_VERSION 0
-#define CPPMM_MINOR_VERSION 9
+#define CPPMM_MINOR_VERSION 10
 #define CPPMM_PATCH_VERSION 0
 
 namespace cppmm {
 
 inline const char* version() {
-    return "0.9.0";
+    return "0.10.0";
 }
 
 }

package.py

@@ -1,5 +1,5 @@
 name = 'cppmm'
-version = '0.9.0'
+version = '0.10.0'
 
 def commands():
     env.PATH.append('{root}/bin')

test/copymoveaccess/CMakeLists.txt

@@ -0,0 +1,17 @@
+set(testname copymoveaccess)
+
+add_test(NAME ${testname} 
+    COMMAND 
+        python 
+            ${CMAKE_SOURCE_DIR}/test/runtest.py 
+            $<TARGET_FILE:astgen> 
+            $<TARGET_FILE:asttoc> 
+            ${CMAKE_CURRENT_SOURCE_DIR}/bind 
+            ${CMAKE_BINARY_DIR}/test/${testname}/output
+            ${testname}
+            ${CMAKE_CURRENT_SOURCE_DIR}/ref
+            -I${CMAKE_CURRENT_SOURCE_DIR}/include
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+)
+
+

test/copymoveaccess/bind/cma.cpp

@@ -0,0 +1,15 @@
+#include <cma.hpp>
+#include <cppmm_bind.hpp>
+
+namespace cppmm_bind {
+
+namespace foo {
+
+class PublicDerived { using BoundType = ::foo::PublicDerived; };
+class PrivateDerived { using BoundType = ::foo::PrivateDerived; };
+class DeletedDerived { using BoundType = ::foo::DeletedDerived; };
+
+}
+
+}
+

test/copymoveaccess/include/cma.hpp

@@ -0,0 +1,34 @@
+#pragma once
+
+namespace foo {
+
+class PublicBase {
+public:
+    PublicBase(){}
+    PublicBase(const PublicBase&){};
+    PublicBase(PublicBase&&){};
+};
+
+class PrivateBase {
+public:
+    PrivateBase(){}
+
+private:
+    PrivateBase(const PrivateBase&){};
+    PrivateBase(PrivateBase&&){};
+};
+
+class DeletedBase {
+public:
+    DeletedBase(){}
+
+private:
+    DeletedBase(const DeletedBase&)=delete;
+    DeletedBase(DeletedBase&&)=delete;
+};
+
+class PublicDerived: public PublicBase {};
+class PrivateDerived: public PrivateBase {};
+class DeletedDerived: public DeletedBase {};
+
+}