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

refactor: rename shallow_copy -> shallow_move + streamline

Browse source 
Use RCollector.std_copy_for where appropriate
This commit is contained in:
Roland Conybeare 2026-04-04 16:33:35 -04:00
commit 8ac5ba9bbb
28 changed files with 45 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/xo/object2/DArray.hpp
View file

@ -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_move(obj<AAllocator> mm) const noexcept;
DArray * shallow_move(obj<ACollector> gc) noexcept;
/** forward elements to @p gc to-space; replace originals with forarding pointers **/
AAllocator::size_type forward_children(obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/DBoolean.hpp
View file

@ -38,7 +38,7 @@ namespace xo {
// GCObject facet
std::size_t shallow_size() const noexcept;
DBoolean * shallow_move(obj<AAllocator> mm) const noexcept;
DBoolean * shallow_move(obj<ACollector> gc) noexcept;
std::size_t forward_children(obj<ACollector> gc) noexcept;
private:

2
include/xo/object2/DDictionary.hpp
View file

@ -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_move(obj<AAllocator> mm) noexcept;
DDictionary * shallow_move(obj<ACollector> gc) noexcept;
/** forward elements to @p gc to-space; replace originals with forarding pointers **/
AAllocator::size_type forward_children(obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/DFloat.hpp
View file

@ -35,7 +35,7 @@ namespace xo {
// GCObject facet
std::size_t shallow_size() const noexcept;
DFloat * shallow_move(obj<AAllocator> mm) const noexcept;
DFloat * shallow_move(obj<ACollector> gc) noexcept;
std::size_t forward_children(obj<ACollector> gc) noexcept;
private:

2
include/xo/object2/DInteger.hpp
View file

@ -40,7 +40,7 @@ namespace xo {
// GCObject facet
std::size_t shallow_size() const noexcept;
DInteger * shallow_move(obj<AAllocator> mm) const noexcept;
DInteger * shallow_move(obj<ACollector> gc) noexcept;
std::size_t forward_children(obj<ACollector> gc) noexcept;
private:

2
include/xo/object2/DList.hpp
View file

@ -70,7 +70,7 @@ namespace xo {
/** @defgroup xo-scm-list-gcobject-facet gcobject facet **/
///@{
size_type shallow_size() const noexcept;
DList * shallow_move(obj<AAllocator> mm) noexcept;
DList * shallow_move(obj<ACollector> gc) noexcept;
size_type forward_children(obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/DRuntimeError.hpp
View file

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

2
include/xo/object2/array/IGCObject_DArray.hpp
View file

@ -53,7 +53,7 @@ namespace xo {
// non-const methods
/** move instance using allocator **/
static Opaque shallow_move(DArray & self, obj<AAllocator> mm) noexcept;
static Opaque shallow_move(DArray & self, obj<ACollector> gc) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DArray & self, obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/boolean/IGCObject_DBoolean.hpp
View file

@ -53,7 +53,7 @@ namespace xo {
// non-const methods
/** move instance using allocator **/
static Opaque shallow_move(DBoolean & self, obj<AAllocator> mm) noexcept;
static Opaque shallow_move(DBoolean & self, obj<ACollector> gc) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DBoolean & self, obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/dictionary/IGCObject_DDictionary.hpp
View file

@ -53,7 +53,7 @@ namespace xo {
// non-const methods
/** move instance using allocator **/
static Opaque shallow_move(DDictionary & self, obj<AAllocator> mm) noexcept;
static Opaque shallow_move(DDictionary & self, obj<ACollector> gc) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DDictionary & self, obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/error/IGCObject_DRuntimeError.hpp
View file

@ -53,7 +53,7 @@ namespace xo {
// non-const methods
/** move instance using allocator **/
static Opaque shallow_move(DRuntimeError & self, obj<AAllocator> mm) noexcept;
static Opaque shallow_move(DRuntimeError & self, obj<ACollector> gc) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DRuntimeError & self, obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/list/IGCObject_DList.hpp
View file

@ -53,7 +53,7 @@ namespace xo {
// non-const methods
/** move instance using allocator **/
static Opaque shallow_move(DList & self, obj<AAllocator> mm) noexcept;
static Opaque shallow_move(DList & self, obj<ACollector> gc) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DList & self, obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/number/IGCObject_DFloat.hpp
View file

@ -54,7 +54,7 @@ namespace xo {
// non-const methods
/** move instance using allocator **/
static Opaque shallow_move(DFloat & self, obj<AAllocator> mm) noexcept;
static Opaque shallow_move(DFloat & self, obj<ACollector> gc) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DFloat & self, obj<ACollector> gc) noexcept;
///@}

2
include/xo/object2/number/IGCObject_DInteger.hpp
View file

@ -53,7 +53,7 @@ namespace xo {
// non-const methods
/** move instance using allocator **/
static Opaque shallow_move(DInteger & self, obj<AAllocator> mm) noexcept;
static Opaque shallow_move(DInteger & self, obj<ACollector> gc) noexcept;
/** during GC: forward immdiate children **/
static size_type forward_children(DInteger & self, obj<ACollector> gc) noexcept;
///@}

7
src/object2/DArray.cpp
View file

@ -181,9 +181,12 @@ namespace xo {
}
DArray *
DArray::shallow_move(obj<AAllocator> mm) const noexcept
DArray::shallow_move(obj<ACollector> gc) noexcept
{
DArray * copy = (DArray *)mm.alloc_copy((std::byte *)this);
// note: not using gc.std_copy_for() here.
// flexible array -> compiler doesn't know actual DArray allocation size
DArray * copy = (DArray *)gc.alloc_copy((std::byte *)this);
if (copy) {
copy->capacity_ = capacity_;

9
src/object2/DBoolean.cpp
View file

@ -36,14 +36,9 @@ namespace xo {
}
DBoolean *
DBoolean::shallow_move(obj<AAllocator> mm) const noexcept
DBoolean::shallow_move(obj<ACollector> gc) noexcept
{
DBoolean * copy = (DBoolean *)mm.alloc_copy((std::byte *)this);
if (copy)
*copy = *this;
return copy;
return gc.std_copy_for(this);
}
size_t

4
src/object2/DDictionary.cpp
View file

@ -274,9 +274,9 @@ namespace xo {
}
DDictionary *
DDictionary::shallow_move(obj<AAllocator> mm) noexcept
DDictionary::shallow_move(obj<ACollector> gc) noexcept
{
return mm.std_copy_for(this);
return gc.std_copy_for(this);
}
std::size_t

9
src/object2/DFloat.cpp
View file

@ -34,14 +34,9 @@ namespace xo {
}
DFloat *
DFloat::shallow_move(obj<AAllocator> mm) const noexcept
DFloat::shallow_move(obj<ACollector> gc) noexcept
{
DFloat * copy = (DFloat *)mm.alloc_copy((std::byte *)this);
if (copy)
*copy = *this;
return copy;
return gc.std_copy_for(this);
}
size_t

9
src/object2/DInteger.cpp
View file

@ -34,14 +34,9 @@ namespace xo {
}
DInteger *
DInteger::shallow_move(obj<AAllocator> mm) const noexcept
DInteger::shallow_move(obj<ACollector> gc) noexcept
{
DInteger * copy = (DInteger *)mm.alloc_copy((std::byte *)this);
if (copy)
*copy = *this;
return copy;
return gc.std_copy_for(this);
}
size_t

4
src/object2/DList.cpp
View file

@ -185,9 +185,9 @@ namespace xo {
}
DList *
DList::shallow_move(obj<AAllocator> mm) noexcept
DList::shallow_move(obj<ACollector> gc) noexcept
{
return mm.std_copy_for(this);
return gc.std_copy_for(this);
}
auto

9
src/object2/DRuntimeError.cpp
View file

@ -59,14 +59,9 @@ namespace xo {
}
DRuntimeError *
DRuntimeError::shallow_move(obj<AAllocator> mm) const noexcept
DRuntimeError::shallow_move(obj<ACollector> gc) noexcept
{
DRuntimeError * copy = (DRuntimeError *)mm.alloc_copy((std::byte *)this);
if (copy)
*copy = *this;
return copy;
return gc.std_copy_for(this);
}
std::size_t

4
src/object2/IGCObject_DArray.cpp
View file

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

4
src/object2/IGCObject_DBoolean.cpp
View file

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

4
src/object2/IGCObject_DDictionary.cpp
View file

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

4
src/object2/IGCObject_DFloat.cpp
View file

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

4
src/object2/IGCObject_DInteger.cpp
View file

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

4
src/object2/IGCObject_DList.cpp
View file

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

4
src/object2/IGCObject_DRuntimeError.cpp
View file

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