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

xo-procedure2: simplify primitive install

Browse source
This commit is contained in:
Roland Conybeare 2026-03-16 20:12:19 -05:00
commit 3eb6a1be56
2 changed files with 49 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

23
xo-procedure2/include/xo/procedure2/PrimitiveRegistry.hpp
View file

@ -34,8 +34,6 @@ namespace xo {
return InstallFlags(static_cast<uint64_t>(x) & static_cast<uint64_t>(y));
}
/** provided by VSM to receive created primitives.
* InstallSink(pm) adopts a primitive
**/
@ -70,6 +68,26 @@ namespace xo {
/** singleton instance **/
static PrimitiveRegistry & instance();
template <typename PrimitiveRepr>
static bool install_aux(InstallSink sink,
PrimitiveRepr * pm,
InstallFlags flags) {
scope log(XO_DEBUG(true));
if (flags != InstallFlags::f_none) {
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;
}
}
/** remember primitive-factory @p source_fn **/
void register_primitives(InstallSource source_fn);
@ -83,6 +101,7 @@ namespace xo {
InstallSink sink,
InstallFlags flags);
private:
/** a set of factories that create primitives **/
std::vector<InstallSource> init_seq_v_;

73
xo-procedure2/src/procedure2/SetupProcedure2.cpp
View file

@ -84,44 +84,6 @@ namespace xo {
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,
@ -134,13 +96,34 @@ namespace xo {
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);
ok = ok & (PrimitiveRegistry::install_aux
(sink,
ObjectPrimitives::make_cwd_pm(mm, stbl),
flags & InstallFlags::f_generalpurpose));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
ObjectPrimitives::make_nth_pm(mm, stbl),
flags & InstallFlags::f_generalpurpose));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
ObjectPrimitives::make_cons_pm(mm, stbl),
flags & InstallFlags::f_generalpurpose));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
ObjectPrimitives::make_dict_make_pm(mm, stbl),
flags & InstallFlags::f_generalpurpose));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
ObjectPrimitives::make_dict_lookup_pm(mm, stbl),
flags & InstallFlags::f_generalpurpose));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
ObjectPrimitives::make_dict_upsert_pm(mm, stbl),
flags & InstallFlags::f_generalpurpose));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
ObjectPrimitives::make_fn_n_args_pm(mm, stbl),
flags & InstallFlags::f_generalpurpose));
return ok;
}