xo-interpreter2: streamline setup

include/xo/interpreter2/SetupInterpreter2.hpp

@@ -0,0 +1,27 @@
+/** @file SetupInterpreter2.hpp
+ *
+ *  @author Roland Conybeare, Mar 2026
+ **/
+
+#pragma once
+
+#include "PrimitiveRegistry.hpp"
+#include <xo/alloc2/Collector.hpp>
+
+namespace xo {
+    namespace scm {
+        struct SetupInterpreter2 {
+        public:
+            using ACollector = xo::mm::ACollector;
+
+        public:
+            static bool register_facets();
+            static bool register_types(obj<ACollector> gc);
+            static bool register_primitives(obj<ARuntimeContext> rcx,
+                                            InstallSink sink,
+                                            InstallFlags flags);
+        };
+    }
+}
+
+/* end SetupInterpreter2.hpp */

include/xo/interpreter2/interpreter2_register_facets.hpp

@@ -1,15 +0,0 @@
-/** @file interpreter2_register_facets.hpp
- *
- *  @author Roland Conybeare, Feb 2026
- **/
-
-#pragma once
-
-namespace xo {
-    namespace scm {
-        /** Register interpreter2 (facet,impl) combinations with FacetRegistry **/
-        bool interpreter2_register_facets();
-    }
-}
-
-/* end interpreter2_register_facets.hpp */

include/xo/interpreter2/interpreter2_register_primitives.hpp

@@ -1,22 +0,0 @@
-/** @file interpreter2_register_primitives.hpp
- *
- *  @author Roland Conybeare, Mar 2026
- **/
-
-#pragma once
-
-#include "PrimitiveRegistry.hpp"
-#include <xo/alloc2/Collector.hpp>
-
-namespace xo {
-    namespace scm {
-        /** Register primitive-factories **/
-        bool interpreter2_register_primitives(obj<ARuntimeContext> rcx,
-                                              //xo::mm::AAllocator> gc,
-                                              //StringTable * stbl,
-                                              InstallSink sink,
-                                              InstallFlags flags);
-    }
-}
-
-/* end interpreter2_register_primitives.hpp */

include/xo/interpreter2/interpreter2_register_types.hpp

@@ -1,17 +0,0 @@
-/** @file interpreter2_register_types.hpp
- *
- *  @author Roland Conybeare, Dec 2025
- **/
-
-#pragma once
-
-#include <xo/alloc2/Collector.hpp>
-
-namespace xo {
-    namespace scm {
-        /** Register interpreter2 (facet,impl) combinations with FacetRegistry **/
-        bool interpreter2_register_types(obj<xo::mm::ACollector> gc);
-    }
-}
-
-/* end interpreter2_register_types.hpp */