refactor: rename GCObject.shallow_copy -> shallow_move
resolve conflict since relying on move constructor in std_copy_for
This commit is contained in:
parent
45dd3749e0
commit
06161d2b50
164 changed files with 255 additions and 255 deletions
|
|
@ -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<AAllocator> mm) const noexcept;
|
||||
DArray * shallow_move(obj<AAllocator> mm) const noexcept;
|
||||
/** forward elements to @p gc to-space; replace originals with forarding pointers **/
|
||||
AAllocator::size_type forward_children(obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ namespace xo {
|
|||
// GCObject facet
|
||||
|
||||
std::size_t shallow_size() const noexcept;
|
||||
DBoolean * shallow_copy(obj<AAllocator> mm) const noexcept;
|
||||
DBoolean * shallow_move(obj<AAllocator> mm) const noexcept;
|
||||
std::size_t forward_children(obj<ACollector> gc) noexcept;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
DDictionary * shallow_move(obj<AAllocator> mm) noexcept;
|
||||
/** forward elements to @p gc to-space; replace originals with forarding pointers **/
|
||||
AAllocator::size_type forward_children(obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -35,7 +35,7 @@ namespace xo {
|
|||
|
||||
// GCObject facet
|
||||
std::size_t shallow_size() const noexcept;
|
||||
DFloat * shallow_copy(obj<AAllocator> mm) const noexcept;
|
||||
DFloat * shallow_move(obj<AAllocator> mm) const noexcept;
|
||||
std::size_t forward_children(obj<ACollector> gc) noexcept;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ namespace xo {
|
|||
// GCObject facet
|
||||
|
||||
std::size_t shallow_size() const noexcept;
|
||||
DInteger * shallow_copy(obj<AAllocator> mm) const noexcept;
|
||||
DInteger * shallow_move(obj<AAllocator> mm) const noexcept;
|
||||
std::size_t forward_children(obj<ACollector> gc) noexcept;
|
||||
|
||||
private:
|
||||
|
|
|
|||
|
|
@ -70,7 +70,7 @@ namespace xo {
|
|||
/** @defgroup xo-scm-list-gcobject-facet gcobject facet **/
|
||||
///@{
|
||||
size_type shallow_size() const noexcept;
|
||||
DList * shallow_copy(obj<AAllocator> mm) noexcept;
|
||||
DList * shallow_move(obj<AAllocator> mm) noexcept;
|
||||
size_type forward_children(obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@ namespace xo {
|
|||
///@{
|
||||
|
||||
std::size_t shallow_size() const noexcept;
|
||||
DRuntimeError * shallow_copy(obj<AAllocator> mm) const noexcept;
|
||||
DRuntimeError * shallow_move(obj<AAllocator> mm) const noexcept;
|
||||
std::size_t forward_children(obj<ACollector> gc) noexcept;
|
||||
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
/** move instance using allocator **/
|
||||
static Opaque shallow_move(DArray & self, obj<AAllocator> mm) noexcept;
|
||||
/** during GC: forward immdiate children **/
|
||||
static size_type forward_children(DArray & self, obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
/** move instance using allocator **/
|
||||
static Opaque shallow_move(DBoolean & self, obj<AAllocator> mm) noexcept;
|
||||
/** during GC: forward immdiate children **/
|
||||
static size_type forward_children(DBoolean & self, obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
/** move instance using allocator **/
|
||||
static Opaque shallow_move(DDictionary & self, obj<AAllocator> mm) noexcept;
|
||||
/** during GC: forward immdiate children **/
|
||||
static size_type forward_children(DDictionary & self, obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
/** move instance using allocator **/
|
||||
static Opaque shallow_move(DRuntimeError & self, obj<AAllocator> mm) noexcept;
|
||||
/** during GC: forward immdiate children **/
|
||||
static size_type forward_children(DRuntimeError & self, obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
/** move instance using allocator **/
|
||||
static Opaque shallow_move(DList & self, obj<AAllocator> mm) noexcept;
|
||||
/** during GC: forward immdiate children **/
|
||||
static size_type forward_children(DList & self, obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
/** move instance using allocator **/
|
||||
static Opaque shallow_move(DFloat & self, obj<AAllocator> mm) noexcept;
|
||||
/** during GC: forward immdiate children **/
|
||||
static size_type forward_children(DFloat & self, obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -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<AAllocator> mm) noexcept;
|
||||
/** move instance using allocator **/
|
||||
static Opaque shallow_move(DInteger & self, obj<AAllocator> mm) noexcept;
|
||||
/** during GC: forward immdiate children **/
|
||||
static size_type forward_children(DInteger & self, obj<ACollector> gc) noexcept;
|
||||
///@}
|
||||
|
|
|
|||
|
|
@ -181,7 +181,7 @@ namespace xo {
|
|||
}
|
||||
|
||||
DArray *
|
||||
DArray::shallow_copy(obj<AAllocator> mm) const noexcept
|
||||
DArray::shallow_move(obj<AAllocator> mm) const noexcept
|
||||
{
|
||||
DArray * copy = (DArray *)mm.alloc_copy((std::byte *)this);
|
||||
|
||||
|
|
|
|||
|
|
@ -36,7 +36,7 @@ namespace xo {
|
|||
}
|
||||
|
||||
DBoolean *
|
||||
DBoolean::shallow_copy(obj<AAllocator> mm) const noexcept
|
||||
DBoolean::shallow_move(obj<AAllocator> mm) const noexcept
|
||||
{
|
||||
DBoolean * copy = (DBoolean *)mm.alloc_copy((std::byte *)this);
|
||||
|
||||
|
|
|
|||
|
|
@ -274,7 +274,7 @@ namespace xo {
|
|||
}
|
||||
|
||||
DDictionary *
|
||||
DDictionary::shallow_copy(obj<AAllocator> mm) noexcept
|
||||
DDictionary::shallow_move(obj<AAllocator> mm) noexcept
|
||||
{
|
||||
return mm.std_copy_for(this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace xo {
|
|||
}
|
||||
|
||||
DFloat *
|
||||
DFloat::shallow_copy(obj<AAllocator> mm) const noexcept
|
||||
DFloat::shallow_move(obj<AAllocator> mm) const noexcept
|
||||
{
|
||||
DFloat * copy = (DFloat *)mm.alloc_copy((std::byte *)this);
|
||||
|
||||
|
|
|
|||
|
|
@ -34,7 +34,7 @@ namespace xo {
|
|||
}
|
||||
|
||||
DInteger *
|
||||
DInteger::shallow_copy(obj<AAllocator> mm) const noexcept
|
||||
DInteger::shallow_move(obj<AAllocator> mm) const noexcept
|
||||
{
|
||||
DInteger * copy = (DInteger *)mm.alloc_copy((std::byte *)this);
|
||||
|
||||
|
|
|
|||
|
|
@ -185,7 +185,7 @@ namespace xo {
|
|||
}
|
||||
|
||||
DList *
|
||||
DList::shallow_copy(obj<AAllocator> mm) noexcept
|
||||
DList::shallow_move(obj<AAllocator> mm) noexcept
|
||||
{
|
||||
return mm.std_copy_for(this);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -59,7 +59,7 @@ namespace xo {
|
|||
}
|
||||
|
||||
DRuntimeError *
|
||||
DRuntimeError::shallow_copy(obj<AAllocator> mm) const noexcept
|
||||
DRuntimeError::shallow_move(obj<AAllocator> mm) const noexcept
|
||||
{
|
||||
DRuntimeError * copy = (DRuntimeError *)mm.alloc_copy((std::byte *)this);
|
||||
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ namespace xo {
|
|||
}
|
||||
|
||||
auto
|
||||
IGCObject_DArray::shallow_copy(DArray & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
IGCObject_DArray::shallow_move(DArray & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
{
|
||||
return self.shallow_copy(mm);
|
||||
return self.shallow_move(mm);
|
||||
}
|
||||
auto
|
||||
IGCObject_DArray::forward_children(DArray & self, obj<ACollector> gc) noexcept -> size_type
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ namespace xo {
|
|||
}
|
||||
|
||||
auto
|
||||
IGCObject_DBoolean::shallow_copy(DBoolean & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
IGCObject_DBoolean::shallow_move(DBoolean & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
{
|
||||
return self.shallow_copy(mm);
|
||||
return self.shallow_move(mm);
|
||||
}
|
||||
auto
|
||||
IGCObject_DBoolean::forward_children(DBoolean & self, obj<ACollector> gc) noexcept -> size_type
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ namespace xo {
|
|||
}
|
||||
|
||||
auto
|
||||
IGCObject_DDictionary::shallow_copy(DDictionary & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
IGCObject_DDictionary::shallow_move(DDictionary & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
{
|
||||
return self.shallow_copy(mm);
|
||||
return self.shallow_move(mm);
|
||||
}
|
||||
auto
|
||||
IGCObject_DDictionary::forward_children(DDictionary & self, obj<ACollector> gc) noexcept -> size_type
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ namespace xo {
|
|||
}
|
||||
|
||||
auto
|
||||
IGCObject_DFloat::shallow_copy(DFloat & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
IGCObject_DFloat::shallow_move(DFloat & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
{
|
||||
return self.shallow_copy(mm);
|
||||
return self.shallow_move(mm);
|
||||
}
|
||||
auto
|
||||
IGCObject_DFloat::forward_children(DFloat & self, obj<ACollector> gc) noexcept -> size_type
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ namespace xo {
|
|||
}
|
||||
|
||||
auto
|
||||
IGCObject_DInteger::shallow_copy(DInteger & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
IGCObject_DInteger::shallow_move(DInteger & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
{
|
||||
return self.shallow_copy(mm);
|
||||
return self.shallow_move(mm);
|
||||
}
|
||||
auto
|
||||
IGCObject_DInteger::forward_children(DInteger & self, obj<ACollector> gc) noexcept -> size_type
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ namespace xo {
|
|||
}
|
||||
|
||||
auto
|
||||
IGCObject_DList::shallow_copy(DList & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
IGCObject_DList::shallow_move(DList & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
{
|
||||
return self.shallow_copy(mm);
|
||||
return self.shallow_move(mm);
|
||||
}
|
||||
auto
|
||||
IGCObject_DList::forward_children(DList & self, obj<ACollector> gc) noexcept -> size_type
|
||||
|
|
|
|||
|
|
@ -22,9 +22,9 @@ namespace xo {
|
|||
}
|
||||
|
||||
auto
|
||||
IGCObject_DRuntimeError::shallow_copy(DRuntimeError & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
IGCObject_DRuntimeError::shallow_move(DRuntimeError & self, obj<AAllocator> mm) noexcept -> Opaque
|
||||
{
|
||||
return self.shallow_copy(mm);
|
||||
return self.shallow_move(mm);
|
||||
}
|
||||
auto
|
||||
IGCObject_DRuntimeError::forward_children(DRuntimeError & self, obj<ACollector> gc) noexcept -> size_type
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue