From f7b8c62305030004ad9c3e7ad575d0e9f669f41b Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 4 Apr 2026 15:00:53 -0400 Subject: [PATCH] refactor: rename GCObject.shallow_copy -> shallow_move resolve conflict since relying on move constructor in std_copy_for --- include/xo/type/DArrayType.hpp | 2 +- include/xo/type/DAtomicType.hpp | 2 +- include/xo/type/DFunctionType.hpp | 2 +- include/xo/type/DListType.hpp | 2 +- include/xo/type/array/IGCObject_DArrayType.hpp | 4 ++-- include/xo/type/atomic/IGCObject_DAtomicType.hpp | 4 ++-- include/xo/type/function/IGCObject_DFunctionType.hpp | 4 ++-- include/xo/type/list/IGCObject_DListType.hpp | 4 ++-- include/xo/type/typevar/DTypeVarRef.hpp | 2 +- include/xo/type/typevar/IGCObject_DTypeVarRef.hpp | 4 ++-- src/type/DArrayType.cpp | 2 +- src/type/DAtomicType.cpp | 2 +- src/type/DFunctionType.cpp | 2 +- src/type/DListType.cpp | 2 +- src/type/DTypeVarRef.cpp | 2 +- src/type/IGCObject_DArrayType.cpp | 4 ++-- src/type/IGCObject_DAtomicType.cpp | 4 ++-- src/type/IGCObject_DFunctionType.cpp | 4 ++-- src/type/IGCObject_DListType.cpp | 4 ++-- src/type/IGCObject_DTypeVarRef.cpp | 4 ++-- 20 files changed, 30 insertions(+), 30 deletions(-) diff --git a/include/xo/type/DArrayType.hpp b/include/xo/type/DArrayType.hpp index 2d12f19..a259464 100644 --- a/include/xo/type/DArrayType.hpp +++ b/include/xo/type/DArrayType.hpp @@ -42,7 +42,7 @@ namespace xo { /** @defgroup xo-scm-arraytype-gcobject-facet **/ ///@{ std::size_t shallow_size() const noexcept; - DArrayType * shallow_copy(obj mm) noexcept; + DArrayType * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/type/DAtomicType.hpp b/include/xo/type/DAtomicType.hpp index 406ed46..7661955 100644 --- a/include/xo/type/DAtomicType.hpp +++ b/include/xo/type/DAtomicType.hpp @@ -43,7 +43,7 @@ namespace xo { /** @defgroup xo-scm-atomictype-gcobject-facet **/ ///@{ std::size_t shallow_size() const noexcept; - DAtomicType * shallow_copy(obj mm) noexcept; + DAtomicType * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/type/DFunctionType.hpp b/include/xo/type/DFunctionType.hpp index c3d409d..328c93b 100644 --- a/include/xo/type/DFunctionType.hpp +++ b/include/xo/type/DFunctionType.hpp @@ -64,7 +64,7 @@ namespace xo { /** @defgroup xo-scm-arraytype-gcobject-facet **/ ///@{ std::size_t shallow_size() const noexcept; - DFunctionType * shallow_copy(obj mm) noexcept; + DFunctionType * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/type/DListType.hpp b/include/xo/type/DListType.hpp index 8b5e057..2dfedb2 100644 --- a/include/xo/type/DListType.hpp +++ b/include/xo/type/DListType.hpp @@ -50,7 +50,7 @@ namespace xo { /** @defgroup xo-scm-listtype-gcobject-facet **/ ///@{ std::size_t shallow_size() const noexcept; - DListType * shallow_copy(obj mm) noexcept; + DListType * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/type/array/IGCObject_DArrayType.hpp b/include/xo/type/array/IGCObject_DArrayType.hpp index a436a08..8c1bfee 100644 --- a/include/xo/type/array/IGCObject_DArrayType.hpp +++ b/include/xo/type/array/IGCObject_DArrayType.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DArrayType & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DArrayType & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DArrayType & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DArrayType & self, obj gc) noexcept; ///@} diff --git a/include/xo/type/atomic/IGCObject_DAtomicType.hpp b/include/xo/type/atomic/IGCObject_DAtomicType.hpp index 4a5a570..00763e4 100644 --- a/include/xo/type/atomic/IGCObject_DAtomicType.hpp +++ b/include/xo/type/atomic/IGCObject_DAtomicType.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DAtomicType & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DAtomicType & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DAtomicType & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DAtomicType & self, obj gc) noexcept; ///@} diff --git a/include/xo/type/function/IGCObject_DFunctionType.hpp b/include/xo/type/function/IGCObject_DFunctionType.hpp index bc63285..9c8727c 100644 --- a/include/xo/type/function/IGCObject_DFunctionType.hpp +++ b/include/xo/type/function/IGCObject_DFunctionType.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DFunctionType & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DFunctionType & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DFunctionType & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DFunctionType & self, obj gc) noexcept; ///@} diff --git a/include/xo/type/list/IGCObject_DListType.hpp b/include/xo/type/list/IGCObject_DListType.hpp index cd017ec..2459fff 100644 --- a/include/xo/type/list/IGCObject_DListType.hpp +++ b/include/xo/type/list/IGCObject_DListType.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DListType & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DListType & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DListType & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DListType & self, obj gc) noexcept; ///@} diff --git a/include/xo/type/typevar/DTypeVarRef.hpp b/include/xo/type/typevar/DTypeVarRef.hpp index d53caa0..4ce9a66 100644 --- a/include/xo/type/typevar/DTypeVarRef.hpp +++ b/include/xo/type/typevar/DTypeVarRef.hpp @@ -54,7 +54,7 @@ namespace xo { /** @defgroup xo-scm-atomictype-gcobject-facet **/ ///@{ std::size_t shallow_size() const noexcept; - DTypeVarRef * shallow_copy(obj mm) noexcept; + DTypeVarRef * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp b/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp index 56780e3..d025087 100644 --- a/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp +++ b/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DTypeVarRef & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DTypeVarRef & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DTypeVarRef & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DTypeVarRef & self, obj gc) noexcept; ///@} diff --git a/src/type/DArrayType.cpp b/src/type/DArrayType.cpp index f13f234..b7c628a 100644 --- a/src/type/DArrayType.cpp +++ b/src/type/DArrayType.cpp @@ -83,7 +83,7 @@ namespace xo { } DArrayType * - DArrayType::shallow_copy(obj mm) noexcept + DArrayType::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/type/DAtomicType.cpp b/src/type/DAtomicType.cpp index 347e7f5..f25a159 100644 --- a/src/type/DAtomicType.cpp +++ b/src/type/DAtomicType.cpp @@ -61,7 +61,7 @@ namespace xo { } DAtomicType * - DAtomicType::shallow_copy(obj mm) noexcept + DAtomicType::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/type/DFunctionType.cpp b/src/type/DFunctionType.cpp index 4cc83db..f9ac920 100644 --- a/src/type/DFunctionType.cpp +++ b/src/type/DFunctionType.cpp @@ -94,7 +94,7 @@ namespace xo { } DFunctionType * - DFunctionType::shallow_copy(obj mm) noexcept + DFunctionType::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/type/DListType.cpp b/src/type/DListType.cpp index b4e2cd4..2906053 100644 --- a/src/type/DListType.cpp +++ b/src/type/DListType.cpp @@ -88,7 +88,7 @@ namespace xo { } DListType * - DListType::shallow_copy(obj mm) noexcept + DListType::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/type/DTypeVarRef.cpp b/src/type/DTypeVarRef.cpp index ec021ab..d618a2f 100644 --- a/src/type/DTypeVarRef.cpp +++ b/src/type/DTypeVarRef.cpp @@ -82,7 +82,7 @@ namespace xo { } DTypeVarRef * - DTypeVarRef::shallow_copy(obj mm) noexcept + DTypeVarRef::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/type/IGCObject_DArrayType.cpp b/src/type/IGCObject_DArrayType.cpp index 43287c8..c937580 100644 --- a/src/type/IGCObject_DArrayType.cpp +++ b/src/type/IGCObject_DArrayType.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DArrayType::shallow_copy(DArrayType & self, obj mm) noexcept -> Opaque + IGCObject_DArrayType::shallow_move(DArrayType & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DArrayType::forward_children(DArrayType & self, obj gc) noexcept -> size_type diff --git a/src/type/IGCObject_DAtomicType.cpp b/src/type/IGCObject_DAtomicType.cpp index a569167..3916d76 100644 --- a/src/type/IGCObject_DAtomicType.cpp +++ b/src/type/IGCObject_DAtomicType.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DAtomicType::shallow_copy(DAtomicType & self, obj mm) noexcept -> Opaque + IGCObject_DAtomicType::shallow_move(DAtomicType & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DAtomicType::forward_children(DAtomicType & self, obj gc) noexcept -> size_type diff --git a/src/type/IGCObject_DFunctionType.cpp b/src/type/IGCObject_DFunctionType.cpp index 9ba3ff3..4c7c7c1 100644 --- a/src/type/IGCObject_DFunctionType.cpp +++ b/src/type/IGCObject_DFunctionType.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DFunctionType::shallow_copy(DFunctionType & self, obj mm) noexcept -> Opaque + IGCObject_DFunctionType::shallow_move(DFunctionType & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DFunctionType::forward_children(DFunctionType & self, obj gc) noexcept -> size_type diff --git a/src/type/IGCObject_DListType.cpp b/src/type/IGCObject_DListType.cpp index da899cd..ff3820d 100644 --- a/src/type/IGCObject_DListType.cpp +++ b/src/type/IGCObject_DListType.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DListType::shallow_copy(DListType & self, obj mm) noexcept -> Opaque + IGCObject_DListType::shallow_move(DListType & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DListType::forward_children(DListType & self, obj gc) noexcept -> size_type diff --git a/src/type/IGCObject_DTypeVarRef.cpp b/src/type/IGCObject_DTypeVarRef.cpp index ade7994..9dc58dc 100644 --- a/src/type/IGCObject_DTypeVarRef.cpp +++ b/src/type/IGCObject_DTypeVarRef.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DTypeVarRef::shallow_copy(DTypeVarRef & self, obj mm) noexcept -> Opaque + IGCObject_DTypeVarRef::shallow_move(DTypeVarRef & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DTypeVarRef::forward_children(DTypeVarRef & self, obj gc) noexcept -> size_type