diff --git a/include/xo/reader2/DGlobalEnv.hpp b/include/xo/reader2/DGlobalEnv.hpp index fa9d52f8..0c1536ee 100644 --- a/include/xo/reader2/DGlobalEnv.hpp +++ b/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/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp b/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp index e4ff328a..f8ff90b7 100644 --- a/include/xo/reader2/env/IGCObject_DGlobalEnv.hpp +++ b/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/include/xo/reader2/env/IGCObject_DSchematikaParser.hpp b/include/xo/reader2/env/IGCObject_DSchematikaParser.hpp index afe0d6b5..03832e87 100644 --- a/include/xo/reader2/env/IGCObject_DSchematikaParser.hpp +++ b/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/include/xo/reader2/parser/DSchematikaParser.hpp b/include/xo/reader2/parser/DSchematikaParser.hpp index 18e7989c..da6862ab 100644 --- a/include/xo/reader2/parser/DSchematikaParser.hpp +++ b/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/include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp b/include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp index 5c8e1975..e6fc39d9 100644 --- a/include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp +++ b/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/src/reader2/DGlobalEnv.cpp b/src/reader2/DGlobalEnv.cpp index c404d21a..17a86798 100644 --- a/src/reader2/DGlobalEnv.cpp +++ b/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/src/reader2/DSchematikaParser.cpp b/src/reader2/DSchematikaParser.cpp index a18d9735..f26fe62a 100644 --- a/src/reader2/DSchematikaParser.cpp +++ b/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/src/reader2/facet/IGCObject_DGlobalEnv.cpp b/src/reader2/facet/IGCObject_DGlobalEnv.cpp index 9a3e3e45..f8edbb58 100644 --- a/src/reader2/facet/IGCObject_DGlobalEnv.cpp +++ b/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/src/reader2/facet/IGCObject_DSchematikaParser.cpp b/src/reader2/facet/IGCObject_DSchematikaParser.cpp index 582eb902..8ba2349c 100644 --- a/src/reader2/facet/IGCObject_DSchematikaParser.cpp +++ b/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