diff --git a/include/xo/object2/DArray.hpp b/include/xo/object2/DArray.hpp index 332d126..99d1b3d 100644 --- a/include/xo/object2/DArray.hpp +++ b/include/xo/object2/DArray.hpp @@ -148,7 +148,7 @@ namespace xo { /** shallow memory consumption. Excludes child objects **/ AAllocator::size_type shallow_size() const noexcept; /** return shallow copy of this array, using memory from @p mm **/ - DArray * shallow_copy(obj mm) const noexcept; + DArray * shallow_move(obj mm) const noexcept; /** forward elements to @p gc to-space; replace originals with forarding pointers **/ AAllocator::size_type forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/object2/DBoolean.hpp b/include/xo/object2/DBoolean.hpp index 72f5fad..34ffda1 100644 --- a/include/xo/object2/DBoolean.hpp +++ b/include/xo/object2/DBoolean.hpp @@ -38,7 +38,7 @@ namespace xo { // GCObject facet std::size_t shallow_size() const noexcept; - DBoolean * shallow_copy(obj mm) const noexcept; + DBoolean * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; private: diff --git a/include/xo/object2/DDictionary.hpp b/include/xo/object2/DDictionary.hpp index 1c77d2c..5e6ecae 100644 --- a/include/xo/object2/DDictionary.hpp +++ b/include/xo/object2/DDictionary.hpp @@ -203,7 +203,7 @@ namespace xo { /** shallow memory consumption. Excludes child objects **/ AAllocator::size_type shallow_size() const noexcept; /** return shallow copy of this array, using memory from @p mm **/ - DDictionary * shallow_copy(obj mm) noexcept; + DDictionary * shallow_move(obj mm) noexcept; /** forward elements to @p gc to-space; replace originals with forarding pointers **/ AAllocator::size_type forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/object2/DFloat.hpp b/include/xo/object2/DFloat.hpp index 4e4be86..b7d56e9 100644 --- a/include/xo/object2/DFloat.hpp +++ b/include/xo/object2/DFloat.hpp @@ -35,7 +35,7 @@ namespace xo { // GCObject facet std::size_t shallow_size() const noexcept; - DFloat * shallow_copy(obj mm) const noexcept; + DFloat * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; private: diff --git a/include/xo/object2/DInteger.hpp b/include/xo/object2/DInteger.hpp index a67e18d..6a6194b 100644 --- a/include/xo/object2/DInteger.hpp +++ b/include/xo/object2/DInteger.hpp @@ -40,7 +40,7 @@ namespace xo { // GCObject facet std::size_t shallow_size() const noexcept; - DInteger * shallow_copy(obj mm) const noexcept; + DInteger * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; private: diff --git a/include/xo/object2/DList.hpp b/include/xo/object2/DList.hpp index f6ea9d8..8fff47d 100644 --- a/include/xo/object2/DList.hpp +++ b/include/xo/object2/DList.hpp @@ -70,7 +70,7 @@ namespace xo { /** @defgroup xo-scm-list-gcobject-facet gcobject facet **/ ///@{ size_type shallow_size() const noexcept; - DList * shallow_copy(obj mm) noexcept; + DList * shallow_move(obj mm) noexcept; size_type forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/object2/DRuntimeError.hpp b/include/xo/object2/DRuntimeError.hpp index 8a0ae33..957c848 100644 --- a/include/xo/object2/DRuntimeError.hpp +++ b/include/xo/object2/DRuntimeError.hpp @@ -50,7 +50,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DRuntimeError * shallow_copy(obj mm) const noexcept; + DRuntimeError * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/include/xo/object2/array/IGCObject_DArray.hpp b/include/xo/object2/array/IGCObject_DArray.hpp index 4854eff..ab8a85f 100644 --- a/include/xo/object2/array/IGCObject_DArray.hpp +++ b/include/xo/object2/array/IGCObject_DArray.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DArray & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DArray & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DArray & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DArray & self, obj gc) noexcept; ///@} diff --git a/include/xo/object2/boolean/IGCObject_DBoolean.hpp b/include/xo/object2/boolean/IGCObject_DBoolean.hpp index c437f0b..5bc6e0c 100644 --- a/include/xo/object2/boolean/IGCObject_DBoolean.hpp +++ b/include/xo/object2/boolean/IGCObject_DBoolean.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DBoolean & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DBoolean & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DBoolean & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DBoolean & self, obj gc) noexcept; ///@} diff --git a/include/xo/object2/dictionary/IGCObject_DDictionary.hpp b/include/xo/object2/dictionary/IGCObject_DDictionary.hpp index 323afd6..16fef8c 100644 --- a/include/xo/object2/dictionary/IGCObject_DDictionary.hpp +++ b/include/xo/object2/dictionary/IGCObject_DDictionary.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DDictionary & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DDictionary & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DDictionary & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DDictionary & self, obj gc) noexcept; ///@} diff --git a/include/xo/object2/error/IGCObject_DRuntimeError.hpp b/include/xo/object2/error/IGCObject_DRuntimeError.hpp index f09be05..62cc610 100644 --- a/include/xo/object2/error/IGCObject_DRuntimeError.hpp +++ b/include/xo/object2/error/IGCObject_DRuntimeError.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DRuntimeError & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DRuntimeError & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DRuntimeError & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DRuntimeError & self, obj gc) noexcept; ///@} diff --git a/include/xo/object2/list/IGCObject_DList.hpp b/include/xo/object2/list/IGCObject_DList.hpp index e601ce0..780ebda 100644 --- a/include/xo/object2/list/IGCObject_DList.hpp +++ b/include/xo/object2/list/IGCObject_DList.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DList & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DList & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DList & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DList & self, obj gc) noexcept; ///@} diff --git a/include/xo/object2/number/IGCObject_DFloat.hpp b/include/xo/object2/number/IGCObject_DFloat.hpp index f9040b1..b25e462 100644 --- a/include/xo/object2/number/IGCObject_DFloat.hpp +++ b/include/xo/object2/number/IGCObject_DFloat.hpp @@ -53,8 +53,8 @@ namespace xo { static size_type shallow_size(const DFloat & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DFloat & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DFloat & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DFloat & self, obj gc) noexcept; ///@} diff --git a/include/xo/object2/number/IGCObject_DInteger.hpp b/include/xo/object2/number/IGCObject_DInteger.hpp index b653212..a87f253 100644 --- a/include/xo/object2/number/IGCObject_DInteger.hpp +++ b/include/xo/object2/number/IGCObject_DInteger.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DInteger & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DInteger & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DInteger & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DInteger & self, obj gc) noexcept; ///@} diff --git a/src/object2/DArray.cpp b/src/object2/DArray.cpp index a55fbf9..2ae4ddc 100644 --- a/src/object2/DArray.cpp +++ b/src/object2/DArray.cpp @@ -181,7 +181,7 @@ namespace xo { } DArray * - DArray::shallow_copy(obj mm) const noexcept + DArray::shallow_move(obj mm) const noexcept { DArray * copy = (DArray *)mm.alloc_copy((std::byte *)this); diff --git a/src/object2/DBoolean.cpp b/src/object2/DBoolean.cpp index ff5fa38..cb25f9e 100644 --- a/src/object2/DBoolean.cpp +++ b/src/object2/DBoolean.cpp @@ -36,7 +36,7 @@ namespace xo { } DBoolean * - DBoolean::shallow_copy(obj mm) const noexcept + DBoolean::shallow_move(obj mm) const noexcept { DBoolean * copy = (DBoolean *)mm.alloc_copy((std::byte *)this); diff --git a/src/object2/DDictionary.cpp b/src/object2/DDictionary.cpp index 263ea97..739fced 100644 --- a/src/object2/DDictionary.cpp +++ b/src/object2/DDictionary.cpp @@ -274,7 +274,7 @@ namespace xo { } DDictionary * - DDictionary::shallow_copy(obj mm) noexcept + DDictionary::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/object2/DFloat.cpp b/src/object2/DFloat.cpp index 7fc0bfb..f7f8ff3 100644 --- a/src/object2/DFloat.cpp +++ b/src/object2/DFloat.cpp @@ -34,7 +34,7 @@ namespace xo { } DFloat * - DFloat::shallow_copy(obj mm) const noexcept + DFloat::shallow_move(obj mm) const noexcept { DFloat * copy = (DFloat *)mm.alloc_copy((std::byte *)this); diff --git a/src/object2/DInteger.cpp b/src/object2/DInteger.cpp index 284806d..7cbcedf 100644 --- a/src/object2/DInteger.cpp +++ b/src/object2/DInteger.cpp @@ -34,7 +34,7 @@ namespace xo { } DInteger * - DInteger::shallow_copy(obj mm) const noexcept + DInteger::shallow_move(obj mm) const noexcept { DInteger * copy = (DInteger *)mm.alloc_copy((std::byte *)this); diff --git a/src/object2/DList.cpp b/src/object2/DList.cpp index 6f93147..be86907 100644 --- a/src/object2/DList.cpp +++ b/src/object2/DList.cpp @@ -185,7 +185,7 @@ namespace xo { } DList * - DList::shallow_copy(obj mm) noexcept + DList::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/src/object2/DRuntimeError.cpp b/src/object2/DRuntimeError.cpp index b683716..1f34596 100644 --- a/src/object2/DRuntimeError.cpp +++ b/src/object2/DRuntimeError.cpp @@ -59,7 +59,7 @@ namespace xo { } DRuntimeError * - DRuntimeError::shallow_copy(obj mm) const noexcept + DRuntimeError::shallow_move(obj mm) const noexcept { DRuntimeError * copy = (DRuntimeError *)mm.alloc_copy((std::byte *)this); diff --git a/src/object2/IGCObject_DArray.cpp b/src/object2/IGCObject_DArray.cpp index 9b28a3d..7cde63e 100644 --- a/src/object2/IGCObject_DArray.cpp +++ b/src/object2/IGCObject_DArray.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DArray::shallow_copy(DArray & self, obj mm) noexcept -> Opaque + IGCObject_DArray::shallow_move(DArray & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DArray::forward_children(DArray & self, obj gc) noexcept -> size_type diff --git a/src/object2/IGCObject_DBoolean.cpp b/src/object2/IGCObject_DBoolean.cpp index e6bd600..ef503af 100644 --- a/src/object2/IGCObject_DBoolean.cpp +++ b/src/object2/IGCObject_DBoolean.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DBoolean::shallow_copy(DBoolean & self, obj mm) noexcept -> Opaque + IGCObject_DBoolean::shallow_move(DBoolean & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DBoolean::forward_children(DBoolean & self, obj gc) noexcept -> size_type diff --git a/src/object2/IGCObject_DDictionary.cpp b/src/object2/IGCObject_DDictionary.cpp index 0466edd..9d4bae6 100644 --- a/src/object2/IGCObject_DDictionary.cpp +++ b/src/object2/IGCObject_DDictionary.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DDictionary::shallow_copy(DDictionary & self, obj mm) noexcept -> Opaque + IGCObject_DDictionary::shallow_move(DDictionary & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DDictionary::forward_children(DDictionary & self, obj gc) noexcept -> size_type diff --git a/src/object2/IGCObject_DFloat.cpp b/src/object2/IGCObject_DFloat.cpp index 4b1ab56..a22a1b2 100644 --- a/src/object2/IGCObject_DFloat.cpp +++ b/src/object2/IGCObject_DFloat.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DFloat::shallow_copy(DFloat & self, obj mm) noexcept -> Opaque + IGCObject_DFloat::shallow_move(DFloat & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DFloat::forward_children(DFloat & self, obj gc) noexcept -> size_type diff --git a/src/object2/IGCObject_DInteger.cpp b/src/object2/IGCObject_DInteger.cpp index fbb3190..4f74e5f 100644 --- a/src/object2/IGCObject_DInteger.cpp +++ b/src/object2/IGCObject_DInteger.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DInteger::shallow_copy(DInteger & self, obj mm) noexcept -> Opaque + IGCObject_DInteger::shallow_move(DInteger & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DInteger::forward_children(DInteger & self, obj gc) noexcept -> size_type diff --git a/src/object2/IGCObject_DList.cpp b/src/object2/IGCObject_DList.cpp index 80cd7cd..2512cc3 100644 --- a/src/object2/IGCObject_DList.cpp +++ b/src/object2/IGCObject_DList.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DList::shallow_copy(DList & self, obj mm) noexcept -> Opaque + IGCObject_DList::shallow_move(DList & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DList::forward_children(DList & self, obj gc) noexcept -> size_type diff --git a/src/object2/IGCObject_DRuntimeError.cpp b/src/object2/IGCObject_DRuntimeError.cpp index 6d16781..cc75582 100644 --- a/src/object2/IGCObject_DRuntimeError.cpp +++ b/src/object2/IGCObject_DRuntimeError.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DRuntimeError::shallow_copy(DRuntimeError & self, obj mm) noexcept -> Opaque + IGCObject_DRuntimeError::shallow_move(DRuntimeError & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DRuntimeError::forward_children(DRuntimeError & self, obj gc) noexcept -> size_type