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

xo-numeric: + cmple for op<=

Browse source
This commit is contained in:
Roland Conybeare 2026-03-12 20:54:23 -05:00
commit 47e0cd3a2b
12 changed files with 86 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -34,6 +34,8 @@ namespace xo {
DFloat * x, DInteger * y);
static obj<AGCObject> cmp_less(obj<ARuntimeContext> rcx,
DFloat * x, DInteger * y);
static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx,
DFloat * x, DInteger * y);
};
class IntegerFloatOps {
@ -56,6 +58,8 @@ namespace xo {
DInteger * x, DFloat * y);
static obj<AGCObject> cmp_less(obj<ARuntimeContext> rcx,
DInteger * x, DFloat * y);
static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx,
DInteger * x, DFloat * y);
};
}

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

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

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

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

13
xo-numeric/include/xo/numeric/NumericDispatch.hpp
View file

@ -103,11 +103,16 @@ namespace xo {
obj<AGCObject> x,
obj<AGCObject> y);
/** compare two numeric values for inequality **/
/** compare two numeric values for less **/
static obj<AGCObject> cmp_less(obj<ARuntimeContext> rcx,
obj<AGCObject> x,
obj<AGCObject> y);
/** compare two numeric values for less-or-equal **/
static obj<AGCObject> cmp_lessequal(obj<ARuntimeContext> rcx,
obj<AGCObject> x,
obj<AGCObject> y);
/** report memory use for owned arenas to @p visitor **/
void visit_pools(const MemorySizeVisitor & visitor);
@ -123,7 +128,8 @@ namespace xo {
typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl sub_fn,
typename NumericOps<DRepr1, DRepr2>::BinaryOp_Impl cmpeq_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) {
KeyType key(typeseq::id<DRepr1>().seqno(),
typeseq::id<DRepr2>().seqno());
@ -136,7 +142,8 @@ namespace xo {
sub_fn,
cmpeq_fn,
cmpne_fn,
cmplt_fn);
cmplt_fn,
cmple_fn);
}
private:

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

@ -28,9 +28,10 @@ namespace xo {
BinaryOp subtract,
BinaryOp cmpeq,
BinaryOp cmpne,
BinaryOp cmplt)
BinaryOp cmplt,
BinaryOp cmple)
: multiply_{multiply}, divide_{divide}, add_{add}, subtract_{subtract},
cmpeq_{cmpeq}, cmpne_{cmpne}, cmplt_{cmplt} {}
cmpeq_{cmpeq}, cmpne_{cmpne}, cmplt_{cmplt}, cmple_{cmple} {}
BinaryOp multiply_ = nullptr;
BinaryOp divide_ = nullptr;
@ -43,6 +44,8 @@ namespace xo {
BinaryOp cmpne_ = nullptr;
/** compare numerics (<) **/
BinaryOp cmplt_ = nullptr;
/** compare numerics (<=) **/
BinaryOp cmple_ = nullptr;
};
template <typename DRepr1, typename DRepr2>
@ -60,14 +63,16 @@ namespace xo {
BinaryOp_Impl subtract,
BinaryOp_Impl cmpeq,
BinaryOp_Impl cmpne,
BinaryOp_Impl cmplt) {
BinaryOp_Impl cmplt,
BinaryOp_Impl cmple) {
return AnonymizedNumericOps(reinterpret_cast<BinaryOp_Anon>(multiply),
reinterpret_cast<BinaryOp_Anon>(divide),
reinterpret_cast<BinaryOp_Anon>(add),
reinterpret_cast<BinaryOp_Anon>(subtract),
reinterpret_cast<BinaryOp_Anon>(cmpeq),
reinterpret_cast<BinaryOp_Anon>(cmpne),
reinterpret_cast<BinaryOp_Anon>(cmplt));
reinterpret_cast<BinaryOp_Anon>(cmplt),
reinterpret_cast<BinaryOp_Anon>(cmple));
}
};

2
xo-numeric/include/xo/numeric/NumericPrimitives.hpp
View file

@ -33,6 +33,8 @@ namespace xo {
static DPrimitive_gco_2_gco_gco * make_cmpne_pm(obj<AAllocator> mm);
/** polymorphic (in both arguments) compare (<) **/
static DPrimitive_gco_2_gco_gco * make_cmplt_pm(obj<AAllocator> mm);
/** polymorphic (in both arguments) compare (<=) **/
static DPrimitive_gco_2_gco_gco * make_cmple_pm(obj<AAllocator> mm);
};
}
}

16
xo-numeric/src/numeric/FloatIntegerOps.cpp
View file

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

7
xo-numeric/src/numeric/FloatOps.cpp
View file

@ -60,6 +60,13 @@ namespace xo {
{
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() < y->value());
}
obj<AGCObject>
FloatOps::cmp_lessequal(obj<ARuntimeContext> rcx,
DFloat * x, DFloat * y)
{
return DBoolean::box<AGCObject>(rcx.allocator(), x->value() <= y->value());
}
}
}

7
xo-numeric/src/numeric/IntegerOps.cpp
View file

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

57
xo-numeric/src/numeric/NumericDispatch.cpp
View file

@ -99,18 +99,6 @@ namespace xo {
"incomparable types in x+y",
&AnonymizedNumericOps::add_,
x, y);
#ifdef OBSOLETE
KeyType key(x._typeseq(), y._typeseq());
auto target_fn
= NumericDispatch::instance().dispatch_[key].add_;
if (!target_fn)
assert(false);
return (*target_fn)(rcx, x.data(), y.data());
#endif
}
obj<AGCObject>
@ -123,18 +111,6 @@ namespace xo {
"incomparable types in x-y",
&AnonymizedNumericOps::subtract_,
x, y);
#ifdef OBSOLETE
KeyType key(x._typeseq(), y._typeseq());
auto target_fn
= NumericDispatch::instance().dispatch_[key].subtract_;
if (!target_fn)
assert(false);
return (*target_fn)(rcx, x.data(), y.data());
#endif
}
obj<AGCObject>
@ -148,27 +124,6 @@ namespace xo {
&AnonymizedNumericOps::cmpeq_,
x, y);
#ifdef OBSOLETE
KeyType key(x._typeseq(), y._typeseq());
auto target_fn
= NumericDispatch::instance().dispatch_[key].cmpeq_;
if (!target_fn) {
// FIXME: use {fmt} here
std::stringstream ss;
tosn(ss,
"incomparable types in x==y",
xtag("x.type", TypeRegistry::id2name(x._typeseq())),
xtag("y.type", TypeRegistry::id2name(y._typeseq())));
return DRuntimeError::make(rcx.allocator(),
"NumericDispatch::cmp_equal",
ss.str().c_str());
}
return (*target_fn)(rcx, x.data(), y.data());
#endif
}
obj<AGCObject>
@ -195,6 +150,18 @@ namespace xo {
x, y);
}
obj<AGCObject>
NumericDispatch::cmp_lessequal(obj<ARuntimeContext> rcx,
obj<AGCObject> x,
obj<AGCObject> y)
{
return dispatch(rcx,
"NumericDispatch::cmp_lessequal",
"incomparable types in x<=y",
&AnonymizedNumericOps::cmple_,
x, y);
}
} /*namespace scm*/
} /*namespace xo*/

7
xo-numeric/src/numeric/NumericPrimitives.cpp
View file

@ -61,6 +61,13 @@ namespace xo {
&NumericDispatch::cmp_less);
}
DPrimitive_gco_2_gco_gco *
NumericPrimitives::make_cmple_pm(obj<AAllocator> mm)
{
return DPrimitive_gco_2_gco_gco::_make(mm, "_cmple",
&NumericDispatch::cmp_lessequal);
}
} /*namespace scm*/
} /*namespace xo*/

12
xo-numeric/src/numeric/numeric_register_facets.cpp
View file

@ -41,7 +41,8 @@ namespace xo {
&FloatOps::subtract,
&FloatOps::cmp_equal,
&FloatOps::cmp_notequal,
&FloatOps::cmp_less);
&FloatOps::cmp_less,
&FloatOps::cmp_lessequal);
NumericDispatch::instance().register_impl<DFloat, DInteger>
(&FloatIntegerOps::multiply,
@ -50,7 +51,8 @@ namespace xo {
&FloatIntegerOps::subtract,
&FloatIntegerOps::cmp_equal,
&FloatIntegerOps::cmp_notequal,
&FloatIntegerOps::cmp_less);
&FloatIntegerOps::cmp_less,
&FloatIntegerOps::cmp_lessequal);
NumericDispatch::instance().register_impl<DInteger, DFloat>
(&IntegerFloatOps::multiply,
@ -59,7 +61,8 @@ namespace xo {
&IntegerFloatOps::subtract,
&IntegerFloatOps::cmp_equal,
&IntegerFloatOps::cmp_notequal,
&IntegerFloatOps::cmp_less);
&IntegerFloatOps::cmp_less,
&IntegerFloatOps::cmp_lessequal);
NumericDispatch::instance().register_impl<DInteger, DInteger>
(&IntegerOps::multiply,
@ -68,7 +71,8 @@ namespace xo {
&IntegerOps::subtract,
&IntegerOps::cmp_equal,
&IntegerOps::cmp_notequal,
&IntegerOps::cmp_less);
&IntegerOps::cmp_less,
&IntegerOps::cmp_lessequal);
log && log(xtag("ANumeric.tseq", typeseq::id<ANumeric>()));