From 46c118fe29be585523e8ff6ac88fb11a68842485 Mon Sep 17 00:00:00 2001
From: Roland Conybeare <rconybeare@gmail.com>
Date: Thu, 12 Mar 2026 20:26:08 -0500
Subject: [PATCH] xo-interpreter2 stack: refactor + bugfix operator expr

---
 utest/DApplyExpr.test.cpp | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/utest/DApplyExpr.test.cpp b/utest/DApplyExpr.test.cpp
index 17b3dca6..7854397d 100644
--- a/utest/DApplyExpr.test.cpp
+++ b/utest/DApplyExpr.test.cpp
@@ -92,7 +92,7 @@ namespace ut {
         REQUIRE(ok);
 
         // wrap primitive as GCObject, then as expression
-        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
+        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(NumericPrimitives::make_multiply_pm(alloc));
         obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
         REQUIRE(fn_expr.data() != nullptr);
 
@@ -131,7 +131,8 @@ namespace ut {
         bool ok = CollectorTypeRegistry::instance().install_types(coll);
         REQUIRE(ok);
 
-        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
+        obj<AGCObject> prim_gco
+            = with_facet<AGCObject>::mkobj(NumericPrimitives::make_multiply_pm(alloc));
         obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
 
         obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);
@@ -166,7 +167,7 @@ namespace ut {
         bool ok = CollectorTypeRegistry::instance().install_types(coll);
         REQUIRE(ok);
 
-        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
+        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(NumericPrimitives::make_multiply_pm(alloc));
         obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
 
         obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);
@@ -201,7 +202,7 @@ namespace ut {
         bool ok = CollectorTypeRegistry::instance().install_types(coll);
         REQUIRE(ok);
 
-        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
+        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(NumericPrimitives::make_multiply_pm(alloc));
         obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
 
         obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);
@@ -283,7 +284,8 @@ namespace ut {
         bool ok = CollectorTypeRegistry::instance().install_types(coll);
         REQUIRE(ok);
 
-        obj<AGCObject> prim_gco = with_facet<AGCObject>::mkobj(&NumericPrimitives::s_mul_gco_gco_pm);
+        obj<AGCObject> prim_gco
+            = with_facet<AGCObject>::mkobj(NumericPrimitives::make_multiply_pm(alloc));
         obj<AExpression,DConstant> fn_expr = DConstant::make(alloc, prim_gco);
 
         obj<AGCObject> val1 = DFloat::box<AGCObject>(alloc, 3.0);