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

xo-reader2: + op>= support

Browse source
This commit is contained in:
Roland Conybeare 2026-03-12 23:41:21 -05:00
commit 1b4d5744d2
11 changed files with 93 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
include/xo/numeric/FloatIntegerOps.hpp
View file

@ -36,6 +36,8 @@ namespace xo {
DFloat * x, DInteger * y); DFloat * x, DInteger * y);
static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx, static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx,
DFloat * x, DInteger * y); DFloat * x, DInteger * y);
static obj<AGCObject> cmp_greatequal(obj<ARuntimeContext> rcx,
DFloat * x, DInteger * y);
}; };
class IntegerFloatOps { class IntegerFloatOps {
@ -60,6 +62,8 @@ namespace xo {
DInteger * x, DFloat * y); DInteger * x, DFloat * y);
static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx, static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx,
DInteger * x, DFloat * y); DInteger * x, DFloat * y);
static obj<AGCObject> cmp_greatequal(obj<ARuntimeContext> rcx,
DInteger * x, DFloat * y);
}; };
} }

2
include/xo/numeric/FloatOps.hpp
View file

@ -35,6 +35,8 @@ namespace xo {
DFloat * x, DFloat * y); DFloat * x, DFloat * y);
static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx, static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y); DFloat * x, DFloat * y);
static obj<AGCObject> cmp_greatequal(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y);
}; };
} }

2
include/xo/numeric/IntegerOps.hpp
View file

@ -37,6 +37,8 @@ namespace xo {
DInteger * x, DInteger * y); DInteger * x, DInteger * y);
static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx, static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx,
DInteger * x, DInteger * y); DInteger * x, DInteger * y);
static obj<AGCObject> cmp_greatequal(obj<ARuntimeContext> rcx,
DInteger * x, DInteger * y);
}; };

11
include/xo/numeric/NumericDispatch.hpp
View file

@ -113,6 +113,11 @@ namespace xo {
obj<AGCObject> x, obj<AGCObject> x,
obj<AGCObject> y); obj<AGCObject> y);
/** compare two numeric values for greater-or-equal **/
static obj<AGCObject> cmp_greatequal(obj<ARuntimeContext> rcx,
obj<AGCObject> x,
obj<AGCObject> y);
/** report memory use for owned arenas to @p visitor **/ /** report memory use for owned arenas to @p visitor **/
void visit_pools(const MemorySizeVisitor & visitor); void visit_pools(const MemorySizeVisitor & visitor);
@ -129,7 +134,8 @@ namespace xo {
typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmpeq_fn, typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmpeq_fn,
typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmpne_fn, typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmpne_fn,
typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmplt_fn, typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmplt_fn,
typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmple_fn) { typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmple_fn,
typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmpge_fn) {
KeyType key(typeseq::id<DRepr1>().seqno(), KeyType key(typeseq::id<DRepr1>().seqno(),
typeseq::id<DRepr2>().seqno()); typeseq::id<DRepr2>().seqno());
@ -143,7 +149,8 @@ namespace xo {
cmpeq_fn, cmpeq_fn,
cmpne_fn, cmpne_fn,
cmplt_fn, cmplt_fn,
cmple_fn); cmple_fn,
cmpge_fn);
} }
private: private:

13
include/xo/numeric/NumericOps.hpp
View file

@ -29,9 +29,10 @@ namespace xo {
BinaryOp cmpeq, BinaryOp cmpeq,
BinaryOp cmpne, BinaryOp cmpne,
BinaryOp cmplt, BinaryOp cmplt,
BinaryOp cmple) BinaryOp cmple,
BinaryOp cmpge)
: multiply_{multiply}, divide_{divide}, add_{add}, subtract_{subtract}, : multiply_{multiply}, divide_{divide}, add_{add}, subtract_{subtract},
cmpeq_{cmpeq}, cmpne_{cmpne}, cmplt_{cmplt}, cmple_{cmple} {} cmpeq_{cmpeq}, cmpne_{cmpne}, cmplt_{cmplt}, cmple_{cmple}, cmpge_{cmpge} {}
BinaryOp multiply_ = nullptr; BinaryOp multiply_ = nullptr;
BinaryOp divide_ = nullptr; BinaryOp divide_ = nullptr;
@ -46,6 +47,8 @@ namespace xo {
BinaryOp cmplt_ = nullptr; BinaryOp cmplt_ = nullptr;
/** compare numerics (<=) **/ /** compare numerics (<=) **/
BinaryOp cmple_ = nullptr; BinaryOp cmple_ = nullptr;
/** compare numerics (>=) **/
BinaryOp cmpge_ = nullptr;
}; };
template <typename DRepr1, typename DRepr2> template <typename DRepr1, typename DRepr2>
@ -64,7 +67,8 @@ namespace xo {
BinaryOp_Impl cmpeq, BinaryOp_Impl cmpeq,
BinaryOp_Impl cmpne, BinaryOp_Impl cmpne,
BinaryOp_Impl cmplt, BinaryOp_Impl cmplt,
BinaryOp_Impl cmple) { BinaryOp_Impl cmple,
BinaryOp_Impl cmpge) {
return AnonymizedNumericOps(reinterpret_cast<BinaryOp_Anon>(multiply), return AnonymizedNumericOps(reinterpret_cast<BinaryOp_Anon>(multiply),
reinterpret_cast<BinaryOp_Anon>(divide), reinterpret_cast<BinaryOp_Anon>(divide),
reinterpret_cast<BinaryOp_Anon>(add), reinterpret_cast<BinaryOp_Anon>(add),
@ -72,7 +76,8 @@ namespace xo {
reinterpret_cast<BinaryOp_Anon>(cmpeq), reinterpret_cast<BinaryOp_Anon>(cmpeq),
reinterpret_cast<BinaryOp_Anon>(cmpne), reinterpret_cast<BinaryOp_Anon>(cmpne),
reinterpret_cast<BinaryOp_Anon>(cmplt), reinterpret_cast<BinaryOp_Anon>(cmplt),
reinterpret_cast<BinaryOp_Anon>(cmple)); reinterpret_cast<BinaryOp_Anon>(cmple),
reinterpret_cast<BinaryOp_Anon>(cmpge));
} }
}; };

16
src/numeric/FloatIntegerOps.cpp
View file

@ -74,6 +74,14 @@ namespace xo {
x->value() <= DFloat::value_type(y->value())); x->value() <= DFloat::value_type(y->value()));
} }
obj<AGCObject>
FloatIntegerOps::cmp_greatequal(obj<ARuntimeContext> rcx,
DFloat * x, DInteger * y)
{
return DBoolean::box<AGCObject>(rcx.allocator(),
x->value() >= DFloat::value_type(y->value()));
}
// ----- Integer op Float ----- // ----- Integer op Float -----
obj<AGCObject> obj<AGCObject>
@ -136,6 +144,14 @@ namespace xo {
DFloat::value_type(x->value()) <= y->value()); DFloat::value_type(x->value()) <= y->value());
} }
obj<AGCObject>
IntegerFloatOps::cmp_greatequal(obj<ARuntimeContext> rcx,
DInteger * x, DFloat * y)
{
return DBoolean::box<AGCObject>(rcx.allocator(),
DFloat::value_type(x->value()) >= y->value());
}
} }
} }

29
src/numeric/FloatOps.cpp
View file

@ -23,49 +23,64 @@ namespace xo {
FloatOps::divide(obj<ARuntimeContext> rcx, FloatOps::divide(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y) DFloat * x, DFloat * y)
{ {
return DFloat::box<AGCObject>(rcx.allocator(), x->value() / y->value()); return DFloat::box<AGCObject>(rcx.allocator(),
x->value() / y->value());
} }
obj<AGCObject> obj<AGCObject>
FloatOps::add(obj<ARuntimeContext> rcx, FloatOps::add(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y) DFloat * x, DFloat * y)
{ {
return DFloat::box<AGCObject>(rcx.allocator(), x->value() + y->value()); return DFloat::box<AGCObject>(rcx.allocator(),
x->value() + y->value());
} }
obj<AGCObject> obj<AGCObject>
FloatOps::subtract(obj<ARuntimeContext> rcx, FloatOps::subtract(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y) DFloat * x, DFloat * y)
{ {
return DFloat::box<AGCObject>(rcx.allocator(), x->value() - y->value()); return DFloat::box<AGCObject>(rcx.allocator(),
x->value() - y->value());
} }
obj<AGCObject> obj<AGCObject>
FloatOps::cmp_equal(obj<ARuntimeContext> rcx, FloatOps::cmp_equal(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y) DFloat * x, DFloat * y)
{ {
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() == y->value()); return DBoolean::box<AGCObject>(rcx.allocator(),
x->value() == y->value());
} }
obj<AGCObject> obj<AGCObject>
FloatOps::cmp_notequal(obj<ARuntimeContext> rcx, FloatOps::cmp_notequal(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y) DFloat * x, DFloat * y)
{ {
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() != y->value()); return DBoolean::box<AGCObject>(rcx.allocator(),
x->value() != y->value());
} }
obj<AGCObject> obj<AGCObject>
FloatOps::cmp_less(obj<ARuntimeContext> rcx, FloatOps::cmp_less(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y) DFloat * x, DFloat * y)
{ {
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() < y->value()); return DBoolean::box<AGCObject>(rcx.allocator(),
x->value() < y->value());
} }
obj<AGCObject> obj<AGCObject>
FloatOps::cmp_lessequal(obj<ARuntimeContext> rcx, FloatOps::cmp_lessequal(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y) DFloat * x, DFloat * y)
{ {
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() <= y->value()); return DBoolean::box<AGCObject>(rcx.allocator(),
x->value() <= y->value());
}
obj<AGCObject>
FloatOps::cmp_greatequal(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y)
{
return DBoolean::box<AGCObject>(rcx.allocator(),
x->value() >= y->value());
} }
} }
} }

7
src/numeric/IntegerOps.cpp
View file

@ -69,6 +69,13 @@ namespace xo {
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() <= y->value()); return DBoolean::box<AGCObject>(rcx.allocator(), x->value() <= y->value());
} }
obj<AGCObject>
IntegerOps::cmp_greatequal(obj<ARuntimeContext> rcx,
DInteger * x, DInteger * y)
{
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() >= y->value());
}
} }
} }

12
src/numeric/NumericDispatch.cpp
View file

@ -162,6 +162,18 @@ namespace xo {
x, y); x, y);
} }
obj<AGCObject>
NumericDispatch::cmp_greatequal(obj<ARuntimeContext> rcx,
obj<AGCObject> x,
obj<AGCObject> y)
{
return dispatch(rcx,
"NumericDispatch::cmp_great",
"incomparable types in x>=y",
&AnonymizedNumericOps::cmpge_,
x, y);
}
} /*namespace scm*/ } /*namespace scm*/
} /*namespace xo*/ } /*namespace xo*/

12
src/numeric/numeric_register_facets.cpp
View file

@ -42,7 +42,8 @@ namespace xo {
&FloatOps::cmp_equal, &FloatOps::cmp_equal,
&FloatOps::cmp_notequal, &FloatOps::cmp_notequal,
&FloatOps::cmp_less, &FloatOps::cmp_less,
&FloatOps::cmp_lessequal); &FloatOps::cmp_lessequal,
&FloatOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DFloat, DInteger> NumericDispatch::instance().register_impl<DFloat, DInteger>
(&FloatIntegerOps::multiply, (&FloatIntegerOps::multiply,
@ -52,7 +53,8 @@ namespace xo {
&FloatIntegerOps::cmp_equal, &FloatIntegerOps::cmp_equal,
&FloatIntegerOps::cmp_notequal, &FloatIntegerOps::cmp_notequal,
&FloatIntegerOps::cmp_less, &FloatIntegerOps::cmp_less,
&FloatIntegerOps::cmp_lessequal); &FloatIntegerOps::cmp_lessequal,
&FloatIntegerOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DInteger, DFloat> NumericDispatch::instance().register_impl<DInteger, DFloat>
(&IntegerFloatOps::multiply, (&IntegerFloatOps::multiply,
@ -62,7 +64,8 @@ namespace xo {
&IntegerFloatOps::cmp_equal, &IntegerFloatOps::cmp_equal,
&IntegerFloatOps::cmp_notequal, &IntegerFloatOps::cmp_notequal,
&IntegerFloatOps::cmp_less, &IntegerFloatOps::cmp_less,
&IntegerFloatOps::cmp_lessequal); &IntegerFloatOps::cmp_lessequal,
&IntegerFloatOps::cmp_greatequal);
NumericDispatch::instance().register_impl<DInteger, DInteger> NumericDispatch::instance().register_impl<DInteger, DInteger>
(&IntegerOps::multiply, (&IntegerOps::multiply,
@ -72,7 +75,8 @@ namespace xo {
&IntegerOps::cmp_equal, &IntegerOps::cmp_equal,
&IntegerOps::cmp_notequal, &IntegerOps::cmp_notequal,
&IntegerOps::cmp_less, &IntegerOps::cmp_less,
&IntegerOps::cmp_lessequal); &IntegerOps::cmp_lessequal,
&IntegerOps::cmp_greatequal);
log && log(xtag("ANumeric.tseq", typeseq::id<ANumeric>())); log && log(xtag("ANumeric.tseq", typeseq::id<ANumeric>()));

2
src/numeric/numeric_register_primitives.cpp
View file

@ -74,6 +74,8 @@ namespace xo {
flags & InstallFlags::f_essential); flags & InstallFlags::f_essential);
ok = ok & install_aux(sink, mm, "_cmple", &NumericDispatch::cmp_lessequal, ok = ok & install_aux(sink, mm, "_cmple", &NumericDispatch::cmp_lessequal,
flags & InstallFlags::f_essential); flags & InstallFlags::f_essential);
ok = ok & install_aux(sink, mm, "_cmpge", &NumericDispatch::cmp_greatequal,
flags & InstallFlags::f_essential);
return ok; return ok;
} }