From 02f96d2e955381dbb55c8404351164e40e19dfdd Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Wed, 18 Feb 2026 22:00:30 -0800 Subject: [PATCH] xo-interpreter2 stack: use xo-numeric/ to support op* --- include/xo/procedure2/init_primitives.hpp | 2 ++ src/procedure2/init_primitives.cpp | 4 ++++ utest/DPrimitive.test.cpp | 5 +++++ 3 files changed, 11 insertions(+) diff --git a/include/xo/procedure2/init_primitives.hpp b/include/xo/procedure2/init_primitives.hpp index 6747fa6..562a984 100644 --- a/include/xo/procedure2/init_primitives.hpp +++ b/include/xo/procedure2/init_primitives.hpp @@ -15,12 +15,14 @@ namespace xo { #endif struct Primitives { +#ifdef OBSOLETE // see xo-numeric/src/numeric/NumericPrimitives.cpp /** polymorphic multiply * * TODO: this will want to move to xo-numeric/ * so we can dispatch on vector, matrix, function types **/ static DPrimitive_gco_2_gco_gco s_mul_gco_gco_pm; +#endif /** polymorphic subtract * diff --git a/src/procedure2/init_primitives.cpp b/src/procedure2/init_primitives.cpp index f3759f4..1d1d50f 100644 --- a/src/procedure2/init_primitives.cpp +++ b/src/procedure2/init_primitives.cpp @@ -39,6 +39,7 @@ namespace xo { } #endif +#ifdef OBSOLETE // see xo-numeric/xo/numeric/NumericPrimitives.cpp obj mul_gco_gco(obj rcx, obj x_gco, @@ -98,6 +99,7 @@ namespace xo { xtag("y.tseq", y_tseq))); return obj(); } +#endif obj sub_gco_gco(obj rcx, @@ -255,8 +257,10 @@ namespace xo { } #endif +#ifdef OSOLETE DPrimitive_gco_2_gco_gco Primitives::s_mul_gco_gco_pm("_mul", &mul_gco_gco); +#endif DPrimitive_gco_2_gco_gco Primitives::s_sub_gco_gco_pm("_sub", &sub_gco_gco); diff --git a/utest/DPrimitive.test.cpp b/utest/DPrimitive.test.cpp index 73e807f..5d0fc31 100644 --- a/utest/DPrimitive.test.cpp +++ b/utest/DPrimitive.test.cpp @@ -46,6 +46,10 @@ namespace xo { REQUIRE(s_init.evidence()); } + // MOVE THESE TO xo-numeric/ + // Should work using NumericPrimitives::s_mul_gco_gco + +#ifdef OBSOLETE TEST_CASE("DPrimitive-n_args", "[procedure2][DPrimitive]") { // s_mul_gco_gco_pm takes 2 AGCObject args @@ -137,6 +141,7 @@ namespace xo { CHECK(output.find("_mul") != std::string::npos); } +#endif } /*namespace ut*/ } /*namespace xo*/