From 06161d2b50bf97af9c8e3183bd20fcb706cc3bf4 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 --- xo-alloc2/idl/GCObject.json5 | 6 +++--- xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp | 4 ++-- xo-alloc2/include/xo/alloc2/gc/IGCObject_Any.hpp | 2 +- xo-alloc2/include/xo/alloc2/gc/IGCObject_Xfer.hpp | 4 ++-- xo-alloc2/include/xo/alloc2/gc/RCollector.hpp | 4 ++-- xo-alloc2/include/xo/alloc2/gc/RGCObject.hpp | 4 ++-- xo-alloc2/src/alloc2/IGCObject_Any.cpp | 2 +- xo-expression2/include/xo/expression2/DApplyExpr.hpp | 2 +- xo-expression2/include/xo/expression2/DConstant.hpp | 2 +- xo-expression2/include/xo/expression2/DDefineExpr.hpp | 2 +- xo-expression2/include/xo/expression2/DGlobalSymtab.hpp | 2 +- xo-expression2/include/xo/expression2/DIfElseExpr.hpp | 2 +- xo-expression2/include/xo/expression2/DLambdaExpr.hpp | 2 +- xo-expression2/include/xo/expression2/DLocalSymtab.hpp | 2 +- xo-expression2/include/xo/expression2/DSequenceExpr.hpp | 2 +- xo-expression2/include/xo/expression2/DTypename.hpp | 2 +- xo-expression2/include/xo/expression2/DVarRef.hpp | 2 +- xo-expression2/include/xo/expression2/DVariable.hpp | 2 +- .../include/xo/expression2/define/IGCObject_DDefineExpr.hpp | 4 ++-- .../include/xo/expression2/detail/IGCObject_DApplyExpr.hpp | 4 ++-- .../include/xo/expression2/detail/IGCObject_DConstant.hpp | 4 ++-- .../include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp | 4 ++-- .../include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp | 4 ++-- .../xo/expression2/detail/IGCObject_DSequenceExpr.hpp | 4 ++-- .../include/xo/expression2/detail/IGCObject_DVarRef.hpp | 4 ++-- .../xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp | 4 ++-- .../xo/expression2/symtab/IGCObject_DLocalSymtab.hpp | 4 ++-- .../include/xo/expression2/typename/IGCObject_DTypename.hpp | 4 ++-- .../include/xo/expression2/variable/IGCObject_DVariable.hpp | 4 ++-- xo-expression2/src/expression2/DApplyExpr.cpp | 2 +- xo-expression2/src/expression2/DConstant.cpp | 2 +- xo-expression2/src/expression2/DDefineExpr.cpp | 2 +- xo-expression2/src/expression2/DGlobalSymtab.cpp | 2 +- xo-expression2/src/expression2/DIfElseExpr.cpp | 2 +- xo-expression2/src/expression2/DLambdaExpr.cpp | 2 +- xo-expression2/src/expression2/DLocalSymtab.cpp | 2 +- xo-expression2/src/expression2/DSequenceExpr.cpp | 2 +- xo-expression2/src/expression2/DTypename.cpp | 2 +- xo-expression2/src/expression2/DVarRef.cpp | 2 +- xo-expression2/src/expression2/DVariable.cpp | 2 +- xo-expression2/src/expression2/IGCObject_DApplyExpr.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DConstant.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DDefineExpr.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DGlobalSymtab.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DIfElseExpr.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DSequenceExpr.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DTypename.cpp | 4 ++-- xo-expression2/src/expression2/IGCObject_DVarRef.cpp | 4 ++-- .../src/expression2/facet/IGCObject_DVariable.cpp | 4 ++-- xo-gc/src/gc/GCObjectStore.cpp | 2 +- xo-interpreter2/include/xo/interpreter2/DClosure.hpp | 2 +- xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp | 2 +- .../include/xo/interpreter2/DVsmApplyClosureFrame.hpp | 2 +- xo-interpreter2/include/xo/interpreter2/DVsmApplyFrame.hpp | 2 +- .../include/xo/interpreter2/DVsmDefContFrame.hpp | 2 +- .../include/xo/interpreter2/DVsmEvalArgsFrame.hpp | 2 +- .../include/xo/interpreter2/DVsmIfElseContFrame.hpp | 2 +- .../include/xo/interpreter2/DVsmSeqContFrame.hpp | 2 +- .../xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp | 4 ++-- .../include/xo/interpreter2/detail/IGCObject_DClosure.hpp | 4 ++-- .../interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp | 4 ++-- .../xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp | 4 ++-- .../xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp | 4 ++-- .../include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp | 4 ++-- .../interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp | 4 ++-- .../xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp | 4 ++-- .../xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp | 2 +- .../vsm/IGCObject_DVirtualSchematikaMachine.hpp | 4 ++-- xo-interpreter2/src/interpreter2/DClosure.cpp | 2 +- xo-interpreter2/src/interpreter2/DLocalEnv.cpp | 2 +- .../src/interpreter2/DVirtualSchematikaMachine.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp | 4 ++-- .../src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp | 4 ++-- .../src/interpreter2/IGCObject_DVsmApplyFrame.cpp | 4 ++-- .../src/interpreter2/IGCObject_DVsmDefContFrame.cpp | 4 ++-- .../src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp | 4 ++-- .../src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp | 4 ++-- .../src/interpreter2/IGCObject_DVsmSeqContFrame.cpp | 4 ++-- .../src/interpreter2/facet/IGCObject_DLocalEnv.cpp | 4 ++-- .../facet/IGCObject_DVirtualSchematikaMachine.cpp | 4 ++-- xo-object2/include/xo/object2/DArray.hpp | 2 +- xo-object2/include/xo/object2/DBoolean.hpp | 2 +- xo-object2/include/xo/object2/DDictionary.hpp | 2 +- xo-object2/include/xo/object2/DFloat.hpp | 2 +- xo-object2/include/xo/object2/DInteger.hpp | 2 +- xo-object2/include/xo/object2/DList.hpp | 2 +- xo-object2/include/xo/object2/DRuntimeError.hpp | 2 +- xo-object2/include/xo/object2/array/IGCObject_DArray.hpp | 4 ++-- .../include/xo/object2/boolean/IGCObject_DBoolean.hpp | 4 ++-- .../include/xo/object2/dictionary/IGCObject_DDictionary.hpp | 4 ++-- .../include/xo/object2/error/IGCObject_DRuntimeError.hpp | 4 ++-- xo-object2/include/xo/object2/list/IGCObject_DList.hpp | 4 ++-- xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp | 4 ++-- xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp | 4 ++-- xo-object2/src/object2/DArray.cpp | 2 +- xo-object2/src/object2/DBoolean.cpp | 2 +- xo-object2/src/object2/DDictionary.cpp | 2 +- xo-object2/src/object2/DFloat.cpp | 2 +- xo-object2/src/object2/DInteger.cpp | 2 +- xo-object2/src/object2/DList.cpp | 2 +- xo-object2/src/object2/DRuntimeError.cpp | 2 +- xo-object2/src/object2/IGCObject_DArray.cpp | 4 ++-- xo-object2/src/object2/IGCObject_DBoolean.cpp | 4 ++-- xo-object2/src/object2/IGCObject_DDictionary.cpp | 4 ++-- xo-object2/src/object2/IGCObject_DFloat.cpp | 4 ++-- xo-object2/src/object2/IGCObject_DInteger.cpp | 4 ++-- xo-object2/src/object2/IGCObject_DList.cpp | 4 ++-- xo-object2/src/object2/IGCObject_DRuntimeError.cpp | 4 ++-- xo-procedure2/include/xo/procedure2/DPrimitive.hpp | 4 ++-- .../xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp | 4 ++-- .../xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp | 4 ++-- .../detail/IGCObject_DPrimitive_gco_2_dict_string.hpp | 4 ++-- .../detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp | 4 ++-- .../detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp | 4 ++-- .../src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp | 4 ++-- .../src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp | 4 ++-- .../facet/IGCObject_DPrimitive_gco_2_dict_string.cpp | 4 ++-- .../procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp | 4 ++-- .../facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp | 4 ++-- xo-reader2/include/xo/reader2/DGlobalEnv.hpp | 2 +- xo-reader2/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp | 4 ++-- .../include/xo/reader2/env/IGCObject_DSchematikaParser.hpp | 4 ++-- xo-reader2/include/xo/reader2/parser/DSchematikaParser.hpp | 4 ++-- .../xo/reader2/parser/IGCObject_DSchematikaParser.hpp | 4 ++-- xo-reader2/src/reader2/DGlobalEnv.cpp | 2 +- xo-reader2/src/reader2/DSchematikaParser.cpp | 2 +- xo-reader2/src/reader2/facet/IGCObject_DGlobalEnv.cpp | 4 ++-- .../src/reader2/facet/IGCObject_DSchematikaParser.cpp | 4 ++-- xo-stringtable2/include/xo/stringtable2/DString.hpp | 2 +- xo-stringtable2/include/xo/stringtable2/DUniqueString.hpp | 2 +- .../include/xo/stringtable2/string/IGCObject_DString.hpp | 4 ++-- .../stringtable2/uniquestring/IGCObject_DUniqueString.hpp | 4 ++-- xo-stringtable2/src/stringtable2/DString.cpp | 2 +- xo-stringtable2/src/stringtable2/DUniqueString.cpp | 2 +- xo-stringtable2/src/stringtable2/IGCObject_DString.cpp | 4 ++-- .../src/stringtable2/IGCObject_DUniqueString.cpp | 4 ++-- xo-type/include/xo/type/DArrayType.hpp | 2 +- xo-type/include/xo/type/DAtomicType.hpp | 2 +- xo-type/include/xo/type/DFunctionType.hpp | 2 +- xo-type/include/xo/type/DListType.hpp | 2 +- xo-type/include/xo/type/array/IGCObject_DArrayType.hpp | 4 ++-- xo-type/include/xo/type/atomic/IGCObject_DAtomicType.hpp | 4 ++-- .../include/xo/type/function/IGCObject_DFunctionType.hpp | 4 ++-- xo-type/include/xo/type/list/IGCObject_DListType.hpp | 4 ++-- xo-type/include/xo/type/typevar/DTypeVarRef.hpp | 2 +- xo-type/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp | 4 ++-- xo-type/src/type/DArrayType.cpp | 2 +- xo-type/src/type/DAtomicType.cpp | 2 +- xo-type/src/type/DFunctionType.cpp | 2 +- xo-type/src/type/DListType.cpp | 2 +- xo-type/src/type/DTypeVarRef.cpp | 2 +- xo-type/src/type/IGCObject_DArrayType.cpp | 4 ++-- xo-type/src/type/IGCObject_DAtomicType.cpp | 4 ++-- xo-type/src/type/IGCObject_DFunctionType.cpp | 4 ++-- xo-type/src/type/IGCObject_DListType.cpp | 4 ++-- xo-type/src/type/IGCObject_DTypeVarRef.cpp | 4 ++-- 164 files changed, 255 insertions(+), 255 deletions(-) diff --git a/xo-alloc2/idl/GCObject.json5 b/xo-alloc2/idl/GCObject.json5 index cbc2ab7e..8f7e071f 100644 --- a/xo-alloc2/idl/GCObject.json5 +++ b/xo-alloc2/idl/GCObject.json5 @@ -56,10 +56,10 @@ }, ], nonconst_methods: [ - // Opaque shallow_copy(obj>) noexcept + // Opaque shallow_move(obj>) noexcept { - name: "shallow_copy", - doc: ["copy instance using allocator"], + name: "shallow_move", + doc: ["move instance using allocator"], return_type: "Opaque", args:[ {type: "obj", name: "mm"}, diff --git a/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp b/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp index e9a4e519..ee0703d9 100644 --- a/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp +++ b/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp @@ -66,8 +66,8 @@ public: virtual size_type shallow_size(Copaque data) const noexcept = 0; // nonconst methods - /** copy instance using allocator **/ - virtual Opaque shallow_copy(Opaque data, obj mm) const noexcept = 0; + /** move instance using allocator **/ + virtual Opaque shallow_move(Opaque data, obj mm) const noexcept = 0; /** during GC: forward immdiate children **/ virtual size_type forward_children(Opaque data, obj gc) const noexcept = 0; ///@} diff --git a/xo-alloc2/include/xo/alloc2/gc/IGCObject_Any.hpp b/xo-alloc2/include/xo/alloc2/gc/IGCObject_Any.hpp index 2658c599..000c85fe 100644 --- a/xo-alloc2/include/xo/alloc2/gc/IGCObject_Any.hpp +++ b/xo-alloc2/include/xo/alloc2/gc/IGCObject_Any.hpp @@ -64,7 +64,7 @@ namespace mm { [[noreturn]] size_type shallow_size(Copaque) const noexcept override { _fatal(); } // nonconst methods - [[noreturn]] Opaque shallow_copy(Opaque, obj) const noexcept override; + [[noreturn]] Opaque shallow_move(Opaque, obj) const noexcept override; [[noreturn]] size_type forward_children(Opaque, obj) const noexcept override; ///@} diff --git a/xo-alloc2/include/xo/alloc2/gc/IGCObject_Xfer.hpp b/xo-alloc2/include/xo/alloc2/gc/IGCObject_Xfer.hpp index e00595e8..35e23a62 100644 --- a/xo-alloc2/include/xo/alloc2/gc/IGCObject_Xfer.hpp +++ b/xo-alloc2/include/xo/alloc2/gc/IGCObject_Xfer.hpp @@ -54,8 +54,8 @@ namespace mm { } // non-const methods - Opaque shallow_copy(Opaque data, obj mm) const noexcept override { - return I::shallow_copy(_dcast(data), mm); + Opaque shallow_move(Opaque data, obj mm) const noexcept override { + return I::shallow_move(_dcast(data), mm); } size_type forward_children(Opaque data, obj gc) const noexcept override { return I::forward_children(_dcast(data), gc); diff --git a/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp b/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp index 4bf2ad1e..6192c08d 100644 --- a/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp +++ b/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp @@ -58,9 +58,9 @@ public: void * std_copy_for(const T * src) noexcept { void * mem = this->alloc_copy_for(src); if (mem) { - new (mem) T(std::move(*src)); + return new (mem) T(std::move(*src)); } - return (T *)mem; + return nullptr; } /** forward faceted object pointer in place. Defined in GCObject.hpp to avoid #include cycle **/ diff --git a/xo-alloc2/include/xo/alloc2/gc/RGCObject.hpp b/xo-alloc2/include/xo/alloc2/gc/RGCObject.hpp index c4a668e6..1839f83b 100644 --- a/xo-alloc2/include/xo/alloc2/gc/RGCObject.hpp +++ b/xo-alloc2/include/xo/alloc2/gc/RGCObject.hpp @@ -60,8 +60,8 @@ public: } // non-const methods (still const in router!) - Opaque shallow_copy(obj mm) noexcept { - return O::iface()->shallow_copy(O::data(), mm); + Opaque shallow_move(obj mm) noexcept { + return O::iface()->shallow_move(O::data(), mm); } size_type forward_children(obj gc) noexcept { return O::iface()->forward_children(O::data(), gc); diff --git a/xo-alloc2/src/alloc2/IGCObject_Any.cpp b/xo-alloc2/src/alloc2/IGCObject_Any.cpp index 426f68a9..c9b9329b 100644 --- a/xo-alloc2/src/alloc2/IGCObject_Any.cpp +++ b/xo-alloc2/src/alloc2/IGCObject_Any.cpp @@ -36,7 +36,7 @@ IGCObject_Any::_valid // nonconst methods auto -IGCObject_Any::shallow_copy(Opaque, obj) const noexcept -> Opaque +IGCObject_Any::shallow_move(Opaque, obj) const noexcept -> Opaque { _fatal(); } diff --git a/xo-expression2/include/xo/expression2/DApplyExpr.hpp b/xo-expression2/include/xo/expression2/DApplyExpr.hpp index 94bcea73..072567c1 100644 --- a/xo-expression2/include/xo/expression2/DApplyExpr.hpp +++ b/xo-expression2/include/xo/expression2/DApplyExpr.hpp @@ -83,7 +83,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DApplyExpr * shallow_copy(obj mm) const noexcept; + DApplyExpr * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DConstant.hpp b/xo-expression2/include/xo/expression2/DConstant.hpp index 2c8b4a96..da557fc9 100644 --- a/xo-expression2/include/xo/expression2/DConstant.hpp +++ b/xo-expression2/include/xo/expression2/DConstant.hpp @@ -63,7 +63,7 @@ namespace xo { ///@{ size_t shallow_size() const noexcept; - DConstant * shallow_copy(obj mm) const noexcept; + DConstant * shallow_move(obj mm) const noexcept; size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DDefineExpr.hpp b/xo-expression2/include/xo/expression2/DDefineExpr.hpp index 34a4baa5..b2cd7ed6 100644 --- a/xo-expression2/include/xo/expression2/DDefineExpr.hpp +++ b/xo-expression2/include/xo/expression2/DDefineExpr.hpp @@ -73,7 +73,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DDefineExpr * shallow_copy(obj mm) noexcept; + DDefineExpr * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DGlobalSymtab.hpp b/xo-expression2/include/xo/expression2/DGlobalSymtab.hpp index 2f8b1e14..9ce29a6e 100644 --- a/xo-expression2/include/xo/expression2/DGlobalSymtab.hpp +++ b/xo-expression2/include/xo/expression2/DGlobalSymtab.hpp @@ -111,7 +111,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DGlobalSymtab * shallow_copy(obj mm) const noexcept; + DGlobalSymtab * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DIfElseExpr.hpp b/xo-expression2/include/xo/expression2/DIfElseExpr.hpp index 0cf71332..1f04ced0 100644 --- a/xo-expression2/include/xo/expression2/DIfElseExpr.hpp +++ b/xo-expression2/include/xo/expression2/DIfElseExpr.hpp @@ -99,7 +99,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DIfElseExpr * shallow_copy(obj mm) const noexcept; + DIfElseExpr * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DLambdaExpr.hpp b/xo-expression2/include/xo/expression2/DLambdaExpr.hpp index a7de8044..58495395 100644 --- a/xo-expression2/include/xo/expression2/DLambdaExpr.hpp +++ b/xo-expression2/include/xo/expression2/DLambdaExpr.hpp @@ -85,7 +85,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DLambdaExpr * shallow_copy(obj mm) const noexcept; + DLambdaExpr * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DLocalSymtab.hpp b/xo-expression2/include/xo/expression2/DLocalSymtab.hpp index 0d32472b..dbaad170 100644 --- a/xo-expression2/include/xo/expression2/DLocalSymtab.hpp +++ b/xo-expression2/include/xo/expression2/DLocalSymtab.hpp @@ -98,7 +98,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DLocalSymtab * shallow_copy(obj mm) noexcept; + DLocalSymtab * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DSequenceExpr.hpp b/xo-expression2/include/xo/expression2/DSequenceExpr.hpp index 39fa79d0..c70f5e72 100644 --- a/xo-expression2/include/xo/expression2/DSequenceExpr.hpp +++ b/xo-expression2/include/xo/expression2/DSequenceExpr.hpp @@ -73,7 +73,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DSequenceExpr * shallow_copy(obj mm) const noexcept; + DSequenceExpr * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DTypename.hpp b/xo-expression2/include/xo/expression2/DTypename.hpp index eeee5dbb..667082ad 100644 --- a/xo-expression2/include/xo/expression2/DTypename.hpp +++ b/xo-expression2/include/xo/expression2/DTypename.hpp @@ -54,7 +54,7 @@ namespace xo { ///@{ size_t shallow_size() const noexcept; - DTypename * shallow_copy(obj mm) noexcept; + DTypename * shallow_move(obj mm) noexcept; size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DVarRef.hpp b/xo-expression2/include/xo/expression2/DVarRef.hpp index d4a230b3..26305923 100644 --- a/xo-expression2/include/xo/expression2/DVarRef.hpp +++ b/xo-expression2/include/xo/expression2/DVarRef.hpp @@ -55,7 +55,7 @@ namespace xo { ///@{ size_t shallow_size() const noexcept; - DVarRef * shallow_copy(obj mm) const noexcept; + DVarRef * shallow_move(obj mm) const noexcept; size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/DVariable.hpp b/xo-expression2/include/xo/expression2/DVariable.hpp index 329cf088..1b4f31d2 100644 --- a/xo-expression2/include/xo/expression2/DVariable.hpp +++ b/xo-expression2/include/xo/expression2/DVariable.hpp @@ -63,7 +63,7 @@ namespace xo { ///@{ size_t shallow_size() const noexcept; - DVariable * shallow_copy(obj mm) const noexcept; + DVariable * shallow_move(obj mm) const noexcept; size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp b/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp index cf4e3062..df303b98 100644 --- a/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp +++ b/xo-expression2/include/xo/expression2/define/IGCObject_DDefineExpr.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DDefineExpr & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DDefineExpr & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DDefineExpr & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DDefineExpr & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp index a1675363..c0b0f35b 100644 --- a/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp +++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DApplyExpr.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DApplyExpr & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DApplyExpr & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DApplyExpr & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DApplyExpr & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp index 68404957..35bfbaa2 100644 --- a/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp +++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DConstant.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DConstant & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DConstant & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DConstant & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DConstant & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp index 1e1fcca5..5f9cf68e 100644 --- a/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp +++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DIfElseExpr.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DIfElseExpr & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DIfElseExpr & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DIfElseExpr & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DIfElseExpr & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp index f33e9ed7..f44d2ac8 100644 --- a/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp +++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DLambdaExpr.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DLambdaExpr & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DLambdaExpr & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DLambdaExpr & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DLambdaExpr & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp index 7648aab3..df29b94f 100644 --- a/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp +++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DSequenceExpr.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DSequenceExpr & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DSequenceExpr & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DSequenceExpr & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DSequenceExpr & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp b/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp index c5ca5f19..d002c5c9 100644 --- a/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp +++ b/xo-expression2/include/xo/expression2/detail/IGCObject_DVarRef.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVarRef & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVarRef & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVarRef & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVarRef & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp b/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp index cf444eb8..f2a64385 100644 --- a/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp +++ b/xo-expression2/include/xo/expression2/symtab/IGCObject_DGlobalSymtab.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DGlobalSymtab & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DGlobalSymtab & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DGlobalSymtab & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DGlobalSymtab & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp b/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp index d91f214a..a5c0cd04 100644 --- a/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp +++ b/xo-expression2/include/xo/expression2/symtab/IGCObject_DLocalSymtab.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DLocalSymtab & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DLocalSymtab & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DLocalSymtab & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DLocalSymtab & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/typename/IGCObject_DTypename.hpp b/xo-expression2/include/xo/expression2/typename/IGCObject_DTypename.hpp index d2302a6f..45781a2e 100644 --- a/xo-expression2/include/xo/expression2/typename/IGCObject_DTypename.hpp +++ b/xo-expression2/include/xo/expression2/typename/IGCObject_DTypename.hpp @@ -52,8 +52,8 @@ namespace xo { static size_type shallow_size(const DTypename & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DTypename & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DTypename & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DTypename & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/include/xo/expression2/variable/IGCObject_DVariable.hpp b/xo-expression2/include/xo/expression2/variable/IGCObject_DVariable.hpp index 1bdb2a0f..9621d0f3 100644 --- a/xo-expression2/include/xo/expression2/variable/IGCObject_DVariable.hpp +++ b/xo-expression2/include/xo/expression2/variable/IGCObject_DVariable.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVariable & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVariable & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVariable & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVariable & self, obj gc) noexcept; ///@} diff --git a/xo-expression2/src/expression2/DApplyExpr.cpp b/xo-expression2/src/expression2/DApplyExpr.cpp index 784e4473..80f25139 100644 --- a/xo-expression2/src/expression2/DApplyExpr.cpp +++ b/xo-expression2/src/expression2/DApplyExpr.cpp @@ -110,7 +110,7 @@ namespace xo { } DApplyExpr * - DApplyExpr::shallow_copy(obj mm) const noexcept { + DApplyExpr::shallow_move(obj mm) const noexcept { DApplyExpr * copy = (DApplyExpr *)mm.alloc_copy((std::byte *)this); if (copy) { diff --git a/xo-expression2/src/expression2/DConstant.cpp b/xo-expression2/src/expression2/DConstant.cpp index 53ab045e..ea7a3d9f 100644 --- a/xo-expression2/src/expression2/DConstant.cpp +++ b/xo-expression2/src/expression2/DConstant.cpp @@ -78,7 +78,7 @@ namespace xo { } DConstant * - DConstant::shallow_copy(obj mm) const noexcept + DConstant::shallow_move(obj mm) const noexcept { DConstant * copy = (DConstant *)mm.alloc_copy((std::byte *)this); diff --git a/xo-expression2/src/expression2/DDefineExpr.cpp b/xo-expression2/src/expression2/DDefineExpr.cpp index e5ec63b0..014da87c 100644 --- a/xo-expression2/src/expression2/DDefineExpr.cpp +++ b/xo-expression2/src/expression2/DDefineExpr.cpp @@ -85,7 +85,7 @@ namespace xo { } DDefineExpr * - DDefineExpr::shallow_copy(obj mm) noexcept + DDefineExpr::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/xo-expression2/src/expression2/DGlobalSymtab.cpp b/xo-expression2/src/expression2/DGlobalSymtab.cpp index 158326ac..2ea5b2ec 100644 --- a/xo-expression2/src/expression2/DGlobalSymtab.cpp +++ b/xo-expression2/src/expression2/DGlobalSymtab.cpp @@ -261,7 +261,7 @@ namespace xo { } DGlobalSymtab * - DGlobalSymtab::shallow_copy(obj mm) const noexcept + DGlobalSymtab::shallow_move(obj mm) const noexcept { /** can't use std_copy_for because of non-copyable dp * diff --git a/xo-expression2/src/expression2/DIfElseExpr.cpp b/xo-expression2/src/expression2/DIfElseExpr.cpp index 0db04f7e..42d09fbb 100644 --- a/xo-expression2/src/expression2/DIfElseExpr.cpp +++ b/xo-expression2/src/expression2/DIfElseExpr.cpp @@ -89,7 +89,7 @@ namespace xo { } DIfElseExpr * - DIfElseExpr::shallow_copy(obj mm) const noexcept + DIfElseExpr::shallow_move(obj mm) const noexcept { DIfElseExpr * copy = (DIfElseExpr *)mm.alloc_copy((std::byte *)this); diff --git a/xo-expression2/src/expression2/DLambdaExpr.cpp b/xo-expression2/src/expression2/DLambdaExpr.cpp index f5bdd576..ebec0d40 100644 --- a/xo-expression2/src/expression2/DLambdaExpr.cpp +++ b/xo-expression2/src/expression2/DLambdaExpr.cpp @@ -140,7 +140,7 @@ namespace xo { } DLambdaExpr * - DLambdaExpr::shallow_copy(obj mm) const noexcept { + DLambdaExpr::shallow_move(obj mm) const noexcept { DLambdaExpr * copy = (DLambdaExpr *)mm.alloc_copy((std::byte *)this); if (copy) { diff --git a/xo-expression2/src/expression2/DLocalSymtab.cpp b/xo-expression2/src/expression2/DLocalSymtab.cpp index 14dd9262..cf021038 100644 --- a/xo-expression2/src/expression2/DLocalSymtab.cpp +++ b/xo-expression2/src/expression2/DLocalSymtab.cpp @@ -119,7 +119,7 @@ namespace xo { } DLocalSymtab * - DLocalSymtab::shallow_copy(obj mm) noexcept + DLocalSymtab::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/xo-expression2/src/expression2/DSequenceExpr.cpp b/xo-expression2/src/expression2/DSequenceExpr.cpp index 168bf198..39dcc999 100644 --- a/xo-expression2/src/expression2/DSequenceExpr.cpp +++ b/xo-expression2/src/expression2/DSequenceExpr.cpp @@ -120,7 +120,7 @@ namespace xo { } DSequenceExpr * - DSequenceExpr::shallow_copy(obj mm) const noexcept + DSequenceExpr::shallow_move(obj mm) const noexcept { DSequenceExpr * copy = (DSequenceExpr *)mm.alloc_copy((std::byte *)this); diff --git a/xo-expression2/src/expression2/DTypename.cpp b/xo-expression2/src/expression2/DTypename.cpp index 36c9e74f..e02b483e 100644 --- a/xo-expression2/src/expression2/DTypename.cpp +++ b/xo-expression2/src/expression2/DTypename.cpp @@ -47,7 +47,7 @@ namespace xo { } DTypename * - DTypename::shallow_copy(obj mm) noexcept + DTypename::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/xo-expression2/src/expression2/DVarRef.cpp b/xo-expression2/src/expression2/DVarRef.cpp index df793c8a..e2866c23 100644 --- a/xo-expression2/src/expression2/DVarRef.cpp +++ b/xo-expression2/src/expression2/DVarRef.cpp @@ -65,7 +65,7 @@ namespace xo { } DVarRef * - DVarRef::shallow_copy(obj mm) const noexcept + DVarRef::shallow_move(obj mm) const noexcept { DVarRef * copy = (DVarRef *)mm.alloc_copy((std::byte *)this); diff --git a/xo-expression2/src/expression2/DVariable.cpp b/xo-expression2/src/expression2/DVariable.cpp index 092eb715..1b986c0b 100644 --- a/xo-expression2/src/expression2/DVariable.cpp +++ b/xo-expression2/src/expression2/DVariable.cpp @@ -45,7 +45,7 @@ namespace xo { } DVariable * - DVariable::shallow_copy(obj mm) const noexcept + DVariable::shallow_move(obj mm) const noexcept { DVariable * copy = (DVariable *)mm.alloc_copy((std::byte *)this); diff --git a/xo-expression2/src/expression2/IGCObject_DApplyExpr.cpp b/xo-expression2/src/expression2/IGCObject_DApplyExpr.cpp index fe587a2d..28375cce 100644 --- a/xo-expression2/src/expression2/IGCObject_DApplyExpr.cpp +++ b/xo-expression2/src/expression2/IGCObject_DApplyExpr.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DApplyExpr::shallow_copy(DApplyExpr & self, obj mm) noexcept -> Opaque + IGCObject_DApplyExpr::shallow_move(DApplyExpr & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DApplyExpr::forward_children(DApplyExpr & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DConstant.cpp b/xo-expression2/src/expression2/IGCObject_DConstant.cpp index 73453419..dff013b1 100644 --- a/xo-expression2/src/expression2/IGCObject_DConstant.cpp +++ b/xo-expression2/src/expression2/IGCObject_DConstant.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DConstant::shallow_copy(DConstant & self, obj mm) noexcept -> Opaque + IGCObject_DConstant::shallow_move(DConstant & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DConstant::forward_children(DConstant & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DDefineExpr.cpp b/xo-expression2/src/expression2/IGCObject_DDefineExpr.cpp index ffbd4bc8..5adf8fc6 100644 --- a/xo-expression2/src/expression2/IGCObject_DDefineExpr.cpp +++ b/xo-expression2/src/expression2/IGCObject_DDefineExpr.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DDefineExpr::shallow_copy(DDefineExpr & self, obj mm) noexcept -> Opaque + IGCObject_DDefineExpr::shallow_move(DDefineExpr & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DDefineExpr::forward_children(DDefineExpr & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DGlobalSymtab.cpp b/xo-expression2/src/expression2/IGCObject_DGlobalSymtab.cpp index f88060cb..005e3ad3 100644 --- a/xo-expression2/src/expression2/IGCObject_DGlobalSymtab.cpp +++ b/xo-expression2/src/expression2/IGCObject_DGlobalSymtab.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DGlobalSymtab::shallow_copy(DGlobalSymtab & self, obj mm) noexcept -> Opaque + IGCObject_DGlobalSymtab::shallow_move(DGlobalSymtab & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DGlobalSymtab::forward_children(DGlobalSymtab & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DIfElseExpr.cpp b/xo-expression2/src/expression2/IGCObject_DIfElseExpr.cpp index a861dbc4..9c28f2e0 100644 --- a/xo-expression2/src/expression2/IGCObject_DIfElseExpr.cpp +++ b/xo-expression2/src/expression2/IGCObject_DIfElseExpr.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DIfElseExpr::shallow_copy(DIfElseExpr & self, obj mm) noexcept -> Opaque + IGCObject_DIfElseExpr::shallow_move(DIfElseExpr & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DIfElseExpr::forward_children(DIfElseExpr & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp b/xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp index be64dab3..bfe386a2 100644 --- a/xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp +++ b/xo-expression2/src/expression2/IGCObject_DLambdaExpr.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DLambdaExpr::shallow_copy(DLambdaExpr & self, obj mm) noexcept -> Opaque + IGCObject_DLambdaExpr::shallow_move(DLambdaExpr & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DLambdaExpr::forward_children(DLambdaExpr & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp b/xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp index eb3e06c3..7078db9a 100644 --- a/xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp +++ b/xo-expression2/src/expression2/IGCObject_DLocalSymtab.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DLocalSymtab::shallow_copy(DLocalSymtab & self, obj mm) noexcept -> Opaque + IGCObject_DLocalSymtab::shallow_move(DLocalSymtab & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DLocalSymtab::forward_children(DLocalSymtab & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DSequenceExpr.cpp b/xo-expression2/src/expression2/IGCObject_DSequenceExpr.cpp index bbcf9084..446a78bb 100644 --- a/xo-expression2/src/expression2/IGCObject_DSequenceExpr.cpp +++ b/xo-expression2/src/expression2/IGCObject_DSequenceExpr.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DSequenceExpr::shallow_copy(DSequenceExpr & self, obj mm) noexcept -> Opaque + IGCObject_DSequenceExpr::shallow_move(DSequenceExpr & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DSequenceExpr::forward_children(DSequenceExpr & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DTypename.cpp b/xo-expression2/src/expression2/IGCObject_DTypename.cpp index f9c40e81..154a8b4a 100644 --- a/xo-expression2/src/expression2/IGCObject_DTypename.cpp +++ b/xo-expression2/src/expression2/IGCObject_DTypename.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DTypename::shallow_copy(DTypename & self, obj mm) noexcept -> Opaque + IGCObject_DTypename::shallow_move(DTypename & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DTypename::forward_children(DTypename & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/IGCObject_DVarRef.cpp b/xo-expression2/src/expression2/IGCObject_DVarRef.cpp index 788e0a00..b6b5e077 100644 --- a/xo-expression2/src/expression2/IGCObject_DVarRef.cpp +++ b/xo-expression2/src/expression2/IGCObject_DVarRef.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVarRef::shallow_copy(DVarRef & self, obj mm) noexcept -> Opaque + IGCObject_DVarRef::shallow_move(DVarRef & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVarRef::forward_children(DVarRef & self, obj gc) noexcept -> size_type diff --git a/xo-expression2/src/expression2/facet/IGCObject_DVariable.cpp b/xo-expression2/src/expression2/facet/IGCObject_DVariable.cpp index 0bf7915d..8a49292b 100644 --- a/xo-expression2/src/expression2/facet/IGCObject_DVariable.cpp +++ b/xo-expression2/src/expression2/facet/IGCObject_DVariable.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVariable::shallow_copy(DVariable & self, obj mm) noexcept -> Opaque + IGCObject_DVariable::shallow_move(DVariable & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVariable::forward_children(DVariable & self, obj gc) noexcept -> size_type diff --git a/xo-gc/src/gc/GCObjectStore.cpp b/xo-gc/src/gc/GCObjectStore.cpp index 9fb14498..621a1548 100644 --- a/xo-gc/src/gc/GCObjectStore.cpp +++ b/xo-gc/src/gc/GCObjectStore.cpp @@ -870,7 +870,7 @@ namespace xo { //obj gc_gco(gc); - void * to_dest = iface->shallow_copy(from_src, gc->ref()); + void * to_dest = iface->shallow_move(from_src, gc->ref()); log && log(xtag("from_src", from_src), xtag("to_dest", to_dest)); log && log(xtag("tseq", info.tseq()), diff --git a/xo-interpreter2/include/xo/interpreter2/DClosure.hpp b/xo-interpreter2/include/xo/interpreter2/DClosure.hpp index 26ff2703..aef74663 100644 --- a/xo-interpreter2/include/xo/interpreter2/DClosure.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DClosure.hpp @@ -58,7 +58,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DClosure * shallow_copy(obj mm) const noexcept; + DClosure * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp index ab407063..76cac024 100644 --- a/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp @@ -55,7 +55,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DLocalEnv * shallow_copy(obj mm) const noexcept; + DLocalEnv * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/DVsmApplyClosureFrame.hpp b/xo-interpreter2/include/xo/interpreter2/DVsmApplyClosureFrame.hpp index 168fa1a3..718c52b3 100644 --- a/xo-interpreter2/include/xo/interpreter2/DVsmApplyClosureFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DVsmApplyClosureFrame.hpp @@ -40,7 +40,7 @@ namespace xo { /** gcobject facet **/ std::size_t shallow_size() const noexcept; - DVsmApplyClosureFrame * shallow_copy(obj mm) const noexcept; + DVsmApplyClosureFrame * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; /** pretty-printing support **/ diff --git a/xo-interpreter2/include/xo/interpreter2/DVsmApplyFrame.hpp b/xo-interpreter2/include/xo/interpreter2/DVsmApplyFrame.hpp index 47735afe..d761cd18 100644 --- a/xo-interpreter2/include/xo/interpreter2/DVsmApplyFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DVsmApplyFrame.hpp @@ -38,7 +38,7 @@ namespace xo { void assign_fn(obj x) { this->fn_ = x; } std::size_t shallow_size() const noexcept; - DVsmApplyFrame * shallow_copy(obj mm) const noexcept; + DVsmApplyFrame * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; /** pretty-printing support **/ diff --git a/xo-interpreter2/include/xo/interpreter2/DVsmDefContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/DVsmDefContFrame.hpp index 249ead9c..d128d357 100644 --- a/xo-interpreter2/include/xo/interpreter2/DVsmDefContFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DVsmDefContFrame.hpp @@ -51,7 +51,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DVsmDefContFrame * shallow_copy(obj mm) noexcept; + DVsmDefContFrame * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/DVsmEvalArgsFrame.hpp b/xo-interpreter2/include/xo/interpreter2/DVsmEvalArgsFrame.hpp index e3b8b2b5..c389f214 100644 --- a/xo-interpreter2/include/xo/interpreter2/DVsmEvalArgsFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DVsmEvalArgsFrame.hpp @@ -43,7 +43,7 @@ namespace xo { int32_t increment_arg() { return ++i_arg_; } std::size_t shallow_size() const noexcept; - DVsmEvalArgsFrame * shallow_copy(obj mm) const noexcept; + DVsmEvalArgsFrame * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; bool pretty(const ppindentinfo & ppii) const; diff --git a/xo-interpreter2/include/xo/interpreter2/DVsmIfElseContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/DVsmIfElseContFrame.hpp index af98b9a5..09fcd076 100644 --- a/xo-interpreter2/include/xo/interpreter2/DVsmIfElseContFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DVsmIfElseContFrame.hpp @@ -51,7 +51,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DVsmIfElseContFrame * shallow_copy(obj mm) noexcept; + DVsmIfElseContFrame * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/DVsmSeqContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/DVsmSeqContFrame.hpp index bb4e64fc..4692425b 100644 --- a/xo-interpreter2/include/xo/interpreter2/DVsmSeqContFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/DVsmSeqContFrame.hpp @@ -56,7 +56,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DVsmSeqContFrame * shallow_copy(obj mm) noexcept; + DVsmSeqContFrame * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp index 33192f6e..f4a7c4d1 100644 --- a/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVsmDefContFrame & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVsmDefContFrame & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVsmDefContFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmDefContFrame & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp index 67bb24ae..d5933283 100644 --- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp +++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DClosure.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DClosure & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DClosure & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DClosure & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DClosure & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp index 6151d76b..ab9e223a 100644 --- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVsmApplyClosureFrame & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVsmApplyClosureFrame & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVsmApplyClosureFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmApplyClosureFrame & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp index 384b5b32..aa65d6e9 100644 --- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVsmApplyFrame & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVsmApplyFrame & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVsmApplyFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmApplyFrame & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp index 17651a71..57d28ebe 100644 --- a/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVsmEvalArgsFrame & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVsmEvalArgsFrame & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVsmEvalArgsFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmEvalArgsFrame & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp b/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp index 9d2cc682..7105768a 100644 --- a/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp +++ b/xo-interpreter2/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DLocalEnv & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DLocalEnv & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DLocalEnv & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DLocalEnv & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp index 71afdd6a..63e3ad2a 100644 --- a/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVsmIfElseContFrame & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVsmIfElseContFrame & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVsmIfElseContFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmIfElseContFrame & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp b/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp index e778456d..a657a217 100644 --- a/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp +++ b/xo-interpreter2/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVsmSeqContFrame & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVsmSeqContFrame & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVsmSeqContFrame & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVsmSeqContFrame & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp b/xo-interpreter2/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp index e6badf83..ecaac469 100644 --- a/xo-interpreter2/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp +++ b/xo-interpreter2/include/xo/interpreter2/vsm/DVirtualSchematikaMachine.hpp @@ -153,7 +153,7 @@ namespace xo { /** shallow copy during gc cycle. Not implemented! Only intending to support * VSM as virtual root **/ - DVirtualSchematikaMachine * shallow_copy(obj mm) const noexcept; + DVirtualSchematikaMachine * shallow_move(obj mm) const noexcept; /** forward gc-aware child pointers **/ diff --git a/xo-interpreter2/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp b/xo-interpreter2/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp index 7b391c2f..6f7c0eb8 100644 --- a/xo-interpreter2/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp +++ b/xo-interpreter2/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DVirtualSchematikaMachine & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DVirtualSchematikaMachine & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DVirtualSchematikaMachine & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DVirtualSchematikaMachine & self, obj gc) noexcept; ///@} diff --git a/xo-interpreter2/src/interpreter2/DClosure.cpp b/xo-interpreter2/src/interpreter2/DClosure.cpp index e052ca4d..ed95334f 100644 --- a/xo-interpreter2/src/interpreter2/DClosure.cpp +++ b/xo-interpreter2/src/interpreter2/DClosure.cpp @@ -70,7 +70,7 @@ namespace xo { } DClosure * - DClosure::shallow_copy(obj mm) const noexcept { + DClosure::shallow_move(obj mm) const noexcept { DClosure * copy = (DClosure *)mm.alloc_copy((std::byte *)this); if (copy) diff --git a/xo-interpreter2/src/interpreter2/DLocalEnv.cpp b/xo-interpreter2/src/interpreter2/DLocalEnv.cpp index 3831b647..94f27422 100644 --- a/xo-interpreter2/src/interpreter2/DLocalEnv.cpp +++ b/xo-interpreter2/src/interpreter2/DLocalEnv.cpp @@ -97,7 +97,7 @@ namespace xo { } DLocalEnv * - DLocalEnv::shallow_copy(obj mm) const noexcept { + DLocalEnv::shallow_move(obj mm) const noexcept { DLocalEnv * copy = (DLocalEnv *)mm.alloc_copy((std::byte *)this); if (copy) diff --git a/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp b/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp index f9977eb9..a196363e 100644 --- a/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp +++ b/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp @@ -954,7 +954,7 @@ namespace xo { } DVirtualSchematikaMachine * - DVirtualSchematikaMachine::shallow_copy(obj mm) const noexcept + DVirtualSchematikaMachine::shallow_move(obj mm) const noexcept { (void)mm; diff --git a/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp index 26a215a4..d2cfdb35 100644 --- a/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp @@ -39,7 +39,7 @@ namespace xo { } DVsmApplyClosureFrame * - DVsmApplyClosureFrame::shallow_copy(obj mm) const noexcept + DVsmApplyClosureFrame::shallow_move(obj mm) const noexcept { DVsmApplyClosureFrame * copy = (DVsmApplyClosureFrame *)mm.alloc_copy((std::byte *)this); diff --git a/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp index 72b81405..9a50c117 100644 --- a/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp @@ -47,7 +47,7 @@ namespace xo { } DVsmApplyFrame * - DVsmApplyFrame::shallow_copy(obj mm) const noexcept + DVsmApplyFrame::shallow_move(obj mm) const noexcept { DVsmApplyFrame * copy = (DVsmApplyFrame *)mm.alloc_copy((std::byte *)this); diff --git a/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp index 6d39d1f1..d1f3e2b2 100644 --- a/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp @@ -38,7 +38,7 @@ namespace xo { } DVsmDefContFrame * - DVsmDefContFrame::shallow_copy(obj mm) noexcept + DVsmDefContFrame::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp index 09439f2e..0ff4ceb2 100644 --- a/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp @@ -48,7 +48,7 @@ namespace xo { } DVsmEvalArgsFrame * - DVsmEvalArgsFrame::shallow_copy(obj mm) const noexcept + DVsmEvalArgsFrame::shallow_move(obj mm) const noexcept { DVsmEvalArgsFrame * copy = (DVsmEvalArgsFrame *)mm.alloc_copy((std::byte *)this); diff --git a/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp index cc5427aa..075f7bd3 100644 --- a/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp @@ -36,7 +36,7 @@ namespace xo { } DVsmIfElseContFrame * - DVsmIfElseContFrame::shallow_copy(obj mm) noexcept + DVsmIfElseContFrame::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp index 8a4fc555..d6160e8d 100644 --- a/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp @@ -39,7 +39,7 @@ namespace xo { } DVsmSeqContFrame * - DVsmSeqContFrame::shallow_copy(obj mm) noexcept + DVsmSeqContFrame::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp index be8edfc4..33544907 100644 --- a/xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp +++ b/xo-interpreter2/src/interpreter2/IGCObject_DClosure.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DClosure::shallow_copy(DClosure & self, obj mm) noexcept -> Opaque + IGCObject_DClosure::shallow_move(DClosure & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DClosure::forward_children(DClosure & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp index 9bfd8cb3..3aa994fd 100644 --- a/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp +++ b/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVsmApplyClosureFrame::shallow_copy(DVsmApplyClosureFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmApplyClosureFrame::shallow_move(DVsmApplyClosureFrame & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVsmApplyClosureFrame::forward_children(DVsmApplyClosureFrame & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyFrame.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyFrame.cpp index 0c544c22..a1da32b8 100644 --- a/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyFrame.cpp +++ b/xo-interpreter2/src/interpreter2/IGCObject_DVsmApplyFrame.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVsmApplyFrame::shallow_copy(DVsmApplyFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmApplyFrame::shallow_move(DVsmApplyFrame & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVsmApplyFrame::forward_children(DVsmApplyFrame & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DVsmDefContFrame.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DVsmDefContFrame.cpp index c133e714..02abd4cb 100644 --- a/xo-interpreter2/src/interpreter2/IGCObject_DVsmDefContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/IGCObject_DVsmDefContFrame.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVsmDefContFrame::shallow_copy(DVsmDefContFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmDefContFrame::shallow_move(DVsmDefContFrame & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVsmDefContFrame::forward_children(DVsmDefContFrame & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp index 13c72cfe..8f33ece1 100644 --- a/xo-interpreter2/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp +++ b/xo-interpreter2/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVsmEvalArgsFrame::shallow_copy(DVsmEvalArgsFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmEvalArgsFrame::shallow_move(DVsmEvalArgsFrame & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVsmEvalArgsFrame::forward_children(DVsmEvalArgsFrame & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp index e28d5121..939d7ce4 100644 --- a/xo-interpreter2/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVsmIfElseContFrame::shallow_copy(DVsmIfElseContFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmIfElseContFrame::shallow_move(DVsmIfElseContFrame & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVsmIfElseContFrame::forward_children(DVsmIfElseContFrame & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp b/xo-interpreter2/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp index 8bdbd2fc..5d52ae74 100644 --- a/xo-interpreter2/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVsmSeqContFrame::shallow_copy(DVsmSeqContFrame & self, obj mm) noexcept -> Opaque + IGCObject_DVsmSeqContFrame::shallow_move(DVsmSeqContFrame & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVsmSeqContFrame::forward_children(DVsmSeqContFrame & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/facet/IGCObject_DLocalEnv.cpp b/xo-interpreter2/src/interpreter2/facet/IGCObject_DLocalEnv.cpp index 7e36de26..61e645f6 100644 --- a/xo-interpreter2/src/interpreter2/facet/IGCObject_DLocalEnv.cpp +++ b/xo-interpreter2/src/interpreter2/facet/IGCObject_DLocalEnv.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DLocalEnv::shallow_copy(DLocalEnv & self, obj mm) noexcept -> Opaque + IGCObject_DLocalEnv::shallow_move(DLocalEnv & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DLocalEnv::forward_children(DLocalEnv & self, obj gc) noexcept -> size_type diff --git a/xo-interpreter2/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp b/xo-interpreter2/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp index acb698ac..354478ad 100644 --- a/xo-interpreter2/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp +++ b/xo-interpreter2/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DVirtualSchematikaMachine::shallow_copy(DVirtualSchematikaMachine & self, obj mm) noexcept -> Opaque + IGCObject_DVirtualSchematikaMachine::shallow_move(DVirtualSchematikaMachine & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DVirtualSchematikaMachine::forward_children(DVirtualSchematikaMachine & self, obj gc) noexcept -> size_type diff --git a/xo-object2/include/xo/object2/DArray.hpp b/xo-object2/include/xo/object2/DArray.hpp index 332d126a..99d1b3d7 100644 --- a/xo-object2/include/xo/object2/DArray.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/DBoolean.hpp b/xo-object2/include/xo/object2/DBoolean.hpp index 72f5fad7..34ffda16 100644 --- a/xo-object2/include/xo/object2/DBoolean.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/DDictionary.hpp b/xo-object2/include/xo/object2/DDictionary.hpp index 1c77d2cf..5e6ecaec 100644 --- a/xo-object2/include/xo/object2/DDictionary.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/DFloat.hpp b/xo-object2/include/xo/object2/DFloat.hpp index 4e4be861..b7d56e9c 100644 --- a/xo-object2/include/xo/object2/DFloat.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/DInteger.hpp b/xo-object2/include/xo/object2/DInteger.hpp index a67e18d3..6a6194bf 100644 --- a/xo-object2/include/xo/object2/DInteger.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/DList.hpp b/xo-object2/include/xo/object2/DList.hpp index f6ea9d8b..8fff47d5 100644 --- a/xo-object2/include/xo/object2/DList.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/DRuntimeError.hpp b/xo-object2/include/xo/object2/DRuntimeError.hpp index 8a0ae33b..957c8481 100644 --- a/xo-object2/include/xo/object2/DRuntimeError.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/array/IGCObject_DArray.hpp b/xo-object2/include/xo/object2/array/IGCObject_DArray.hpp index 4854eff4..ab8a85f1 100644 --- a/xo-object2/include/xo/object2/array/IGCObject_DArray.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/boolean/IGCObject_DBoolean.hpp b/xo-object2/include/xo/object2/boolean/IGCObject_DBoolean.hpp index c437f0bc..5bc6e0c0 100644 --- a/xo-object2/include/xo/object2/boolean/IGCObject_DBoolean.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/dictionary/IGCObject_DDictionary.hpp b/xo-object2/include/xo/object2/dictionary/IGCObject_DDictionary.hpp index 323afd6e..16fef8cb 100644 --- a/xo-object2/include/xo/object2/dictionary/IGCObject_DDictionary.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/error/IGCObject_DRuntimeError.hpp b/xo-object2/include/xo/object2/error/IGCObject_DRuntimeError.hpp index f09be05a..62cc6109 100644 --- a/xo-object2/include/xo/object2/error/IGCObject_DRuntimeError.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/list/IGCObject_DList.hpp b/xo-object2/include/xo/object2/list/IGCObject_DList.hpp index e601ce0b..780ebda5 100644 --- a/xo-object2/include/xo/object2/list/IGCObject_DList.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp b/xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp index f9040b1b..b25e4626 100644 --- a/xo-object2/include/xo/object2/number/IGCObject_DFloat.hpp +++ b/xo-object2/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/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp b/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp index b6532128..a87f253a 100644 --- a/xo-object2/include/xo/object2/number/IGCObject_DInteger.hpp +++ b/xo-object2/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/xo-object2/src/object2/DArray.cpp b/xo-object2/src/object2/DArray.cpp index a55fbf97..2ae4ddc6 100644 --- a/xo-object2/src/object2/DArray.cpp +++ b/xo-object2/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/xo-object2/src/object2/DBoolean.cpp b/xo-object2/src/object2/DBoolean.cpp index ff5fa38a..cb25f9e0 100644 --- a/xo-object2/src/object2/DBoolean.cpp +++ b/xo-object2/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/xo-object2/src/object2/DDictionary.cpp b/xo-object2/src/object2/DDictionary.cpp index 263ea97d..739fcedc 100644 --- a/xo-object2/src/object2/DDictionary.cpp +++ b/xo-object2/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/xo-object2/src/object2/DFloat.cpp b/xo-object2/src/object2/DFloat.cpp index 7fc0bfbf..f7f8ff3e 100644 --- a/xo-object2/src/object2/DFloat.cpp +++ b/xo-object2/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/xo-object2/src/object2/DInteger.cpp b/xo-object2/src/object2/DInteger.cpp index 284806d1..7cbcedf0 100644 --- a/xo-object2/src/object2/DInteger.cpp +++ b/xo-object2/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/xo-object2/src/object2/DList.cpp b/xo-object2/src/object2/DList.cpp index 6f93147e..be869073 100644 --- a/xo-object2/src/object2/DList.cpp +++ b/xo-object2/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/xo-object2/src/object2/DRuntimeError.cpp b/xo-object2/src/object2/DRuntimeError.cpp index b683716e..1f34596b 100644 --- a/xo-object2/src/object2/DRuntimeError.cpp +++ b/xo-object2/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/xo-object2/src/object2/IGCObject_DArray.cpp b/xo-object2/src/object2/IGCObject_DArray.cpp index 9b28a3de..7cde63e1 100644 --- a/xo-object2/src/object2/IGCObject_DArray.cpp +++ b/xo-object2/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/xo-object2/src/object2/IGCObject_DBoolean.cpp b/xo-object2/src/object2/IGCObject_DBoolean.cpp index e6bd6000..ef503af9 100644 --- a/xo-object2/src/object2/IGCObject_DBoolean.cpp +++ b/xo-object2/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/xo-object2/src/object2/IGCObject_DDictionary.cpp b/xo-object2/src/object2/IGCObject_DDictionary.cpp index 0466edd5..9d4bae65 100644 --- a/xo-object2/src/object2/IGCObject_DDictionary.cpp +++ b/xo-object2/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/xo-object2/src/object2/IGCObject_DFloat.cpp b/xo-object2/src/object2/IGCObject_DFloat.cpp index 4b1ab562..a22a1b2f 100644 --- a/xo-object2/src/object2/IGCObject_DFloat.cpp +++ b/xo-object2/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/xo-object2/src/object2/IGCObject_DInteger.cpp b/xo-object2/src/object2/IGCObject_DInteger.cpp index fbb31908..4f74e5fe 100644 --- a/xo-object2/src/object2/IGCObject_DInteger.cpp +++ b/xo-object2/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/xo-object2/src/object2/IGCObject_DList.cpp b/xo-object2/src/object2/IGCObject_DList.cpp index 80cd7cd1..2512cc32 100644 --- a/xo-object2/src/object2/IGCObject_DList.cpp +++ b/xo-object2/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/xo-object2/src/object2/IGCObject_DRuntimeError.cpp b/xo-object2/src/object2/IGCObject_DRuntimeError.cpp index 6d167819..cc755821 100644 --- a/xo-object2/src/object2/IGCObject_DRuntimeError.cpp +++ b/xo-object2/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 diff --git a/xo-procedure2/include/xo/procedure2/DPrimitive.hpp b/xo-procedure2/include/xo/procedure2/DPrimitive.hpp index 43310575..f602ebb6 100644 --- a/xo-procedure2/include/xo/procedure2/DPrimitive.hpp +++ b/xo-procedure2/include/xo/procedure2/DPrimitive.hpp @@ -134,7 +134,7 @@ namespace xo { /** @defgroup scm-primitive-gcobject-facet **/ ///@{ std::size_t shallow_size() const noexcept; - Primitive * shallow_copy(obj mm) const noexcept; + Primitive * shallow_move(obj mm) const noexcept; std::size_t forward_children(obj gc) noexcept; ///@} @@ -198,7 +198,7 @@ namespace xo { template Primitive * - Primitive::shallow_copy(obj mm) const noexcept { + Primitive::shallow_move(obj mm) const noexcept { void * mem = mm.alloc_copy((std::byte *)this); if (mem) { diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp index 6660dad2..cecc298c 100644 --- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp +++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_0.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DPrimitive_gco_0 & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DPrimitive_gco_0 & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DPrimitive_gco_0 & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DPrimitive_gco_0 & self, obj gc) noexcept; ///@} diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp index a4aa56e2..ac5c4f51 100644 --- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp +++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_1_gco.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DPrimitive_gco_1_gco & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DPrimitive_gco_1_gco & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DPrimitive_gco_1_gco & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DPrimitive_gco_1_gco & self, obj gc) noexcept; ///@} diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp index a2e6e32a..772aabb3 100644 --- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp +++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_dict_string.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DPrimitive_gco_2_dict_string & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DPrimitive_gco_2_dict_string & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DPrimitive_gco_2_dict_string & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DPrimitive_gco_2_dict_string & self, obj gc) noexcept; ///@} diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp index bad1200f..266d1f42 100644 --- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp +++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DPrimitive_gco_2_gco_gco & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DPrimitive_gco_2_gco_gco & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DPrimitive_gco_2_gco_gco & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DPrimitive_gco_2_gco_gco & self, obj gc) noexcept; ///@} diff --git a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp index 6b5ddc3b..7abc1367 100644 --- a/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp +++ b/xo-procedure2/include/xo/procedure2/detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DPrimitive_gco_3_dict_string_gco & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DPrimitive_gco_3_dict_string_gco & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DPrimitive_gco_3_dict_string_gco & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DPrimitive_gco_3_dict_string_gco & self, obj gc) noexcept; ///@} diff --git a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp index 9e078589..948d1d60 100644 --- a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp +++ b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_0.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DPrimitive_gco_0::shallow_copy(DPrimitive_gco_0 & self, obj mm) noexcept -> Opaque + IGCObject_DPrimitive_gco_0::shallow_move(DPrimitive_gco_0 & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DPrimitive_gco_0::forward_children(DPrimitive_gco_0 & self, obj gc) noexcept -> size_type diff --git a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp index b9a1b354..b5c1754b 100644 --- a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp +++ b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_1_gco.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DPrimitive_gco_1_gco::shallow_copy(DPrimitive_gco_1_gco & self, obj mm) noexcept -> Opaque + IGCObject_DPrimitive_gco_1_gco::shallow_move(DPrimitive_gco_1_gco & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DPrimitive_gco_1_gco::forward_children(DPrimitive_gco_1_gco & self, obj gc) noexcept -> size_type diff --git a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_dict_string.cpp b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_dict_string.cpp index 7bc9965f..7c58550a 100644 --- a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_dict_string.cpp +++ b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_dict_string.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DPrimitive_gco_2_dict_string::shallow_copy(DPrimitive_gco_2_dict_string & self, obj mm) noexcept -> Opaque + IGCObject_DPrimitive_gco_2_dict_string::shallow_move(DPrimitive_gco_2_dict_string & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DPrimitive_gco_2_dict_string::forward_children(DPrimitive_gco_2_dict_string & self, obj gc) noexcept -> size_type diff --git a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp index e770888b..347295b3 100644 --- a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp +++ b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_2_gco_gco.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DPrimitive_gco_2_gco_gco::shallow_copy(DPrimitive_gco_2_gco_gco & self, obj mm) noexcept -> Opaque + IGCObject_DPrimitive_gco_2_gco_gco::shallow_move(DPrimitive_gco_2_gco_gco & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DPrimitive_gco_2_gco_gco::forward_children(DPrimitive_gco_2_gco_gco & self, obj gc) noexcept -> size_type diff --git a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp index f2dd967d..26a9f3fd 100644 --- a/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp +++ b/xo-procedure2/src/procedure2/facet/IGCObject_DPrimitive_gco_3_dict_string_gco.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DPrimitive_gco_3_dict_string_gco::shallow_copy(DPrimitive_gco_3_dict_string_gco & self, obj mm) noexcept -> Opaque + IGCObject_DPrimitive_gco_3_dict_string_gco::shallow_move(DPrimitive_gco_3_dict_string_gco & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DPrimitive_gco_3_dict_string_gco::forward_children(DPrimitive_gco_3_dict_string_gco & self, obj gc) noexcept -> size_type diff --git a/xo-reader2/include/xo/reader2/DGlobalEnv.hpp b/xo-reader2/include/xo/reader2/DGlobalEnv.hpp index fa9d52f8..0c1536ee 100644 --- a/xo-reader2/include/xo/reader2/DGlobalEnv.hpp +++ b/xo-reader2/include/xo/reader2/DGlobalEnv.hpp @@ -71,7 +71,7 @@ namespace xo { ///@{ std::size_t shallow_size() const noexcept; - DGlobalEnv * shallow_copy(obj mm) noexcept; + DGlobalEnv * shallow_move(obj mm) noexcept; std::size_t forward_children(obj gc) noexcept; ///@} diff --git a/xo-reader2/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp b/xo-reader2/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp index e4ff328a..f8ff90b7 100644 --- a/xo-reader2/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp +++ b/xo-reader2/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DGlobalEnv & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DGlobalEnv & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DGlobalEnv & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DGlobalEnv & self, obj gc) noexcept; ///@} diff --git a/xo-reader2/include/xo/reader2/env/IGCObject_DSchematikaParser.hpp b/xo-reader2/include/xo/reader2/env/IGCObject_DSchematikaParser.hpp index afe0d6b5..03832e87 100644 --- a/xo-reader2/include/xo/reader2/env/IGCObject_DSchematikaParser.hpp +++ b/xo-reader2/include/xo/reader2/env/IGCObject_DSchematikaParser.hpp @@ -53,7 +53,7 @@ namespace xo { /** memory consumption for this instance **/ static size_type shallow_size(const DSchematikaParser & self) noexcept; /** copy instance using allocator **/ - static Opaque shallow_copy(const DSchematikaParser & self, obj mm) noexcept; + static Opaque shallow_move(const DSchematikaParser & self, obj mm) noexcept; // non-const methods /** during GC: forward immdiate children **/ @@ -64,4 +64,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end */ \ No newline at end of file +/* end */ diff --git a/xo-reader2/include/xo/reader2/parser/DSchematikaParser.hpp b/xo-reader2/include/xo/reader2/parser/DSchematikaParser.hpp index 18e7989c..da6862ab 100644 --- a/xo-reader2/include/xo/reader2/parser/DSchematikaParser.hpp +++ b/xo-reader2/include/xo/reader2/parser/DSchematikaParser.hpp @@ -156,7 +156,7 @@ namespace xo { * - SchematikaParser partially supports the gcobject facet so it can be a collector root node. * It's not actually moveable (since its ParserStateMachine member isn't moveable), * Only the forward_children method is load-bearing. - * + * **/ class DSchematikaParser { public: @@ -294,7 +294,7 @@ namespace xo { std::size_t shallow_size() const noexcept; /** not implemented (SchematikaParser not designed to be copyable) **/ - DSchematikaParser * shallow_copy(obj mm) const noexcept; + DSchematikaParser * shallow_move(obj mm) const noexcept; /** forward gc-aware children **/ std::size_t forward_children(obj gc) noexcept; diff --git a/xo-reader2/include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp b/xo-reader2/include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp index 5c8e1975..e6fc39d9 100644 --- a/xo-reader2/include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp +++ b/xo-reader2/include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DSchematikaParser & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DSchematikaParser & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DSchematikaParser & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DSchematikaParser & self, obj gc) noexcept; ///@} diff --git a/xo-reader2/src/reader2/DGlobalEnv.cpp b/xo-reader2/src/reader2/DGlobalEnv.cpp index c404d21a..17a86798 100644 --- a/xo-reader2/src/reader2/DGlobalEnv.cpp +++ b/xo-reader2/src/reader2/DGlobalEnv.cpp @@ -114,7 +114,7 @@ namespace xo { } DGlobalEnv * - DGlobalEnv::shallow_copy(obj mm) noexcept + DGlobalEnv::shallow_move(obj mm) noexcept { return mm.std_copy_for(this); } diff --git a/xo-reader2/src/reader2/DSchematikaParser.cpp b/xo-reader2/src/reader2/DSchematikaParser.cpp index a18d9735..f26fe62a 100644 --- a/xo-reader2/src/reader2/DSchematikaParser.cpp +++ b/xo-reader2/src/reader2/DSchematikaParser.cpp @@ -191,7 +191,7 @@ namespace xo { } DSchematikaParser * - DSchematikaParser::shallow_copy(obj mm) const noexcept + DSchematikaParser::shallow_move(obj mm) const noexcept { (void)mm; diff --git a/xo-reader2/src/reader2/facet/IGCObject_DGlobalEnv.cpp b/xo-reader2/src/reader2/facet/IGCObject_DGlobalEnv.cpp index 9a3e3e45..f8edbb58 100644 --- a/xo-reader2/src/reader2/facet/IGCObject_DGlobalEnv.cpp +++ b/xo-reader2/src/reader2/facet/IGCObject_DGlobalEnv.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DGlobalEnv::shallow_copy(DGlobalEnv & self, obj mm) noexcept -> Opaque + IGCObject_DGlobalEnv::shallow_move(DGlobalEnv & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DGlobalEnv::forward_children(DGlobalEnv & self, obj gc) noexcept -> size_type diff --git a/xo-reader2/src/reader2/facet/IGCObject_DSchematikaParser.cpp b/xo-reader2/src/reader2/facet/IGCObject_DSchematikaParser.cpp index 582eb902..8ba2349c 100644 --- a/xo-reader2/src/reader2/facet/IGCObject_DSchematikaParser.cpp +++ b/xo-reader2/src/reader2/facet/IGCObject_DSchematikaParser.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DSchematikaParser::shallow_copy(DSchematikaParser & self, obj mm) noexcept -> Opaque + IGCObject_DSchematikaParser::shallow_move(DSchematikaParser & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DSchematikaParser::forward_children(DSchematikaParser & self, obj gc) noexcept -> size_type diff --git a/xo-stringtable2/include/xo/stringtable2/DString.hpp b/xo-stringtable2/include/xo/stringtable2/DString.hpp index bb57e3da..bfcd30fa 100644 --- a/xo-stringtable2/include/xo/stringtable2/DString.hpp +++ b/xo-stringtable2/include/xo/stringtable2/DString.hpp @@ -245,7 +245,7 @@ namespace xo { size_type shallow_size() const noexcept; /** clone string, using memory from allocator @p mm **/ - DString * shallow_copy(obj mm) const noexcept; + DString * shallow_move(obj mm) const noexcept; size_type forward_children(obj gc) noexcept; /** fixup child pointers (trivial for DString, no children) diff --git a/xo-stringtable2/include/xo/stringtable2/DUniqueString.hpp b/xo-stringtable2/include/xo/stringtable2/DUniqueString.hpp index 9a4357e0..d5b75626 100644 --- a/xo-stringtable2/include/xo/stringtable2/DUniqueString.hpp +++ b/xo-stringtable2/include/xo/stringtable2/DUniqueString.hpp @@ -91,7 +91,7 @@ namespace xo { std::size_t shallow_size() const noexcept; /** clone unique string, using memory from allocator @p mm. **/ - DUniqueString * shallow_copy(obj mm) const noexcept; + DUniqueString * shallow_move(obj mm) const noexcept; /** fixup child pointers (trivial for DUniqueString, no gc-owned children **/ std::size_t forward_children(obj gc) noexcept; diff --git a/xo-stringtable2/include/xo/stringtable2/string/IGCObject_DString.hpp b/xo-stringtable2/include/xo/stringtable2/string/IGCObject_DString.hpp index c04d9a01..6dc2ad1e 100644 --- a/xo-stringtable2/include/xo/stringtable2/string/IGCObject_DString.hpp +++ b/xo-stringtable2/include/xo/stringtable2/string/IGCObject_DString.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DString & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DString & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DString & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DString & self, obj gc) noexcept; ///@} diff --git a/xo-stringtable2/include/xo/stringtable2/uniquestring/IGCObject_DUniqueString.hpp b/xo-stringtable2/include/xo/stringtable2/uniquestring/IGCObject_DUniqueString.hpp index 4701e503..1d6b8db8 100644 --- a/xo-stringtable2/include/xo/stringtable2/uniquestring/IGCObject_DUniqueString.hpp +++ b/xo-stringtable2/include/xo/stringtable2/uniquestring/IGCObject_DUniqueString.hpp @@ -54,8 +54,8 @@ namespace xo { static size_type shallow_size(const DUniqueString & self) noexcept; // non-const methods - /** copy instance using allocator **/ - static Opaque shallow_copy(DUniqueString & self, obj mm) noexcept; + /** move instance using allocator **/ + static Opaque shallow_move(DUniqueString & self, obj mm) noexcept; /** during GC: forward immdiate children **/ static size_type forward_children(DUniqueString & self, obj gc) noexcept; ///@} diff --git a/xo-stringtable2/src/stringtable2/DString.cpp b/xo-stringtable2/src/stringtable2/DString.cpp index 230fa4a4..f04db7f4 100644 --- a/xo-stringtable2/src/stringtable2/DString.cpp +++ b/xo-stringtable2/src/stringtable2/DString.cpp @@ -156,7 +156,7 @@ namespace xo { } DString * - DString::shallow_copy(obj mm) const noexcept + DString::shallow_move(obj mm) const noexcept { DString * copy = (DString *)mm.alloc_copy((std::byte *)this); diff --git a/xo-stringtable2/src/stringtable2/DUniqueString.cpp b/xo-stringtable2/src/stringtable2/DUniqueString.cpp index 98a7b33c..dcf7cc53 100644 --- a/xo-stringtable2/src/stringtable2/DUniqueString.cpp +++ b/xo-stringtable2/src/stringtable2/DUniqueString.cpp @@ -88,7 +88,7 @@ namespace xo { } DUniqueString * - DUniqueString::shallow_copy(obj mm) const noexcept + DUniqueString::shallow_move(obj mm) const noexcept { // well-posed, but not expected to be used. assert(false); diff --git a/xo-stringtable2/src/stringtable2/IGCObject_DString.cpp b/xo-stringtable2/src/stringtable2/IGCObject_DString.cpp index 0cc3518c..c3f6503a 100644 --- a/xo-stringtable2/src/stringtable2/IGCObject_DString.cpp +++ b/xo-stringtable2/src/stringtable2/IGCObject_DString.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DString::shallow_copy(DString & self, obj mm) noexcept -> Opaque + IGCObject_DString::shallow_move(DString & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DString::forward_children(DString & self, obj gc) noexcept -> size_type diff --git a/xo-stringtable2/src/stringtable2/IGCObject_DUniqueString.cpp b/xo-stringtable2/src/stringtable2/IGCObject_DUniqueString.cpp index ba3e24e7..034b9664 100644 --- a/xo-stringtable2/src/stringtable2/IGCObject_DUniqueString.cpp +++ b/xo-stringtable2/src/stringtable2/IGCObject_DUniqueString.cpp @@ -22,9 +22,9 @@ namespace xo { } auto - IGCObject_DUniqueString::shallow_copy(DUniqueString & self, obj mm) noexcept -> Opaque + IGCObject_DUniqueString::shallow_move(DUniqueString & self, obj mm) noexcept -> Opaque { - return self.shallow_copy(mm); + return self.shallow_move(mm); } auto IGCObject_DUniqueString::forward_children(DUniqueString & self, obj gc) noexcept -> size_type diff --git a/xo-type/include/xo/type/DArrayType.hpp b/xo-type/include/xo/type/DArrayType.hpp index 2d12f19b..a2594649 100644 --- a/xo-type/include/xo/type/DArrayType.hpp +++ b/xo-type/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/xo-type/include/xo/type/DAtomicType.hpp b/xo-type/include/xo/type/DAtomicType.hpp index 406ed469..7661955c 100644 --- a/xo-type/include/xo/type/DAtomicType.hpp +++ b/xo-type/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/xo-type/include/xo/type/DFunctionType.hpp b/xo-type/include/xo/type/DFunctionType.hpp index c3d409d6..328c93b3 100644 --- a/xo-type/include/xo/type/DFunctionType.hpp +++ b/xo-type/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/xo-type/include/xo/type/DListType.hpp b/xo-type/include/xo/type/DListType.hpp index 8b5e057a..2dfedb27 100644 --- a/xo-type/include/xo/type/DListType.hpp +++ b/xo-type/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/xo-type/include/xo/type/array/IGCObject_DArrayType.hpp b/xo-type/include/xo/type/array/IGCObject_DArrayType.hpp index a436a089..8c1bfeee 100644 --- a/xo-type/include/xo/type/array/IGCObject_DArrayType.hpp +++ b/xo-type/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/xo-type/include/xo/type/atomic/IGCObject_DAtomicType.hpp b/xo-type/include/xo/type/atomic/IGCObject_DAtomicType.hpp index 4a5a5700..00763e4a 100644 --- a/xo-type/include/xo/type/atomic/IGCObject_DAtomicType.hpp +++ b/xo-type/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/xo-type/include/xo/type/function/IGCObject_DFunctionType.hpp b/xo-type/include/xo/type/function/IGCObject_DFunctionType.hpp index bc632857..9c8727cd 100644 --- a/xo-type/include/xo/type/function/IGCObject_DFunctionType.hpp +++ b/xo-type/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/xo-type/include/xo/type/list/IGCObject_DListType.hpp b/xo-type/include/xo/type/list/IGCObject_DListType.hpp index cd017ec0..2459fff4 100644 --- a/xo-type/include/xo/type/list/IGCObject_DListType.hpp +++ b/xo-type/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/xo-type/include/xo/type/typevar/DTypeVarRef.hpp b/xo-type/include/xo/type/typevar/DTypeVarRef.hpp index d53caa0c..4ce9a667 100644 --- a/xo-type/include/xo/type/typevar/DTypeVarRef.hpp +++ b/xo-type/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/xo-type/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp b/xo-type/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp index 56780e3e..d0250871 100644 --- a/xo-type/include/xo/type/typevar/IGCObject_DTypeVarRef.hpp +++ b/xo-type/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/xo-type/src/type/DArrayType.cpp b/xo-type/src/type/DArrayType.cpp index f13f234a..b7c628af 100644 --- a/xo-type/src/type/DArrayType.cpp +++ b/xo-type/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/xo-type/src/type/DAtomicType.cpp b/xo-type/src/type/DAtomicType.cpp index 347e7f5f..f25a159e 100644 --- a/xo-type/src/type/DAtomicType.cpp +++ b/xo-type/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/xo-type/src/type/DFunctionType.cpp b/xo-type/src/type/DFunctionType.cpp index 4cc83dba..f9ac920e 100644 --- a/xo-type/src/type/DFunctionType.cpp +++ b/xo-type/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/xo-type/src/type/DListType.cpp b/xo-type/src/type/DListType.cpp index b4e2cd4e..2906053d 100644 --- a/xo-type/src/type/DListType.cpp +++ b/xo-type/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/xo-type/src/type/DTypeVarRef.cpp b/xo-type/src/type/DTypeVarRef.cpp index ec021ab6..d618a2f2 100644 --- a/xo-type/src/type/DTypeVarRef.cpp +++ b/xo-type/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/xo-type/src/type/IGCObject_DArrayType.cpp b/xo-type/src/type/IGCObject_DArrayType.cpp index 43287c83..c9375805 100644 --- a/xo-type/src/type/IGCObject_DArrayType.cpp +++ b/xo-type/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/xo-type/src/type/IGCObject_DAtomicType.cpp b/xo-type/src/type/IGCObject_DAtomicType.cpp index a5691676..3916d761 100644 --- a/xo-type/src/type/IGCObject_DAtomicType.cpp +++ b/xo-type/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/xo-type/src/type/IGCObject_DFunctionType.cpp b/xo-type/src/type/IGCObject_DFunctionType.cpp index 9ba3ff39..4c7c7c13 100644 --- a/xo-type/src/type/IGCObject_DFunctionType.cpp +++ b/xo-type/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/xo-type/src/type/IGCObject_DListType.cpp b/xo-type/src/type/IGCObject_DListType.cpp index da899cd9..ff3820d0 100644 --- a/xo-type/src/type/IGCObject_DListType.cpp +++ b/xo-type/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/xo-type/src/type/IGCObject_DTypeVarRef.cpp b/xo-type/src/type/IGCObject_DTypeVarRef.cpp index ade79944..9dc58dc0 100644 --- a/xo-type/src/type/IGCObject_DTypeVarRef.cpp +++ b/xo-type/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