diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt index deb1d25a..07f10c3b 100644 --- a/utest/CMakeLists.txt +++ b/utest/CMakeLists.txt @@ -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) diff --git a/utest/DApplyExpr.test.cpp b/utest/DApplyExpr.test.cpp index f217d47e..1b922333 100644 --- a/utest/DApplyExpr.test.cpp +++ b/utest/DApplyExpr.test.cpp @@ -11,6 +11,8 @@ #include #include +#include + #include #include #include @@ -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 prim_gco = with_facet::mkobj(&Primitives::s_mul_gco_gco_pm); + obj prim_gco = with_facet::mkobj(&NumericPrimitives::s_mul_gco_gco_pm); obj 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 prim_gco = with_facet::mkobj(&Primitives::s_mul_gco_gco_pm); + obj prim_gco = with_facet::mkobj(&NumericPrimitives::s_mul_gco_gco_pm); obj fn_expr = DConstant::make(alloc, prim_gco); obj val1 = DFloat::box(alloc, 3.0); @@ -163,7 +166,7 @@ namespace ut { bool ok = CollectorTypeRegistry::instance().install_types(coll); REQUIRE(ok); - obj prim_gco = with_facet::mkobj(&Primitives::s_mul_gco_gco_pm); + obj prim_gco = with_facet::mkobj(&NumericPrimitives::s_mul_gco_gco_pm); obj fn_expr = DConstant::make(alloc, prim_gco); obj val1 = DFloat::box(alloc, 3.0); @@ -198,7 +201,7 @@ namespace ut { bool ok = CollectorTypeRegistry::instance().install_types(coll); REQUIRE(ok); - obj prim_gco = with_facet::mkobj(&Primitives::s_mul_gco_gco_pm); + obj prim_gco = with_facet::mkobj(&NumericPrimitives::s_mul_gco_gco_pm); obj fn_expr = DConstant::make(alloc, prim_gco); obj val1 = DFloat::box(alloc, 3.0); @@ -236,7 +239,7 @@ namespace ut { bool ok = CollectorTypeRegistry::instance().install_types(coll); REQUIRE(ok); - obj prim_gco = with_facet::mkobj(&Primitives::s_mul_gco_gco_pm); + obj prim_gco = with_facet::mkobj(&NumericPrimitives::s_mul_gco_gco_pm); obj fn_expr = DConstant::make(alloc, prim_gco); obj val1 = DFloat::box(alloc, 3.0); @@ -280,7 +283,7 @@ namespace ut { bool ok = CollectorTypeRegistry::instance().install_types(coll); REQUIRE(ok); - obj prim_gco = with_facet::mkobj(&Primitives::s_mul_gco_gco_pm); + obj prim_gco = with_facet::mkobj(&NumericPrimitives::s_mul_gco_gco_pm); obj fn_expr = DConstant::make(alloc, prim_gco); obj val1 = DFloat::box(alloc, 3.0);