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

xo-numeric: streamline setup

Browse source
This commit is contained in:
Roland Conybeare 2026-03-16 14:41:28 -05:00
commit 884a6074d7
8 changed files with 190 additions and 241 deletions
Download patch file Download diff file Expand all files Collapse all files

25
include/xo/numeric/SetupNumeric.hpp Normal file
View file

@ -0,0 +1,25 @@
/** @file SetupNumeric.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#pragma once
#include "PrimitiveRegistry.hpp"
#include <xo/alloc2/Collector.hpp>
namespace xo {
namespace scm {
/** Setup numeric facet dispatch **/
struct SetupNumeric {
public:
static bool register_facets();
/** Register primitive factories with primitive registry **/
static bool register_primitives(obj<ARuntimeContext> rcx,
InstallSink sink,
InstallFlags flags);
};
}
}
/* end SetupNumeric.hpp */

16
include/xo/numeric/numeric_register_facets.hpp
View file

@ -1,16 +0,0 @@
/** @file numeric_register_facets.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#pragma once
namespace xo {
namespace scm {
/** Setup numeric facet dispatch **/
bool numeric_register_facets();
}
}
/* end numeric_register_facets.hpp */

22
include/xo/numeric/numeric_register_primitives.hpp
View file

@ -1,22 +0,0 @@
/** @file numeric_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 with primitive registry **/
bool numeric_register_primitives(obj<ARuntimeContext> rcx,
//obj<xo::mm::AAllocator> mm,
//StringTable * stbl,
InstallSink sink,
InstallFlags flags);
}
}
/* end numeric_register_primitives.hpp */

3
src/numeric/CMakeLists.txt
View file

@ -3,8 +3,7 @@
set(SELF_LIB xo_numeric)
set(SELF_SRCS
init_numeric.cpp
numeric_register_facets.cpp
numeric_register_primitives.cpp
SetupNumeric.cpp
NumericPrimitives.cpp
NumericDispatch.cpp
INumeric_Any.cpp

159
src/numeric/SetupNumeric.cpp Normal file
View file

@ -0,0 +1,159 @@
/** @file SetupNumeric.cpp
*
* @author Roland Conybeare, Mar 2026
**/
#include "SetupNumeric.hpp"
#include "NumericDispatch.hpp"
#include "Numeric.hpp"
#include "NumericPrimitives.hpp"
#include "NumericDispatch.hpp"
#include "FloatIntegerOps.hpp"
#include "FloatOps.hpp"
#include "float/INumeric_DFloat.hpp"
#include "IntegerOps.hpp"
#include "integer/INumeric_DInteger.hpp"
#include <xo/procedure2/Primitive_gco_2_gco_gco.hpp>
#include <xo/object2/DFloat.hpp>
#include <xo/object2/Integer.hpp>
#include <xo/facet/FacetRegistry.hpp>
#include <xo/reflectutil/typeseq.hpp>
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::mm::AAllocator;
using xo::facet::FacetRegistry;
using xo::reflect::typeseq;
namespace scm {
bool
SetupNumeric::register_facets()
{
scope log(XO_DEBUG(true));
FacetRegistry::register_impl<ANumeric, DInteger>();
NumericDispatch::instance().register_impl<DFloat, DFloat>
(&FloatOps::multiply,
&FloatOps::divide,
&FloatOps::add,
&FloatOps::subtract,
&FloatOps::cmp_equal,
&FloatOps::cmp_notequal,
&FloatOps::cmp_less,
&FloatOps::cmp_lessequal,
&FloatOps::cmp_greater,
&FloatOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DFloat, DInteger>
(&FloatIntegerOps::multiply,
&FloatIntegerOps::divide,
&FloatIntegerOps::add,
&FloatIntegerOps::subtract,
&FloatIntegerOps::cmp_equal,
&FloatIntegerOps::cmp_notequal,
&FloatIntegerOps::cmp_less,
&FloatIntegerOps::cmp_lessequal,
&FloatIntegerOps::cmp_greater,
&FloatIntegerOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DInteger, DFloat>
(&IntegerFloatOps::multiply,
&IntegerFloatOps::divide,
&IntegerFloatOps::add,
&IntegerFloatOps::subtract,
&IntegerFloatOps::cmp_equal,
&IntegerFloatOps::cmp_notequal,
&IntegerFloatOps::cmp_less,
&IntegerFloatOps::cmp_lessequal,
&IntegerFloatOps::cmp_greater,
&IntegerFloatOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DInteger, DInteger>
(&IntegerOps::multiply,
&IntegerOps::divide,
&IntegerOps::add,
&IntegerOps::subtract,
&IntegerOps::cmp_equal,
&IntegerOps::cmp_notequal,
&IntegerOps::cmp_less,
&IntegerOps::cmp_lessequal,
&IntegerOps::cmp_greater,
&IntegerOps::cmp_greatequal);
log && log(xtag("ANumeric.tseq", typeseq::id<ANumeric>()));
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
SetupNumeric::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,
NumericPrimitives::make_multiply_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_divide_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_add_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_subtract_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpeq_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpne_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmplt_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmple_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpgt_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpge_pm(mm, stbl),
flags & InstallFlags::f_essential);
return ok;
}
} /*namespace scm*/
} /*namespace xo*/
/* end SetupNumeric.cpp */

11
src/numeric/init_numeric.cpp
View file

@ -4,22 +4,21 @@
**/
#include "init_numeric.hpp"
#include "SetupNumeric.hpp"
#include <xo/procedure2/init_procedure2.hpp>
#include "Subsystem.hpp"
#include "numeric_register_facets.hpp"
#include "numeric_register_primitives.hpp"
namespace xo {
using xo::scm::numeric_register_facets;
using xo::scm::numeric_register_primitives;
using xo::scm::SetupNumeric;
//using xo::scm::numeric_register_primitives;
using xo::scm::PrimitiveRegistry;
void
InitSubsys<S_numeric_tag>::init()
{
numeric_register_facets();
SetupNumeric::register_facets();
PrimitiveRegistry::instance().register_primitives(&numeric_register_primitives);
PrimitiveRegistry::instance().register_primitives(&SetupNumeric::register_primitives);
}

93
src/numeric/numeric_register_facets.cpp
View file

@ -1,93 +0,0 @@
/** @file numeric_register_facets.cpp
*
* @author Roland Conybeare, Feb 2026
**/
#include "numeric_register_facets.hpp"
#include "NumericDispatch.hpp"
#include "Numeric.hpp"
#include "FloatIntegerOps.hpp"
#include "FloatOps.hpp"
#include "float/INumeric_DFloat.hpp"
#include "IntegerOps.hpp"
#include "integer/INumeric_DInteger.hpp"
#include <xo/object2/DFloat.hpp>
#include <xo/object2/Integer.hpp>
#include <xo/facet/FacetRegistry.hpp>
#include <xo/reflectutil/typeseq.hpp>
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::facet::FacetRegistry;
using xo::reflect::typeseq;
namespace scm {
bool
numeric_register_facets()
{
scope log(XO_DEBUG(true));
FacetRegistry::register_impl<ANumeric, DInteger>();
NumericDispatch::instance().register_impl<DFloat, DFloat>
(&FloatOps::multiply,
&FloatOps::divide,
&FloatOps::add,
&FloatOps::subtract,
&FloatOps::cmp_equal,
&FloatOps::cmp_notequal,
&FloatOps::cmp_less,
&FloatOps::cmp_lessequal,
&FloatOps::cmp_greater,
&FloatOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DFloat, DInteger>
(&FloatIntegerOps::multiply,
&FloatIntegerOps::divide,
&FloatIntegerOps::add,
&FloatIntegerOps::subtract,
&FloatIntegerOps::cmp_equal,
&FloatIntegerOps::cmp_notequal,
&FloatIntegerOps::cmp_less,
&FloatIntegerOps::cmp_lessequal,
&FloatIntegerOps::cmp_greater,
&FloatIntegerOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DInteger, DFloat>
(&IntegerFloatOps::multiply,
&IntegerFloatOps::divide,
&IntegerFloatOps::add,
&IntegerFloatOps::subtract,
&IntegerFloatOps::cmp_equal,
&IntegerFloatOps::cmp_notequal,
&IntegerFloatOps::cmp_less,
&IntegerFloatOps::cmp_lessequal,
&IntegerFloatOps::cmp_greater,
&IntegerFloatOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DInteger, DInteger>
(&IntegerOps::multiply,
&IntegerOps::divide,
&IntegerOps::add,
&IntegerOps::subtract,
&IntegerOps::cmp_equal,
&IntegerOps::cmp_notequal,
&IntegerOps::cmp_less,
&IntegerOps::cmp_lessequal,
&IntegerOps::cmp_greater,
&IntegerOps::cmp_greatequal);
log && log(xtag("ANumeric.tseq", typeseq::id<ANumeric>()));
return true;
}
} /*namespace scm*/
} /*namespace xo*/
/* end numeric_register_facets.cpp */

102
src/numeric/numeric_register_primitives.cpp
View file

@ -1,102 +0,0 @@
/** @file numeric_register_primitives.cpp
*
* @author Roland Conybeare, Mar 2026
**/
#include "numeric_register_primitives.hpp"
#include "NumericPrimitives.hpp"
#include "NumericDispatch.hpp"
#include <xo/procedure2/Primitive_gco_2_gco_gco.hpp>
#include <xo/indentlog/scope.hpp>
namespace xo {
using xo::mm::AAllocator;
using xo::scope;
namespace scm {
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;
}
}
#ifdef OBSOLETE
bool install_aux(InstallSink sink,
obj<AAllocator> mm,
std::string_view name,
obj<AGCObject> (*impl)(obj<ARuntimeContext> rcx,
obj<AGCObject> x,
obj<AGCObject> y),
InstallFlags flags)
{
if (flags != InstallFlags::f_none) {
auto pm
= DPrimitive_gco_2_gco_gco::_make(mm, name, impl);
return install_aux(sink, pm, flags);
} else {
return true;
}
}
#endif
}
bool
numeric_register_primitives(obj<ARuntimeContext> rcx,
//obj<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,
NumericPrimitives::make_multiply_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_divide_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_add_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_subtract_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpeq_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpne_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmplt_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmple_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpgt_pm(mm, stbl),
flags & InstallFlags::f_essential);
ok = ok & install_aux(sink,
NumericPrimitives::make_cmpge_pm(mm, stbl),
flags & InstallFlags::f_essential);
return ok;
}
}
} /*namespace xo*/
/* end numeric_register_primitives.cpp */