xo-reader2: streamline setup

include/xo/reader2/SetupReader2.hpp

@@ -0,0 +1,25 @@
+/** @file SetupReader2.hpp
+ *
+ *  @author Roland Conybeare, Jan 2026
+ **/
+
+#pragma once
+
+#include <xo/alloc2/Collector.hpp>
+
+namespace xo {
+    namespace scm {
+        struct SetupReader2 {
+        public:
+            using ACollector = xo::mm::ACollector;
+
+        public:
+            /** Register reader2 (facet,impl) combinations with FacetRegistry **/
+            static bool register_facets();
+            /** Register object types with @p gc **/
+            static bool register_types(obj<ACollector> gc);
+        };
+    }
+}
+
+/* end SetupReader2.hpp */

include/xo/reader2/reader2_register_facets.hpp

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

include/xo/reader2/reader2_register_types.hpp

@@ -1,17 +0,0 @@
-/** @file reader2_register_types.hpp
- *
- *  @author Roland Conybeare, Jan 2026
- **/
-
-#pragma once
-
-#include <xo/alloc2/Collector.hpp>
-
-namespace xo {
-    namespace scm {
-        /** Register reader2 gc-aware types with collector **/
-        bool reader2_register_types(obj<xo::mm::ACollector> gc);
-    }
-}
-
-/* end reader2_register_types.hpp */

src/reader2/CMakeLists.txt

@@ -3,8 +3,7 @@
 set(SELF_LIB xo_reader2)
 set(SELF_SRCS
     init_reader2.cpp
-    reader2_register_facets.cpp
-    reader2_register_types.cpp
+    SetupReader2.cpp
 
     SchematikaReader.cpp
     ReaderConfig.cpp

src/reader2/SetupReader2.cpp

@@ -1,9 +1,9 @@
-/** @file reader2_register_facets.cpp
+/** @file SetupReader2.cpp
  *
  *  @author Roland Conybeare, Jan 2026
  **/
 
-#include "reader2_register_facets.hpp"
+#include "SetupReader2.hpp"
 
 #include "SchematikaParser.hpp"
 #include "ToplevelSeqSsm.hpp"
@@ -33,14 +33,16 @@
 
 namespace xo {
     using xo::print::APrintable;
+    using xo::mm::ACollector;
     using xo::mm::AGCObject;
     using xo::facet::FacetRegistry;
     using xo::facet::TypeRegistry;
     using xo::facet::typeseq;
+    using xo::facet::impl_for;
 
     namespace scm {
         bool
-        reader2_register_facets()
+        SetupReader2::register_facets()
         {
             scope log(XO_DEBUG(true));
 
@@ -135,7 +137,19 @@ namespace xo {
 
             return true;
         }
+
+        bool
+        SetupReader2::register_types(obj<ACollector> gc)
+        {
+            scope log(XO_DEBUG(true));
+
+            bool ok = true;
+
+            ok &= gc.install_type(impl_for<AGCObject, DGlobalEnv>());
+
+            return ok;
+        }
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end reader2_register_facets.cpp */
+/* end SetupReader2.cpp */

src/reader2/init_reader2.cpp

@@ -4,24 +4,22 @@
  **/
 
 #include "init_reader2.hpp"
-#include "reader2_register_facets.hpp"
-#include "reader2_register_types.hpp"
+#include "SetupReader2.hpp"
 
 #include <xo/expression2/init_expression2.hpp>
 #include <xo/numeric/init_numeric.hpp>
 #include <xo/alloc2/CollectorTypeRegistry.hpp>
 
 namespace xo {
-    using xo::scm::reader2_register_facets;
-    using xo::scm::reader2_register_types;
+    using xo::scm::SetupReader2;
     using xo::mm::CollectorTypeRegistry;
 
     void
     InitSubsys<S_reader2_tag>::init()
     {
-        reader2_register_facets();
+        SetupReader2::register_facets();
 
-        CollectorTypeRegistry::instance().register_types(&reader2_register_types);
+        CollectorTypeRegistry::instance().register_types(&SetupReader2::register_types);
     }
 
     InitEvidence

src/reader2/reader2_register_types.cpp

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