init dep handling for xo-expression2 -> xo-procedure2

xo-expression2/cmake/xo_expression2Config.cmake.in

@@ -8,7 +8,7 @@ include(CMakeFindDependencyMacro)
 #
 find_dependency(xo_gc)
 find_dependency(reflect)
-find_dependency(xo_object2)
+find_dependency(xo_procedure2)
 find_dependency(xo_printable2)
 find_dependency(xo_flatstring)
 find_dependency(cmake)

xo-expression2/src/expression2/CMakeLists.txt

@@ -44,7 +44,7 @@ xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 $
 # note: deps here must also appear in cmake/xo_expression2Config.cmake.in
 xo_dependency(${SELF_LIB} xo_gc)
 xo_dependency(${SELF_LIB} reflect)
-xo_dependency(${SELF_LIB} xo_object2)
+xo_dependency(${SELF_LIB} xo_procedure2)
 xo_dependency(${SELF_LIB} xo_printable2)
 xo_dependency(${SELF_LIB} xo_flatstring)
 xo_dependency(${SELF_LIB} subsys)

xo-expression2/src/expression2/init_expression2.cpp

@@ -7,7 +7,7 @@
 #include "expression2_register_facets.hpp"
 #include "expression2_register_types.hpp"
 
-#include <xo/object2/init_object2.hpp>
+#include <xo/procedure2/init_procedure2.hpp>
 #include <xo/gc/CollectorTypeRegistry.hpp>
 
 namespace xo {
@@ -29,7 +29,7 @@ namespace xo {
             InitEvidence retval;
 
             /* direct subsystem deps for xo-object2/ */
-            retval ^= InitSubsys<S_object2_tag>::require();
+            retval ^= InitSubsys<S_procedure2_tag>::require();
 
             /* xo-expression2/'s own initialization code */
             retval ^= Subsystem::provide<S_expression2_tag>("expression2", &init);

xo-procedure2/include/xo/procedure2/procedure2_register_facets.hpp

@@ -0,0 +1,17 @@
+/** @file procedure2_register_facets.hpp
+ *
+ *  @author Roland Conybeare, Jan 2026
+ **/
+
+#pragma once
+
+#include <xo/gc/Collector.hpp>
+
+namespace xo {
+    namespace scm {
+        /** Register procedure2 (facet,impl) combinations with FacetRegistry **/
+        bool procedure2_register_facets();
+    }
+}
+
+/* end procedure2_register_facets.hpp */

xo-procedure2/include/xo/procedure2/procedure2_register_types.hpp

@@ -0,0 +1,17 @@
+/** @file procedure2_register_types.hpp
+ *
+ *  @author Roland Conybeare, Dec 2025
+ **/
+
+#pragma once
+
+#include <xo/gc/Collector.hpp>
+
+namespace xo {
+    namespace scm {
+        /** Register gc-aware (AGCObject,DRepr) combinations with garbage collector @p gc **/
+        bool procedure2_register_types(obj<xo::mm::ACollector> gc);
+    }
+}
+
+/* end procedure2_register_types.hpp */

xo-procedure2/src/procedure2/CMakeLists.txt

@@ -4,6 +4,8 @@ set(SELF_LIB xo_procedure2)
 set(SELF_SRCS
     init_procedure2.cpp
     init_primitives.cpp
+    procedure2_register_types.cpp
+    procedure2_register_facets.cpp
     DPrimitive.cpp
     IRuntimeContext_Any.cpp
     IProcedure_Any.cpp

xo-procedure2/src/procedure2/init_procedure2.cpp

@@ -5,16 +5,23 @@
 
 #include "init_procedure2.hpp"
 #include "init_primitives.hpp"
-//#include "procedure2_register_facets.hpp"
-//#include "procedure2_register_types.hpp"
+#include "procedure2_register_facets.hpp"
+#include "procedure2_register_types.hpp"
+
+#include <xo/object2/init_object2.hpp>
 #include <xo/gc/CollectorTypeRegistry.hpp>
 
 namespace xo {
-    using xo::scm::Primitives;
+    using xo::scm::procedure2_register_facets;
+    using xo::scm::procedure2_register_types;
+    using xo::mm::CollectorTypeRegistry;
 
     void
     InitSubsys<S_procedure2_tag>::init()
     {
+        procedure2_register_facets();
+
+        CollectorTypeRegistry::instance().register_types(&procedure2_register_types);
     }
 
     InitEvidence
@@ -22,6 +29,9 @@ namespace xo {
     {
         InitEvidence retval;
 
+        /* recursive subsystem deps for xo-object2/ */
+        retval ^= InitSubsys<S_object2_tag>::require();
+
         /* xo-procedure2/'s own initialization code */
         retval ^= Subsystem::provide<S_procedure2_tag>("procedure2", &init);
 

xo-procedure2/src/procedure2/procedure2_register_facets.cpp

@@ -0,0 +1,33 @@
+/** @file procedure2_register_facets.cpp
+ *
+ *  @author Roland Conybeare, Jan 2026
+ **/
+
+#include "DPrimitive_gco_2_gco_gco.hpp"
+#include "detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp"
+
+#include <xo/gc/GCObject.hpp>
+#include <xo/facet/FacetRegistry.hpp>
+#include <xo/indentlog/scope.hpp>
+
+namespace xo {
+    using xo::facet::FacetRegistry;
+    using xo::facet::typeseq;
+
+    namespace scm {
+        bool
+        procedure2_register_facets()
+        {
+            scope log(XO_DEBUG(true));
+
+            FacetRegistry::register_impl<AGCObject, DPrimitive_gco_2_gco_gco>();
+
+            log && log(xtag("DPrimitive_gco_2_gco_gco.tseq", typeseq::id<DPrimitive_gco_2_gco_gco>()));
+
+            return true;
+        }
+
+    } /*namespace scm*/
+} /*namespace xo*/
+
+/* end procedure2_register_facets.cpp */

xo-procedure2/src/procedure2/procedure2_register_types.cpp

@@ -0,0 +1,33 @@
+/** @file procedure2_register_types.cpp
+ *
+ *  @author Roland Conybeare, Jan 2026
+ **/
+
+#include "procedure2_register_types.hpp"
+
+#include "detail/IGCObject_DPrimitive_gco_2_gco_gco.hpp"
+#include <xo/indentlog/scope.hpp>
+
+namespace xo {
+    using xo::mm::ACollector;
+    using xo::mm::AGCObject;
+    using xo::facet::impl_for;
+    using xo::facet::typeseq;
+    using xo::scope;
+
+    namespace scm {
+        bool
+        procedure2_register_types(obj<ACollector> gc)
+        {
+            scope log(XO_DEBUG(true));
+
+            bool ok = true;
+
+            ok &= gc.install_type(impl_for<AGCObject, DPrimitive_gco_2_gco_gco>());
+
+            return ok;
+        }
+    }
+} /*namespace xo*/
+
+/* end procedure2_register_types.cpp */