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

refactor: use GCObjectVisitor api w/ gco_shallow_move

Browse source
This commit is contained in:
Roland Conybeare 2026-04-06 15:21:48 -04:00
commit 31df51ac8e
8 changed files with 16 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -27,7 +27,7 @@ namespace xo {
class DGlobalEnv {
public:
using TypeDescr = xo::reflect::TypeDescr;
using ACollector = xo::mm::ACollector;
//using ACollector = xo::mm::ACollector;
using AGCObject = xo::mm::AGCObject;
using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
using AAllocator = xo::mm::AAllocator;
@ -72,7 +72,7 @@ namespace xo {
/** @defgroup scm-globalenv-gcobject-facet **/
///@{
DGlobalEnv * shallow_move(obj<ACollector> gc) noexcept;
DGlobalEnv * gco_shallow_move(obj<AGCObjectVisitor> gc) noexcept;
void visit_gco_children(obj<AGCObjectVisitor> gc) noexcept;
///@}

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

@ -53,8 +53,9 @@ namespace xo {
// const methods
// non-const methods
/** move instance using collector **/
static Opaque shallow_move(DGlobalEnv & self, obj<ACollector> gc) noexcept;
/** move instance using object visitor.
Arguably abusing the word 'visitor' here **/
static Opaque gco_shallow_move(DGlobalEnv & self, obj<AGCObjectVisitor> gc) noexcept;
/** Invoke fn.visit_child(iface,data) for each child GCObject pointer.
Context: provides address of data pointer so it can be updated in place
when @p fn invokes garbage collector reentry point **/

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

@ -164,7 +164,7 @@ namespace xo {
using token_type = Token;
using ArenaHashMapConfig = xo::map::ArenaHashMapConfig;
using ArenaConfig = xo::mm::ArenaConfig;
using ACollector = xo::mm::ACollector;
//using ACollector = xo::mm::ACollector;
using AGCObject = xo::mm::AGCObject;
using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
using AAllocator = xo::mm::AAllocator;
@ -295,7 +295,7 @@ namespace xo {
///@{
/** not implemented (SchematikaParser not designed to be copyable) **/
DSchematikaParser * shallow_move(obj<ACollector> gc) noexcept;
DSchematikaParser * gco_shallow_move(obj<AGCObjectVisitor> gc) noexcept;
/** forward gc-aware children **/
void visit_gco_children(obj<AGCObjectVisitor> gc) noexcept;

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

@ -53,8 +53,9 @@ namespace xo {
// const methods
// non-const methods
/** move instance using collector **/
static Opaque shallow_move(DSchematikaParser & self, obj<ACollector> gc) noexcept;
/** move instance using object visitor.
Arguably abusing the word 'visitor' here **/
static Opaque gco_shallow_move(DSchematikaParser & self, obj<AGCObjectVisitor> gc) noexcept;
/** Invoke fn.visit_child(iface,data) for each child GCObject pointer.
Context: provides address of data pointer so it can be updated in place
when @p fn invokes garbage collector reentry point **/

2
src/reader2/DGlobalEnv.cpp
View file

@ -108,7 +108,7 @@ namespace xo {
// ----- AGCObject facet -----
DGlobalEnv *
DGlobalEnv::shallow_move(obj<ACollector> gc) noexcept
DGlobalEnv::gco_shallow_move(obj<AGCObjectVisitor> gc) noexcept
{
return gc.std_move_for<DGlobalEnv>(this);
}

2
src/reader2/DSchematikaParser.cpp
View file

@ -185,7 +185,7 @@ namespace xo {
}
DSchematikaParser *
DSchematikaParser::shallow_move(obj<ACollector> gc) noexcept
DSchematikaParser::gco_shallow_move(obj<AGCObjectVisitor> gc) noexcept
{
(void)gc;

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

@ -16,9 +16,9 @@
namespace xo {
namespace scm {
auto
IGCObject_DGlobalEnv::shallow_move(DGlobalEnv & self, obj<ACollector> gc) noexcept -> Opaque
IGCObject_DGlobalEnv::gco_shallow_move(DGlobalEnv & self, obj<AGCObjectVisitor> gc) noexcept -> Opaque
{
return self.shallow_move(gc);
return self.gco_shallow_move(gc);
}
auto
IGCObject_DGlobalEnv::visit_gco_children(DGlobalEnv & self, obj<AGCObjectVisitor> fn) noexcept -> void

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

@ -16,9 +16,9 @@
namespace xo {
namespace scm {
auto
IGCObject_DSchematikaParser::shallow_move(DSchematikaParser & self, obj<ACollector> gc) noexcept -> Opaque
IGCObject_DSchematikaParser::gco_shallow_move(DSchematikaParser & self, obj<AGCObjectVisitor> gc) noexcept -> Opaque
{
return self.shallow_move(gc);
return self.gco_shallow_move(gc);
}
auto
IGCObject_DSchematikaParser::visit_gco_children(DSchematikaParser & self, obj<AGCObjectVisitor> fn) noexcept -> void