xo-interpreter2 stack: refactor: string clases -> xo-stringtable2/

xo-alloc2/CMakeLists.txt

@@ -18,6 +18,15 @@ add_definitions(${PROJECT_CXX_FLAGS})
 
 # ----------------------------------------------------------------
 
+# note: manual target; generated code committed to git
+xo_add_genfacet(
+    TARGET xo-gc-facet-gcobject
+    FACET GCObject
+    INPUT idl/GCObject.json5
+)
+
+# ----------------------------------------------------------------
+
 # note: manual target; generated code committed to git
 xo_add_genfacet(
     TARGET xo-alloc2-facet-resourcevisitor

xo-alloc2/include/xo/gc/GCObject.hpp

@@ -0,0 +1,22 @@
+/** @file GCObject.hpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/GCObject.json5]
+ *  2. jinja2 template for facet .hpp file:
+ *       [facet.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/GCObject.json5]
+ **/
+
+#pragma once
+
+#include "detail/AGCObject.hpp"
+#include "detail/IGCObject_Any.hpp"
+#include "detail/IGCObject_Xfer.hpp"
+#include "detail/RGCObject.hpp"
+
+
+/* end GCObject.hpp */

xo-alloc2/include/xo/gc/detail/AGCObject.hpp

@@ -0,0 +1,87 @@
+/** @file AGCObject.hpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/GCObject.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [abstract_facet.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/GCObject.json5]
+ **/
+
+#pragma once
+
+// includes (via {facet_includes})
+#include <xo/alloc2/Allocator.hpp>
+#include <xo/gc/Collector.hpp>
+#include <cstdint>
+#include <cstddef>
+#include <xo/facet/obj.hpp>
+#include <xo/facet/facet_implementation.hpp>
+#include <xo/facet/typeseq.hpp>
+
+namespace xo { namespace mm { class ACollector; }}
+
+namespace xo {
+namespace mm {
+
+using Copaque = const void *;
+using Opaque = void *;
+
+/**
+GC hooks for collector-aware data
+**/
+class AGCObject {
+public:
+    /** @defgroup mm-gcobject-type-traits **/
+    ///@{
+    // types
+    /** integer identifying a type **/
+    using typeseq = xo::facet::typeseq;
+    using Copaque = const void *;
+    using Opaque = void *;
+    /** type for an amount of memory **/
+    using size_type = std::size_t;
+    /** fomo allocator type **/
+    using AAllocator = xo::mm::AAllocator;
+    /** fomo collector type **/
+    using ACollector = xo::mm::ACollector;
+    ///@}
+
+    /** @defgroup mm-gcobject-methods **/
+    ///@{
+    // const methods
+    /** RTTI: unique id# for actual runtime data representation **/
+    virtual typeseq _typeseq() const noexcept = 0;
+    /** destroy instance @p d; calls c++ dtor only for actual runtime type; does not recover memory **/
+    virtual void _drop(Opaque d) const noexcept = 0;
+    /** memory consumption for this instance **/
+    virtual size_type shallow_size(Copaque data)  const  noexcept = 0;
+    /** copy instance using allocator **/
+    virtual Opaque shallow_copy(Copaque data, obj<AAllocator> mm)  const  noexcept = 0;
+
+    // nonconst methods
+    /** during GC: forward immdiate children **/
+    virtual size_type forward_children(Opaque data, obj<ACollector> gc)  const  noexcept = 0;
+    ///@}
+}; /*AGCObject*/
+
+/** Implementation IGCObject_DRepr of AGCObject for state DRepr
+ *  should provide a specialization:
+ *
+ *    template <>
+ *    struct xo::facet::FacetImplementation<AGCObject, DRepr> {
+ *        using Impltype = IGCObject_DRepr;
+ *    };
+ *
+ *  then IGCObject_ImplType<DRepr> --> IGCObject_DRepr
+ **/
+template <typename DRepr>
+using IGCObject_ImplType = xo::facet::FacetImplType<AGCObject, DRepr>;
+
+} /*namespace mm*/
+} /*namespace xo*/
+
+/* AGCObject.hpp */

xo-alloc2/include/xo/gc/detail/IGCObject_Any.hpp

@@ -0,0 +1,93 @@
+/** @file IGCObject_Any.hpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/GCObject.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_any.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/GCObject.json5]
+ **/
+
+#pragma once
+
+#include "AGCObject.hpp"
+#include <xo/facet/obj.hpp>
+
+namespace xo { namespace mm { class IGCObject_Any; } }
+
+namespace xo {
+namespace facet {
+
+template <>
+struct FacetImplementation<xo::mm::AGCObject,
+                           DVariantPlaceholder>
+{
+    using ImplType = xo::mm::IGCObject_Any;
+};
+
+}
+}
+
+namespace xo {
+namespace mm {
+
+    /** @class IGCObject_Any
+     *  @brief AGCObject implementation for empty variant instance
+     **/
+    class IGCObject_Any : public AGCObject {
+    public:
+        /** @defgroup mm-gcobject-any-type-traits **/
+        ///@{
+
+        /** integer identifying a type **/
+        using typeseq = xo::facet::typeseq;
+        using size_type = AGCObject::size_type;
+        using AAllocator = AGCObject::AAllocator;
+        using ACollector = AGCObject::ACollector;
+
+        ///@}
+        /** @defgroup mm-gcobject-any-methods **/
+        ///@{
+
+        const AGCObject * iface() const { return std::launder(this); }
+
+        // from AGCObject
+
+        // builtin methods
+        typeseq _typeseq() const noexcept override { return s_typeseq; }
+        [[noreturn]] void _drop(Opaque) const noexcept override { _fatal(); }
+
+        // const methods
+        [[noreturn]] size_type shallow_size(Copaque)  const  noexcept override { _fatal(); }
+        [[noreturn]] Opaque shallow_copy(Copaque, obj<AAllocator>)  const  noexcept override { _fatal(); }
+
+        // nonconst methods
+        [[noreturn]] size_type forward_children(Opaque, obj<ACollector>)  const  noexcept override;
+
+        ///@}
+
+    private:
+        /** @defgraoup mm-gcobject-any-private-methods **/
+        ///@{
+
+        [[noreturn]] static void _fatal();
+
+        ///@}
+
+    public:
+        /** @defgroup mm-gcobject-any-member-vars **/
+        ///@{
+
+        static typeseq s_typeseq;
+        static bool _valid;
+
+        ///@}
+    };
+
+} /*namespace mm */
+} /*namespace xo */
+
+/* IGCObject_Any.hpp */

xo-alloc2/include/xo/gc/detail/IGCObject_Xfer.hpp

@@ -0,0 +1,95 @@
+/** @file IGCObject_Xfer.hpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/GCObject.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_any.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/GCObject.json5]
+ **/
+
+#pragma once
+
+#include <xo/alloc2/Allocator.hpp>
+#include <xo/gc/Collector.hpp>
+#include <cstdint>
+#include <cstddef>
+
+namespace xo {
+namespace mm {
+    /** @class IGCObject_Xfer
+     **/
+    template <typename DRepr, typename IGCObject_DRepr>
+    class IGCObject_Xfer : public AGCObject {
+    public:
+        /** @defgroup mm-gcobject-xfer-type-traits **/
+        ///@{
+        /** actual implementation (not generated; often delegates to DRepr) **/
+        using Impl = IGCObject_DRepr;
+        /** integer identifying a type **/
+        using typeseq = AGCObject::typeseq;
+        using size_type = AGCObject::size_type;
+        using AAllocator = AGCObject::AAllocator;
+        using ACollector = AGCObject::ACollector;
+        ///@}
+
+        /** @defgroup mm-gcobject-xfer-methods **/
+        ///@{
+
+        static const DRepr & _dcast(Copaque d) { return *(const DRepr *)d; }
+        static DRepr & _dcast(Opaque d) { return *(DRepr *)d; }
+
+        // from AGCObject
+
+        // builtin methods
+        typeseq _typeseq() const noexcept override { return s_typeseq; }
+        void _drop(Opaque d) const noexcept override { _dcast(d).~DRepr(); }
+
+        // const methods
+        size_type shallow_size(Copaque data)  const  noexcept override {
+            return I::shallow_size(_dcast(data));
+        }
+        Opaque shallow_copy(Copaque data, obj<AAllocator> mm)  const  noexcept override {
+            return I::shallow_copy(_dcast(data), mm);
+        }
+
+        // non-const methods
+        size_type forward_children(Opaque data, obj<ACollector> gc)  const  noexcept override {
+            return I::forward_children(_dcast(data), gc);
+        }
+
+        ///@}
+
+    private:
+        using I = Impl;
+
+    public:
+        /** @defgroup mm-gcobject-xfer-member-vars **/
+        ///@{
+
+        /** typeseq for template parameter DRepr **/
+        static typeseq s_typeseq;
+        /** true iff satisfies facet implementation **/
+        static bool _valid;
+
+        ///@}
+    };
+
+    template <typename DRepr, typename IGCObject_DRepr>
+    xo::facet::typeseq
+    IGCObject_Xfer<DRepr, IGCObject_DRepr>::s_typeseq
+      = xo::facet::typeseq::id<DRepr>();
+
+    template <typename DRepr, typename IGCObject_DRepr>
+    bool
+    IGCObject_Xfer<DRepr, IGCObject_DRepr>::_valid
+      = xo::facet::valid_facet_implementation<AGCObject,
+                                              IGCObject_Xfer>();
+
+} /*namespace mm */
+} /*namespace xo*/
+
+/* end IGCObject_Xfer.hpp */

xo-alloc2/include/xo/gc/detail/RGCObject.hpp

@@ -0,0 +1,93 @@
+/** @file RGCObject.hpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/GCObject.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_any.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/GCObject.json5]
+ **/
+
+#pragma once
+
+#include "AGCObject.hpp"
+
+namespace xo {
+namespace mm {
+
+/** @class RGCObject
+ **/
+template <typename Object>
+class RGCObject : public Object {
+private:
+    using O = Object;
+
+public:
+    /** @defgroup mm-gcobject-router-type-traits **/
+    ///@{
+    using ObjectType = Object;
+    using DataPtr = Object::DataPtr;
+    using typeseq = xo::reflect::typeseq;
+    using size_type = AGCObject::size_type;
+    using AAllocator = AGCObject::AAllocator;
+    using ACollector = AGCObject::ACollector;
+    ///@}
+
+    /** @defgroup mm-gcobject-router-ctors **/
+    ///@{
+    RGCObject() {}
+    RGCObject(Object::DataPtr data) : Object{std::move(data)} {}
+    RGCObject(const AGCObject * iface, void * data)
+      requires std::is_same_v<typename Object::DataType, xo::facet::DVariantPlaceholder>
+      : Object(iface, data) {}
+
+    ///@}
+    /** @defgroup mm-gcobject-router-methods **/
+    ///@{
+
+    // explicit injected content
+
+    // builtin methods
+    typeseq _typeseq() const noexcept { return O::iface()->_typeseq(); }
+    void _drop() const noexcept { O::iface()->_drop(O::data()); }
+
+    // const methods
+    size_type shallow_size()  const  noexcept {
+        return O::iface()->shallow_size(O::data());
+    }
+    Opaque shallow_copy(obj<AAllocator> mm)  const  noexcept {
+        return O::iface()->shallow_copy(O::data(), mm);
+    }
+
+    // non-const methods (still const in router!)
+    size_type forward_children(obj<ACollector> gc)  noexcept {
+        return O::iface()->forward_children(O::data(), gc);
+    }
+
+    ///@}
+    /** @defgroup mm-gcobject-member-vars **/
+    ///@{
+
+    static bool _valid;
+
+    ///@}
+};
+
+template <typename Object>
+bool
+RGCObject<Object>::_valid = xo::facet::valid_object_router<Object>();
+
+} /*namespace mm*/
+} /*namespace xo*/
+
+namespace xo { namespace facet {
+    template <typename Object>
+    struct RoutingFor<xo::mm::AGCObject, Object> {
+        using RoutingType = xo::mm::RGCObject<Object>;
+    };
+} }
+
+/* end RGCObject.hpp */

xo-alloc2/src/gc/IGCObject_Any.cpp

@@ -0,0 +1,48 @@
+/** @file IGCObject_Any.cpp
+ *
+ **/
+
+#include "detail/IGCObject_Any.hpp"
+#include <iostream>
+#include <exception>
+
+namespace xo {
+namespace mm {
+
+using xo::facet::DVariantPlaceholder;
+using xo::facet::typeseq;
+using xo::facet::valid_facet_implementation;
+
+void
+IGCObject_Any::_fatal()
+{
+    /* control here on uninitialized IAllocator_Any.
+     * Initialized instance will have specific implementation type
+     */
+    std::cerr << "fatal"
+              << ": attempt to call uninitialized"
+              << " IGCObject_Any method"
+              << std::endl;
+    std::terminate();
+}
+
+typeseq
+IGCObject_Any::s_typeseq = typeseq::id<DVariantPlaceholder>();
+
+bool
+IGCObject_Any::_valid
+  = valid_facet_implementation<AGCObject, IGCObject_Any>();
+
+// nonconst methods
+
+auto
+IGCObject_Any::forward_children(Opaque, obj<ACollector>)  const  noexcept -> size_type
+{
+    _fatal();
+}
+
+
+} /*namespace mm*/
+} /*namespace xo*/
+
+/* end IGCObject_Any.cpp */

xo-expression2/CMakeLists.txt

@@ -394,30 +394,6 @@ xo_add_genfacetimpl(
 
 # ----------------------------------------------------------------
 
-# note: manual target; generated code committed to git
-xo_add_genfacetimpl(
-    TARGET xo-expression2-facetimpl-gcobject-uniquestring
-    FACET_PKG xo_gc
-    FACET GCObject
-    REPR UniqueString
-    INPUT idl/IGCObject_DUniqueString.json5
-    OUTPUT_HPP_DIR include/xo/expression2
-    OUTPUT_IMPL_SUBDIR detail
-)
-
-# note: manual target; generated code committed to git
-xo_add_genfacetimpl(
-    TARGET xo-expression2-facetimpl-printable-uniquestring
-    FACET_PKG xo_printable2
-    FACET Printable
-    REPR UniqueString
-    INPUT idl/IPrintable_DUniqueString.json5
-    OUTPUT_HPP_DIR include/xo/expression2
-    OUTPUT_IMPL_SUBDIR detail
-)
-
-# ----------------------------------------------------------------
-
 xo_add_genfacet_all(xo-expression2-genfacet-all)
 
 # ----------------------------------------------------------------

xo-expression2/src/expression2/CMakeLists.txt

@@ -63,12 +63,6 @@ set(SELF_SRCS
     IGCObject_DGlobalSymtab.cpp
     IPrintable_DGlobalSymtab.cpp
 
-    StringTable.cpp
-
-    DUniqueString.cpp
-    IGCObject_DUniqueString.cpp
-    IPrintable_DUniqueString.cpp
-
     )
 
 xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})

xo-expression2/src/expression2/expression2_register_facets.cpp

@@ -5,8 +5,6 @@
 
 #include "expression2_register_facets.hpp"
 
-#include <xo/expression2/UniqueString.hpp>
-
 #include <xo/expression2/detail/IExpression_DVariable.hpp>
 #include <xo/expression2/detail/IGCObject_DVariable.hpp>
 #include <xo/expression2/detail/IPrintable_DVariable.hpp>
@@ -43,9 +41,6 @@ namespace xo {
         {
             scope log(XO_DEBUG(true));
 
-            FacetRegistry::register_impl<AGCObject, DUniqueString>();
-            FacetRegistry::register_impl<APrintable, DUniqueString>();
-
             // Expression
             // +- Constant
             // +- Variable

xo-expression2/src/expression2/expression2_register_types.cpp

@@ -5,7 +5,8 @@
 
 #include "expression2_register_types.hpp"
 
-#include "detail/IGCObject_DConstant.hpp"
+#include "Constant.hpp"
+//#include "detail/IGCObject_DConstant.hpp"
 #include "detail/IGCObject_DVariable.hpp"
 //#include "detail/IGCObject_DDefineExpr.hpp"   // when avail
 //#include "detail/IGCObject_DApplyExpr.hpp"    // when avail
@@ -13,7 +14,7 @@
 #include "detail/IGCObject_DIfElseExpr.hpp"
 #include "detail/IGCObject_DSequenceExpr.hpp"
 //#include "detail/IGCObject_DLocalSymtab.hpp"  // when avail
-#include "detail/IGCObject_DUniqueString.hpp"
+//#include "detail/IGCObject_DUniqueString.hpp"
 
 //#include "detail/IPrintable_DUniqueString.hpp" // when avail
 
@@ -44,8 +45,6 @@ namespace xo {
 
             //ok &= gc.install_type(impl_for<AGCObject, DLocalSymtab>()); // when avail
 
-            ok &= gc.install_type(impl_for<AGCObject, DUniqueString>());
-
             return ok;
         }
     }

xo-expression2/utest/CMakeLists.txt

@@ -3,7 +3,6 @@
 set(UTEST_EXE utest.expression2)
 set(UTEST_SRCS
     expression2_utest_main.cpp
-    StringTable.test.cpp
     X1Collector.test.cpp
     DConstant.test.cpp
     DVariable.test.cpp

xo-expression2/utest/DDefineExpr.test.cpp

@@ -7,17 +7,17 @@
 #include <xo/expression2/DDefineExpr.hpp>
 #include <xo/expression2/detail/IExpression_DDefineExpr.hpp>
 #include <xo/expression2/detail/IPrintable_DDefineExpr.hpp>
-#include <xo/expression2/DConstant.hpp>
-#include <xo/expression2/detail/IExpression_DConstant.hpp>
-#include <xo/expression2/StringTable.hpp>
+#include <xo/expression2/Constant.hpp>
+//#include <xo/expression2/detail/IExpression_DConstant.hpp>
 
-#include <xo/object2/DFloat.hpp>
-#include <xo/object2/number/IGCObject_DFloat.hpp>
+#include <xo/object2/Float.hpp>
+//#include <xo/object2/number/IGCObject_DFloat.hpp>
+
+#include <xo/gc/X1Collector.hpp>
+
+#include <xo/stringtable2/StringTable.hpp>
 
 #include <xo/alloc2/CollectorTypeRegistry.hpp>
-#include <xo/gc/X1Collector.hpp>
-//#include <xo/gc/detail/IAllocator_DX1Collector.hpp>
-//#include <xo/gc/detail/ICollector_DX1Collector.hpp>
 
 #include <xo/printable2/Printable.hpp>
 #include <xo/facet/FacetRegistry.hpp>

xo-expression2/utest/DVariable.test.cpp

@@ -4,17 +4,19 @@
  **/
 
 #include "init_expression2.hpp"
-#include <xo/expression2/DVariable.hpp>
-#include <xo/expression2/detail/IExpression_DVariable.hpp>
-#include <xo/expression2/detail/IPrintable_DVariable.hpp>
-#include <xo/expression2/StringTable.hpp>
+#include <xo/expression2/Variable.hpp>
+//#include <xo/expression2/detail/IExpression_DVariable.hpp>
+//#include <xo/expression2/detail/IPrintable_DVariable.hpp>
 
 #include <xo/gc/X1Collector.hpp>
+
+#include <xo/reflect/Reflect.hpp>
+#include <xo/stringtable2/StringTable.hpp>
+
 #include <xo/alloc2/CollectorTypeRegistry.hpp>
 
 #include <xo/printable2/Printable.hpp>
 #include <xo/facet/FacetRegistry.hpp>
-#include <xo/reflect/Reflect.hpp>
 
 #include <xo/indentlog/scope.hpp>
 

xo-expression2/utest/X1Collector.test.cpp

@@ -6,15 +6,17 @@
  **/
 
 #include "init_expression2.hpp"
-#include "StringTable.hpp"
-#include "detail/IGCObject_DUniqueString.hpp"
 
 #include <xo/object2/DFloat.hpp>
 #include <xo/object2/DInteger.hpp>
 #include <xo/object2/DList.hpp>
-#include <xo/stringtable2/DString.hpp>
 
 #include <xo/gc/X1Collector.hpp>
+
+#include <xo/stringtable2/StringTable.hpp>
+#include <xo/stringtable2/UniqueString.hpp>
+#include <xo/stringtable2/String.hpp>
+
 #include <xo/alloc2/CollectorTypeRegistry.hpp>
 #include <xo/subsys/Subsystem.hpp>
 

xo-gc/CMakeLists.txt

@@ -18,19 +18,6 @@ add_definitions(${PROJECT_CXX_FLAGS})
 
 # ----------------------------------------------------------------
 
-# note: manual target; generated code committed to git
-xo_add_genfacet(
-    TARGET xo-gc-facet-gcobject
-    FACET GCObject
-    INPUT idl/GCObject.json5
-)
-
-# ----------------------------------------------------------------
-
-xo_add_genfacet_all(xo-gc-genfacet-all)
-
-# ----------------------------------------------------------------
-
 # must complete definition of expression lib before configuring examples
 add_subdirectory(src/gc)
 add_subdirectory(utest)

xo-interpreter2/src/interpreter2/VirtualSchematikaMachine.cpp

@@ -19,7 +19,6 @@
 #include <xo/expression2/LambdaExpr.hpp>
 #include <xo/expression2/Constant.hpp>
 #include <xo/expression2/SequenceExpr.hpp>
-#include <xo/expression2/UniqueString.hpp>
 #include <xo/object2/Dictionary.hpp>
 #include <xo/object2/Integer.hpp>
 #include <xo/object2/Boolean.hpp>
@@ -29,6 +28,7 @@
 #include <xo/procedure2/Primitive_gco_3_dict_string_gco.hpp>
 #include <xo/gc/X1Collector.hpp>
 #include <xo/reflect/Reflect.hpp>
+#include <xo/stringtable2/UniqueString.hpp>
 #include <xo/alloc2/Arena.hpp>
 #include <xo/printable2/Printable.hpp>
 #include <xo/facet/FacetRegistry.hpp>

xo-interpreter2/utest/VirtualSchematikaMachine.test.cpp

@@ -6,13 +6,13 @@
 #include <xo/interpreter2/init_interpreter2.hpp>
 #include <xo/interpreter2/VirtualSchematikaMachine.hpp>
 #include <xo/interpreter2/Closure.hpp>
-#include <xo/expression2/UniqueString.hpp>
 #include <xo/object2/Array.hpp>
 #include <xo/object2/List.hpp>
 #include <xo/object2/Float.hpp>
 #include <xo/object2/Integer.hpp>
 #include <xo/object2/Boolean.hpp>
 #include <xo/object2/RuntimeError.hpp>
+#include <xo/stringtable2/UniqueString.hpp>
 #include <xo/alloc2/Arena.hpp>
 #include <xo/facet/TypeRegistry.hpp>
 #include <xo/indentlog/print/hex.hpp>

xo-object2/CMakeLists.txt

@@ -116,26 +116,6 @@ xo_add_genfacetimpl(
 
 # ----------------------------------------------------------------
 
-# note: manual target; generated code committed to git
-xo_add_genfacetimpl(
-    TARGET xo-object2-facetimpl-printable-string
-    FACET_PKG xo_printable2
-    FACET Printable
-    REPR String
-    INPUT idl/IPrintable_DString.json5
-)
-
-# note: manual target; generated code committed to git
-xo_add_genfacetimpl(
-    TARGET xo-object2-facetimpl-gcobject-string
-    FACET_PKG xo_gc
-    FACET GCObject
-    REPR String
-    INPUT idl/IGCObject_DString.json5
-)
-
-# ----------------------------------------------------------------
-
 # note: manual target; generated code committed to git
 xo_add_genfacetimpl(
     TARGET xo-object2-facetimpl-sequence-array

xo-reader2/include/xo/reader2/ParserStateMachine.hpp

@@ -10,9 +10,9 @@
 #include <xo/expression2/DLocalSymtab.hpp>
 #include <xo/expression2/DVariable.hpp>
 #include <xo/expression2/VarRef.hpp>
-#include <xo/expression2/StringTable.hpp>
 #include <xo/tokenizer2/Token.hpp>
 #include <xo/object2/DArray.hpp>
+#include <xo/stringtable2/StringTable.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include <xo/arena/ArenaHashMapConfig.hpp>
 #include <xo/arena/DArena.hpp>

xo-stringtable2/CMakeLists.txt

@@ -17,6 +17,50 @@ xo_cxx_toplevel_options3()
 set(PROJECT_CXX_FLAGS "")
 add_definitions(${PROJECT_CXX_FLAGS})
 
+# ----------------------------------------------------------------
+
+# note: manual target; generated code committed to git
+xo_add_genfacetimpl(
+    TARGET xo-stringtable2-facetimpl-gcobject-string
+    FACET_PKG xo_alloc2
+    FACET GCObject
+    REPR String
+    INPUT idl/IGCObject_DString.json5
+)
+
+# note: manual target; generated code committed to git
+xo_add_genfacetimpl(
+    TARGET xo-stringtable2-facetimpl-printable-string
+    FACET_PKG xo_printable2
+    FACET Printable
+    REPR String
+    INPUT idl/IPrintable_DString.json5
+)
+
+# ----------------------------------------------------------------
+
+# note: manual target; generated code committed to git
+xo_add_genfacetimpl(
+    TARGET xo-stringtable2-facetimpl-gcobject-uniquestring
+    FACET_PKG xo_alloc2
+    FACET GCObject
+    REPR UniqueString
+    INPUT idl/IGCObject_DUniqueString.json5
+)
+
+# note: manual target; generated code committed to git
+xo_add_genfacetimpl(
+    TARGET xo-stringtable2-facetimpl-printable-uniquestring
+    FACET_PKG xo_printable2
+    FACET Printable
+    REPR UniqueString
+    INPUT idl/IPrintable_DUniqueString.json5
+)
+
+# ----------------------------------------------------------------
+
+xo_add_genfacet_all(xo-stringtable2-genfacet-all)
+
 # ----------------------------------------------------------------
 # output targets
 

xo-stringtable2/idl/IGCObject_DString.json5

@@ -1,10 +1,10 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/object2",
-    output_hpp_dir: "include/xo/object2",
+    output_cpp_dir: "src/stringtable2",
+    output_hpp_dir: "include/xo/stringtable2",
     output_impl_subdir: "string",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],

xo-stringtable2/idl/IGCObject_DUniqueString.json5

@@ -1,10 +1,10 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/expression2",
-    output_hpp_dir: "include/xo/expression2",
-    output_impl_subdir: "detail",
+    output_cpp_dir: "src/stringtable2",
+    output_hpp_dir: "include/xo/stringtable2",
+    output_impl_subdir: "uniquestring",
     includes: [
-        "<xo/gc/GCObject.hpp>",
+        "<xo/alloc2/GCObject.hpp>",
         "<xo/alloc2/Allocator.hpp>"
     ],
     local_types: [ ],

xo-stringtable2/idl/IPrintable_DString.json5

@@ -1,7 +1,7 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/object2",
-    output_hpp_dir: "include/xo/object2",
+    output_cpp_dir: "src/stringtable2",
+    output_hpp_dir: "include/xo/stringtable2",
     output_impl_subdir: "string",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],

xo-stringtable2/idl/IPrintable_DUniqueString.json5

@@ -1,8 +1,8 @@
 {
     mode: "implementation",
-    output_cpp_dir: "src/expression2",
-    output_hpp_dir: "include/xo/expression2",
-    output_impl_subdir: "detail",
+    output_cpp_dir: "src/stringtable2",
+    output_hpp_dir: "include/xo/stringtable2",
+    output_impl_subdir: "uniquestring",
     includes: [ "<xo/printable2/Printable.hpp>",
                 "<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
     local_types: [ ],

xo-stringtable2/include/xo/stringtable2/UniqueString.hpp

@@ -6,7 +6,7 @@
 #pragma once
 
 #include "DUniqueString.hpp"
-#include "detail/IGCObject_DUniqueString.hpp"
-#include "detail/IPrintable_DUniqueString.hpp"
+#include "uniquestring/IGCObject_DUniqueString.hpp"
+#include "uniquestring/IPrintable_DUniqueString.hpp"
 
 /* end UniqueString.hpp */

xo-stringtable2/include/xo/stringtable2/string/IGCObject_DString.hpp

@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */

xo-stringtable2/include/xo/stringtable2/uniquestring/IGCObject_DUniqueString.hpp

@@ -64,4 +64,4 @@ namespace xo {
     } /*namespace scm*/
 } /*namespace xo*/
 
-/* end */
+/* end */

xo-stringtable2/src/stringtable2/CMakeLists.txt

@@ -6,9 +6,16 @@ set(SELF_SRCS
     stringtable2_register_facets.cpp
     stringtable2_register_types.cpp
 
+    StringTable.cpp
+
     DString.cpp
     IGCObject_DString.cpp
     IPrintable_DString.cpp
+
+    DUniqueString.cpp
+    IGCObject_DUniqueString.cpp
+    IPrintable_DUniqueString.cpp
+
 )
 
 xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})

xo-stringtable2/src/stringtable2/IGCObject_DUniqueString.cpp

@@ -11,7 +11,7 @@
  *       [idl/IGCObject_DUniqueString.json5]
 **/
 
-#include "detail/IGCObject_DUniqueString.hpp"
+#include "uniquestring/IGCObject_DUniqueString.hpp"
 
 namespace xo {
     namespace scm {

xo-stringtable2/src/stringtable2/IPrintable_DUniqueString.cpp

@@ -11,7 +11,7 @@
  *       [idl/IPrintable_DUniqueString.json5]
 **/
 
-#include "detail/IPrintable_DUniqueString.hpp"
+#include "uniquestring/IPrintable_DUniqueString.hpp"
 
 namespace xo {
     namespace scm {

xo-stringtable2/src/stringtable2/stringtable2_register_facets.cpp

@@ -5,6 +5,7 @@
 
 #include "stringtable2_register_facets.hpp"
 
+#include <xo/stringtable2/UniqueString.hpp>
 #include <xo/stringtable2/String.hpp>
 
 #include <xo/facet/FacetRegistry.hpp>
@@ -23,6 +24,9 @@ namespace xo {
         {
             scope log(XO_DEBUG(true));
 
+            FacetRegistry::register_impl<AGCObject, DUniqueString>();
+            FacetRegistry::register_impl<APrintable, DUniqueString>();
+
             FacetRegistry::register_impl<AGCObject, DString>();
             FacetRegistry::register_impl<APrintable, DString>();
 

xo-stringtable2/src/stringtable2/stringtable2_register_types.cpp

@@ -4,6 +4,7 @@
  **/
 
 #include "stringtable2_register_types.hpp"
+#include "UniqueString.hpp"
 #include "String.hpp"
 
 //#include <xo/facet/FacetRegistry.hpp>
@@ -23,6 +24,7 @@ namespace xo {
 
             bool ok = true;
 
+            ok &= gc.install_type(impl_for<AGCObject, DUniqueString>());
             ok &= gc.install_type(impl_for<AGCObject, DString>());
 
             return ok;

xo-stringtable2/utest/CMakeLists.txt

@@ -3,6 +3,7 @@
 set(UTEST_EXE utest.stringtable2)
 set(UTEST_SRCS
     stringtable2_utest_main.cpp
+    StringTable.test.cpp
     DString.test.cpp
     StringOps.test.cpp
 )

xo-stringtable2/utest/StringTable.test.cpp

@@ -3,7 +3,7 @@
  *  @author Roland Conybeare, Jan 2026
  **/
 
-#include <xo/expression2/StringTable.hpp>
+#include <xo/stringtable2/StringTable.hpp>
 #include <catch2/catch.hpp>
 #include <cstring>