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

xo-procedure2: streamline setup

Browse source
This commit is contained in:
Roland Conybeare 2026-03-16 15:45:47 -05:00
commit 15edbdd755
10 changed files with 186 additions and 262 deletions
Download patch file Download diff file Expand all files Collapse all files

29
include/xo/procedure2/SetupProcedure2.hpp Normal file
View file

@ -0,0 +1,29 @@
/** @file SetupProcedure2.hpp
*
* @author Roland Conybeare, Jan 2026
**/
#pragma once
#include "PrimitiveRegistry.hpp"
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
struct SetupProcedure2 {
public:
using ACollector = xo::mm::ACollector;
public:
/** Register procedure2 (facet,impl) combinations with FacetRegistry **/
static bool register_facets();
/** Register gc-aware (AGCObject,DRepr) combinations with garbage collector @p gc **/
static bool register_types(obj<xo::mm::ACollector> gc);
static bool register_primitives(obj<ARuntimeContext> rcx,
InstallSink sink,
InstallFlags flags);
};
}
}
/* end SetupProcedure2.hpp */

17
include/xo/procedure2/procedure2_register_facets.hpp
View file

@ -1,17 +0,0 @@
/** @file procedure2_register_facets.hpp
*
* @author Roland Conybeare, Jan 2026
**/
#pragma once
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
/** Register procedure2 (facet,impl) combinations with FacetRegistry **/
bool procedure2_register_facets();
}
}
/* end procedure2_register_facets.hpp */

22
include/xo/procedure2/procedure2_register_primitives.hpp
View file

@ -1,22 +0,0 @@
/** @file procedure2_register_primitives.hpp
*
* @author Roland Conybeare, Mar 2026
**/
#pragma once
#include "PrimitiveRegistry.hpp"
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
/** Register primitive-factories **/
bool procedure2_register_primitives(obj<ARuntimeContext> rcx,
//obj<xo::mm::AAllocator> gc,
//StringTable * stbl,
InstallSink sink,
InstallFlags flags);
}
}
/* end procedure2_register_primitives.hpp */

17
include/xo/procedure2/procedure2_register_types.hpp
View file

@ -1,17 +0,0 @@
/** @file procedure2_register_types.hpp
*
* @author Roland Conybeare, Dec 2025
**/
#pragma once
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
/** Register gc-aware (AGCObject,DRepr) combinations with garbage collector @p gc **/
bool procedure2_register_types(obj<xo::mm::ACollector> gc);
}
}
/* end procedure2_register_types.hpp */

4
src/procedure2/CMakeLists.txt
View file

@ -4,9 +4,7 @@ set(SELF_LIB xo_procedure2)
set(SELF_SRCS
init_procedure2.cpp
init_primitives.cpp
procedure2_register_primitives.cpp
procedure2_register_types.cpp
procedure2_register_facets.cpp
SetupProcedure2.cpp
ObjectPrimitives.cpp
PrimitiveRegistry.cpp
DPrimitive.cpp

151
src/procedure2/SetupProcedure2.cpp Normal file
View file

@ -0,0 +1,151 @@
/** @file SetupProcedure2.cpp
*
* @author Roland Conybeare, Jan 2026
**/
#include "SetupProcedure2.hpp"
#include "Procedure.hpp"
#include "ObjectPrimitives.hpp"
#include "SimpleRcx.hpp"
#include "Primitive_gco_0.hpp"
#include "Primitive_gco_1_gco.hpp"
#include "Primitive_gco_2_gco_gco.hpp"
#include "Primitive_gco_2_dict_string.hpp"
#include "Primitive_gco_3_dict_string_gco.hpp"
#include <xo/alloc2/GCObject.hpp>
#include <xo/printable2/Printable.hpp>
#include <xo/facet/FacetRegistry.hpp>
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::mm::AAllocator;
using xo::facet::FacetRegistry;
using xo::facet::impl_for;
using xo::facet::typeseq;
using xo::print::APrintable;
namespace scm {
bool
SetupProcedure2::register_facets()
{
scope log(XO_DEBUG(true));
FacetRegistry::register_impl<ARuntimeContext, DSimpleRcx>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_0>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_0>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_0>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_1_gco>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_1_gco>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_1_gco>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_2_gco_gco>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_2_gco_gco>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_2_gco_gco>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_2_dict_string>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_2_dict_string>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_2_dict_string>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_3_dict_string_gco>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_3_dict_string_gco>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_3_dict_string_gco>();
log && log(xtag("DSimpleRcx.tseq", typeseq::id<DSimpleRcx>()));
log && log(xtag("DPrimitive_gco_0.tseq", typeseq::id<DPrimitive_gco_0>()));
log && log(xtag("DPrimitive_gco_1_gco.tseq", typeseq::id<DPrimitive_gco_1_gco>()));
log && log(xtag("DPrimitive_gco_2_gco_gco.tseq", typeseq::id<DPrimitive_gco_2_gco_gco>()));
log && log(xtag("DPrimitive_gco_2_dict_string.tseq", typeseq::id<DPrimitive_gco_2_dict_string>()));
log && log(xtag("DPrimitive_gco_3_dict_string_gco.tseq", typeseq::id<DPrimitive_gco_3_dict_string_gco>()));
log && log(xtag("ARuntimeContext.tseq", typeseq::id<ARuntimeContext>()));
log && log(xtag("AProcedure.tseq", typeseq::id<AProcedure>()));
return true;
}
bool
SetupProcedure2::register_types(obj<ACollector> gc)
{
scope log(XO_DEBUG(true));
bool ok = true;
// (note: don't currently intend to support AGCObject for DSimpleRcx)
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_0>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_1_gco>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_2_gco_gco>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_2_dict_string>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_3_dict_string_gco>());
return ok;
}
template <typename PrimitiveRepr>
bool install_aux(InstallSink sink,
PrimitiveRepr * pm,
InstallFlags flags)
{
scope log(XO_DEBUG(true));
if ((flags & InstallFlags::f_generalpurpose) == InstallFlags::f_generalpurpose) {
log && log("create primitive", xtag("name", pm->name()));
return sink(pm->name(),
pm->fn_td(),
obj<AProcedure,PrimitiveRepr>(pm),
flags);
} else {
log && log("skip primitive", xtag("name", pm->name()));
return true;
}
}
template <typename Primitive>
bool install_aux(InstallSink sink,
obj<AAllocator> mm,
std::string_view name,
typename Primitive::FunctionPtrType impl,
InstallFlags flags)
{
if (flags != InstallFlags::f_none) {
auto pm
= Primitive::_make(mm, name, impl);
return install_aux(sink, pm, flags);
} else {
return true;
}
}
bool
SetupProcedure2::register_primitives(obj<ARuntimeContext> rcx,
InstallSink sink,
InstallFlags flags)
{
obj<AAllocator> mm = rcx.allocator();
StringTable * stbl = rcx.stringtable();
scope log(XO_DEBUG(true));
bool ok = true;
ok = ok & install_aux(sink, ObjectPrimitives::make_cwd_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_nth_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_cons_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_dict_make_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_dict_lookup_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_dict_upsert_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_fn_n_args_pm (mm, stbl), flags);
return ok;
}
} /*namespace scm*/
} /*namespace xo*/
/* end SetupProcedure2.cpp */

15
src/procedure2/init_procedure2.cpp
View file

@ -5,27 +5,22 @@
#include "init_procedure2.hpp"
#include "init_primitives.hpp"
#include "procedure2_register_facets.hpp"
#include "procedure2_register_types.hpp"
#include "procedure2_register_primitives.hpp"
#include "SetupProcedure2.hpp"
#include <xo/object2/init_object2.hpp>
#include <xo/alloc2/CollectorTypeRegistry.hpp>
namespace xo {
using xo::scm::procedure2_register_primitives;
using xo::scm::procedure2_register_facets;
using xo::scm::procedure2_register_types;
using xo::scm::SetupProcedure2;
using xo::scm::PrimitiveRegistry;
using xo::mm::CollectorTypeRegistry;
void
InitSubsys<S_procedure2_tag>::init()
{
procedure2_register_facets();
SetupProcedure2::register_facets();
CollectorTypeRegistry::instance().register_types(&procedure2_register_types);
PrimitiveRegistry::instance().register_primitives(&procedure2_register_primitives);
CollectorTypeRegistry::instance().register_types(&SetupProcedure2::register_types);
PrimitiveRegistry::instance().register_primitives(&SetupProcedure2::register_primitives);
}
InitEvidence

68
src/procedure2/procedure2_register_facets.cpp
View file

@ -1,68 +0,0 @@
/** @file procedure2_register_facets.cpp
*
* @author Roland Conybeare, Jan 2026
**/
#include "Procedure.hpp"
#include "SimpleRcx.hpp"
#include "Primitive_gco_0.hpp"
#include "Primitive_gco_1_gco.hpp"
#include "Primitive_gco_2_gco_gco.hpp"
#include "Primitive_gco_2_dict_string.hpp"
#include "Primitive_gco_3_dict_string_gco.hpp"
#include <xo/alloc2/GCObject.hpp>
#include <xo/printable2/Printable.hpp>
#include <xo/facet/FacetRegistry.hpp>
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::facet::FacetRegistry;
using xo::facet::typeseq;
using xo::print::APrintable;
namespace scm {
bool
procedure2_register_facets()
{
scope log(XO_DEBUG(true));
FacetRegistry::register_impl<ARuntimeContext, DSimpleRcx>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_0>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_0>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_0>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_1_gco>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_1_gco>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_1_gco>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_2_gco_gco>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_2_gco_gco>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_2_gco_gco>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_2_dict_string>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_2_dict_string>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_2_dict_string>();
FacetRegistry::register_impl<AProcedure, DPrimitive_gco_3_dict_string_gco>();
FacetRegistry::register_impl<AGCObject, DPrimitive_gco_3_dict_string_gco>();
FacetRegistry::register_impl<APrintable, DPrimitive_gco_3_dict_string_gco>();
log && log(xtag("DSimpleRcx.tseq", typeseq::id<DSimpleRcx>()));
log && log(xtag("DPrimitive_gco_0.tseq", typeseq::id<DPrimitive_gco_0>()));
log && log(xtag("DPrimitive_gco_1_gco.tseq", typeseq::id<DPrimitive_gco_1_gco>()));
log && log(xtag("DPrimitive_gco_2_gco_gco.tseq", typeseq::id<DPrimitive_gco_2_gco_gco>()));
log && log(xtag("DPrimitive_gco_2_dict_string.tseq", typeseq::id<DPrimitive_gco_2_dict_string>()));
log && log(xtag("DPrimitive_gco_3_dict_string_gco.tseq", typeseq::id<DPrimitive_gco_3_dict_string_gco>()));
log && log(xtag("ARuntimeContext.tseq", typeseq::id<ARuntimeContext>()));
log && log(xtag("AProcedure.tseq", typeseq::id<AProcedure>()));
return true;
}
} /*namespace scm*/
} /*namespace xo*/
/* end procedure2_register_facets.cpp */

83
src/procedure2/procedure2_register_primitives.cpp
View file

@ -1,83 +0,0 @@
/** @file procedure2_register_primitives.cpp
*
* @author Roland Conybeare, Mar 2026
**/
#include "procedure2_register_primitives.hpp"
#include "ObjectPrimitives.hpp"
#include <xo/object2/Sequence.hpp>
#include <xo/object2/Integer.hpp>
namespace xo {
using xo::scm::ASequence;
using xo::mm::AAllocator;
using xo::mm::AGCObject;
namespace scm {
template <typename PrimitiveRepr>
bool install_aux(InstallSink sink,
PrimitiveRepr * pm,
InstallFlags flags)
{
scope log(XO_DEBUG(true));
if ((flags & InstallFlags::f_generalpurpose) == InstallFlags::f_generalpurpose) {
log && log("create primitive", xtag("name", pm->name()));
return sink(pm->name(),
pm->fn_td(),
obj<AProcedure,PrimitiveRepr>(pm),
flags);
} else {
log && log("skip primitive", xtag("name", pm->name()));
return true;
}
}
template <typename Primitive>
bool install_aux(InstallSink sink,
obj<AAllocator> mm,
std::string_view name,
typename Primitive::FunctionPtrType impl,
InstallFlags flags)
{
if (flags != InstallFlags::f_none) {
auto pm
= Primitive::_make(mm, name, impl);
return install_aux(sink, pm, flags);
} else {
return true;
}
}
bool
procedure2_register_primitives(obj<ARuntimeContext> rcx,
//obj<xo::mm::AAllocator> mm,
//StringTable * stbl,
InstallSink sink,
InstallFlags flags)
{
obj<AAllocator> mm = rcx.allocator();
StringTable * stbl = rcx.stringtable();
scope log(XO_DEBUG(true));
bool ok = true;
ok = ok & install_aux(sink, ObjectPrimitives::make_cwd_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_nth_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_cons_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_dict_make_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_dict_lookup_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_dict_upsert_pm (mm, stbl), flags);
ok = ok & install_aux(sink, ObjectPrimitives::make_fn_n_args_pm (mm, stbl), flags);
return ok;
}
} /*namespace scm*/
} /*namespace xo*/
/* end procedure2_register_primitives.cpp */

42
src/procedure2/procedure2_register_types.cpp
View file

@ -1,42 +0,0 @@
/** @file procedure2_register_types.cpp
*
* @author Roland Conybeare, Jan 2026
**/
#include "procedure2_register_types.hpp"
#include "Primitive_gco_0.hpp"
#include "detail/IGCObject_DPrimitive_gco_1_gco.hpp"
#include "detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp"
#include "detail/IGCObject_DPrimitive_gco_2_dict_string.hpp"
#include "detail/IGCObject_DPrimitive_gco_3_dict_string_gco.hpp"
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::mm::ACollector;
using xo::mm::AGCObject;
using xo::facet::impl_for;
using xo::scope;
namespace scm {
bool
procedure2_register_types(obj<ACollector> gc)
{
scope log(XO_DEBUG(true));
bool ok = true;
// (note: don't currently intend to support AGCObject for DSimpleRcx)
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_0>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_1_gco>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_2_gco_gco>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_2_dict_string>());
ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_3_dict_string_gco>());
return ok;
}
}
} /*namespace xo*/
/* end procedure2_register_types.cpp */