roland/xo-reader2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: rename GCObject.shallow_copy -> shallow_move

Browse source 
resolve conflict since relying on move constructor in std_copy_for
This commit is contained in:
Roland Conybeare 2026-04-04 15:00:53 -04:00
commit 73b2561aa8
9 changed files with 15 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/xo/reader2/DGlobalEnv.hpp
View file

@ -71,7 +71,7 @@ namespace xo {
///@{
std::size_t shallow_size() const noexcept;
DGlobalEnv * shallow_copy(obj<AAllocator> mm) noexcept;
DGlobalEnv * shallow_move(obj<AAllocator> mm) noexcept;
std::size_t forward_children(obj<ACollector> gc) noexcept;
///@}

4
include/xo/reader2/env/IGCObject_DGlobalEnv.hpp vendored
View file

@ -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<AAllocator> mm) noexcept;
/** move instance using allocator **/
static Opaque shallow_move(DGlobalEnv & self, obj<AAllocator> mm) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DGlobalEnv & self, obj<ACollector> gc) noexcept;
///@}

4
include/xo/reader2/env/IGCObject_DSchematikaParser.hpp vendored
View file

@ -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<AAllocator> mm) noexcept;
static Opaque shallow_move(const DSchematikaParser & self, obj<AAllocator> mm) noexcept;
// non-const methods
/** during GC: forward immdiate children **/
@ -64,4 +64,4 @@ namespace xo {
} /*namespace scm*/
} /*namespace xo*/
/* end */
/* end */

4
include/xo/reader2/parser/DSchematikaParser.hpp
View file

@ -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<AAllocator> mm) const noexcept;
DSchematikaParser * shallow_move(obj<AAllocator> mm) const noexcept;
/** forward gc-aware children **/
std::size_t forward_children(obj<ACollector> gc) noexcept;

4
include/xo/reader2/parser/IGCObject_DSchematikaParser.hpp
View file

@ -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<AAllocator> mm) noexcept;
/** move instance using allocator **/
static Opaque shallow_move(DSchematikaParser & self, obj<AAllocator> mm) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DSchematikaParser & self, obj<ACollector> gc) noexcept;
///@}

2
src/reader2/DGlobalEnv.cpp
View file

@ -114,7 +114,7 @@ namespace xo {
}
DGlobalEnv *
DGlobalEnv::shallow_copy(obj<AAllocator> mm) noexcept
DGlobalEnv::shallow_move(obj<AAllocator> mm) noexcept
{
return mm.std_copy_for<DGlobalEnv>(this);
}

2
src/reader2/DSchematikaParser.cpp
View file

@ -191,7 +191,7 @@ namespace xo {
}
DSchematikaParser *
DSchematikaParser::shallow_copy(obj<AAllocator> mm) const noexcept
DSchematikaParser::shallow_move(obj<AAllocator> mm) const noexcept
{
(void)mm;

4
src/reader2/facet/IGCObject_DGlobalEnv.cpp
View file

@ -22,9 +22,9 @@ namespace xo {
}
auto
IGCObject_DGlobalEnv::shallow_copy(DGlobalEnv & self, obj<AAllocator> mm) noexcept -> Opaque
IGCObject_DGlobalEnv::shallow_move(DGlobalEnv & self, obj<AAllocator> mm) noexcept -> Opaque
{
return self.shallow_copy(mm);
return self.shallow_move(mm);
}
auto
IGCObject_DGlobalEnv::forward_children(DGlobalEnv & self, obj<ACollector> gc) noexcept -> size_type

4
src/reader2/facet/IGCObject_DSchematikaParser.cpp
View file

@ -22,9 +22,9 @@ namespace xo {
}
auto
IGCObject_DSchematikaParser::shallow_copy(DSchematikaParser & self, obj<AAllocator> mm) noexcept -> Opaque
IGCObject_DSchematikaParser::shallow_move(DSchematikaParser & self, obj<AAllocator> mm) noexcept -> Opaque
{
return self.shallow_copy(mm);
return self.shallow_move(mm);
}
auto
IGCObject_DSchematikaParser::forward_children(DSchematikaParser & self, obj<ACollector> gc) noexcept -> size_type