xo-gc xo-alloc2: move Collector faceet gc/ -> alloc2/ for levelling

src/expression2/DDefineExpr.cpp

@@ -5,7 +5,7 @@
 
 #include "DDefineExpr.hpp"
 #include "Variable.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/gc/PolyForwarderUtil.hpp>
 #include <xo/printable2/Printable.hpp>
 #include <xo/facet/FacetRegistry.hpp>

src/expression2/DGlobalSymtab.cpp

@@ -8,7 +8,7 @@
 #include <xo/expression2/Expression.hpp>
 #include <xo/expression2/Variable.hpp>
 #include <xo/object2/Array.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/facet/FacetRegistry.hpp>
 #include <xo/indentlog/scope.hpp>
 

src/expression2/DIfElseExpr.cpp

@@ -5,7 +5,7 @@
 
 #include "DIfElseExpr.hpp"
 #include "detail/IExpression_DIfElseExpr.hpp"
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/printable2/Printable.hpp>
 #include <xo/facet/FacetRegistry.hpp>
 #include <xo/reflectutil/typeseq.hpp>

src/expression2/DSequenceExpr.cpp

@@ -7,7 +7,7 @@
 #include "detail/IExpression_DSequenceExpr.hpp"
 #include <xo/object2/array/IGCObject_DArray.hpp>
 #include <xo/object2/array/IPrintable_DArray.hpp>
-#include <xo/gc/GCObject.hpp>
+#include <xo/alloc2/GCObject.hpp>
 #include <xo/alloc2/Allocator.hpp>
 #include <xo/printable2/Printable.hpp>
 #include <xo/facet/FacetRegistry.hpp>

src/expression2/DUniqueString.cpp

@@ -4,6 +4,7 @@
  **/
 
 #include "DUniqueString.hpp"
+#include "DString.hpp"
 #include <xo/arena/padding.hpp>
 #include <xo/indentlog/scope.hpp>
 #include <cstring>
@@ -13,6 +14,15 @@ namespace xo {
     using xo::facet::typeseq;
 
     namespace scm {
+        int
+        DUniqueString::compare(const DUniqueString & lhs, const DUniqueString & rhs)
+        {
+            if (&lhs == &rhs)
+                return 0;
+
+            return DString::compare(*(lhs._text()), *(rhs._text()));
+        }
+
         DString *
         DUniqueString::_text() const noexcept
         {

src/expression2/DVariable.cpp

@@ -5,8 +5,8 @@
 
 #include "DVariable.hpp"
 #include "exprtype.hpp"
-#include <cstddef>
 #include <xo/indentlog/print/quoted.hpp>
+#include <cstddef>
 
 namespace xo {
     using xo::mm::ACollector;

src/expression2/expression2_register_facets.cpp

@@ -25,7 +25,7 @@
 #include <xo/expression2/GlobalSymtab.hpp>
 #include <xo/expression2/LocalSymtab.hpp>
 
-#include <xo/gc/detail/AGCObject.hpp>
+#include <xo/alloc2/gc/AGCObject.hpp>
 #include <xo/printable2/detail/APrintable.hpp>
 #include <xo/facet/FacetRegistry.hpp>
 #include <xo/indentlog/scope.hpp>