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

xo-interpreter2 stack: use xo-numeric/ to support op*

Browse source
This commit is contained in:
Roland Conybeare 2026-02-18 22:00:30 -08:00
commit 1aa569c159
2 changed files with 10 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

1
utest/CMakeLists.txt
View file

@ -14,4 +14,5 @@ set(UTEST_SRCS
xo_add_utest_executable(${UTEST_EXE} ${UTEST_SRCS})
xo_self_dependency(${UTEST_EXE} xo_expression2)
xo_dependency(${UTEST_EXE} xo_numeric)
xo_external_target_dependency(${UTEST_EXE} Catch2 Catch2::Catch2)

15
utest/DApplyExpr.test.cpp
View file

@ -11,6 +11,8 @@
#include <xo/expression2/detail/IPrintable_DApplyExpr.hpp>
#include <xo/expression2/detail/IPrintable_DConstant.hpp>
#include <xo/numeric/NumericPrimitives.hpp>
#include <xo/procedure2/init_primitives.hpp>
#include <xo/procedure2/detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp>
#include <xo/procedure2/detail/IPrintable_DPrimitive_gco_2_gco_gco.hpp>
@ -40,6 +42,7 @@ namespace ut {
using xo::scm::DFloat;
using xo::scm::AExpression;
using xo::scm::TypeRef;
using xo::scm::NumericPrimitives;
using xo::scm::Primitives;
using xo::scm::DPrimitive_gco_2_gco_gco;
using xo::mm::CollectorTypeRegistry;
@ -89,7 +92,7 @@ namespace ut {
REQUIRE(ok);
// wrap primitive as GCObject, then as expression
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&Primitives::s_mul_gco_gco_pm);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
REQUIRE(fn_expr.data() != nullptr);
@ -128,7 +131,7 @@ namespace ut {
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&Primitives::s_mul_gco_gco_pm);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);
@ -163,7 +166,7 @@ namespace ut {
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&Primitives::s_mul_gco_gco_pm);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);
@ -198,7 +201,7 @@ namespace ut {
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&Primitives::s_mul_gco_gco_pm);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);
@ -236,7 +239,7 @@ namespace ut {
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&Primitives::s_mul_gco_gco_pm);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);
@ -280,7 +283,7 @@ namespace ut {
bool ok = CollectorTypeRegistry::instance().install_types(coll);
REQUIRE(ok);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&Primitives::s_mul_gco_gco_pm);
obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);