xo-interpreter2: streamline pm setup

This commit is contained in:
Roland Conybeare 2026-03-16 20:18:52 -05:00
commit f4d00d9e17

View file

@ -91,22 +91,6 @@ namespace xo {
return true; return true;
} }
namespace {
bool install_aux(InstallSink sink,
DPrimitive_gco_2_gco_gco * pm,
InstallFlags flags)
{
if (flags != InstallFlags::f_none) {
return sink(pm->name(),
pm->fn_td(),
obj<AProcedure,DPrimitive_gco_2_gco_gco>(pm),
flags);
} else {
return true;
}
}
}
bool bool
SetupNumeric::register_primitives(obj<ARuntimeContext> rcx, SetupNumeric::register_primitives(obj<ARuntimeContext> rcx,
InstallSink sink, InstallSink sink,
@ -119,37 +103,46 @@ namespace xo {
bool ok = true; bool ok = true;
ok = ok & install_aux(sink, ok = ok & (PrimitiveRegistry::install_aux
NumericPrimitives::make_multiply_pm(mm, stbl), (sink,
flags & InstallFlags::f_essential); NumericPrimitives::make_multiply_pm(mm, stbl),
ok = ok & install_aux(sink, flags & InstallFlags::f_essential));
NumericPrimitives::make_divide_pm(mm, stbl), ok = ok & (PrimitiveRegistry::install_aux
flags & InstallFlags::f_essential); (sink,
ok = ok & install_aux(sink, NumericPrimitives::make_divide_pm(mm, stbl),
NumericPrimitives::make_add_pm(mm, stbl), flags & InstallFlags::f_essential));
flags & InstallFlags::f_essential); ok = ok & (PrimitiveRegistry::install_aux
ok = ok & install_aux(sink, (sink,
NumericPrimitives::make_subtract_pm(mm, stbl), NumericPrimitives::make_add_pm(mm, stbl),
flags & InstallFlags::f_essential); flags & InstallFlags::f_essential));
ok = ok & (PrimitiveRegistry::install_aux
ok = ok & install_aux(sink, (sink,
NumericPrimitives::make_cmpeq_pm(mm, stbl), NumericPrimitives::make_subtract_pm(mm, stbl),
flags & InstallFlags::f_essential); flags & InstallFlags::f_essential));
ok = ok & install_aux(sink, ok = ok & (PrimitiveRegistry::install_aux
NumericPrimitives::make_cmpne_pm(mm, stbl), (sink,
flags & InstallFlags::f_essential); NumericPrimitives::make_cmpeq_pm(mm, stbl),
ok = ok & install_aux(sink, flags & InstallFlags::f_essential));
NumericPrimitives::make_cmplt_pm(mm, stbl), ok = ok & (PrimitiveRegistry::install_aux
flags & InstallFlags::f_essential); (sink,
ok = ok & install_aux(sink, NumericPrimitives::make_cmpne_pm(mm, stbl),
NumericPrimitives::make_cmple_pm(mm, stbl), flags & InstallFlags::f_essential));
flags & InstallFlags::f_essential); ok = ok & (PrimitiveRegistry::install_aux
ok = ok & install_aux(sink, (sink,
NumericPrimitives::make_cmpgt_pm(mm, stbl), NumericPrimitives::make_cmplt_pm(mm, stbl),
flags & InstallFlags::f_essential); flags & InstallFlags::f_essential));
ok = ok & install_aux(sink, ok = ok & (PrimitiveRegistry::install_aux
NumericPrimitives::make_cmpge_pm(mm, stbl), (sink,
flags & InstallFlags::f_essential); NumericPrimitives::make_cmple_pm(mm, stbl),
flags & InstallFlags::f_essential));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
NumericPrimitives::make_cmpgt_pm(mm, stbl),
flags & InstallFlags::f_essential));
ok = ok & (PrimitiveRegistry::install_aux
(sink,
NumericPrimitives::make_cmpge_pm(mm, stbl),
flags & InstallFlags::f_essential));
return ok; return ok;
} }