Merge branch 'main' of github.com:rconybea/xo-umbrella2

include/xo/object2/DList.hpp

@@ -8,6 +8,7 @@
 #include <xo/gc/GCObject.hpp>
 //#include "xo/alloc2/gcobject/RGCObject.hpp"
 #include <xo/facet/obj.hpp>
+#include <xo/indentlog/print/ppindentinfo.hpp>
 
 namespace xo {
     namespace scm {
@@ -16,6 +17,7 @@ namespace xo {
             using size_type = std::size_t;
             using AGCObject = xo::mm::AGCObject;
             using AAllocator = xo::mm::AAllocator;
+            using ppindentinfo = xo::print::ppindentinfo;
 
             DList(xo::obj<AGCObject> h,
                   DList * r) : head_{h}, rest_{r} {}

src/object2/DList.cpp

@@ -4,6 +4,7 @@
  **/
 
 #include "DList.hpp"
+#include <xo/indentlog/print/pretty.hpp>
 #include <xo/indentlog/print/tag.hpp>
 
 namespace xo {
@@ -84,7 +85,6 @@ namespace xo {
             return l->head_;
         }
 
-#ifdef NOT_YET
         bool
         DList::pretty(const ppindentinfo & ppii) const
         {
@@ -95,19 +95,24 @@ namespace xo {
             ppstate * pps = ppii.pps();
 
             if (ppii.upto()) {
-/* perhaps print on one line */
-                if (!pps->print_upto("(")
+                /* perhaps print on one line */
+                if (!pps->print_upto("(...)"))
                     return false;
 
+#ifdef NOT_YET
                 /* TODO: probably use iterators here, when available */
                 const DList * l = this;
                 while (!l->is_empty()) {
                     obj<APrintable>(l->head_.data());
 
                 }
+#endif
+                return true;
+            } else {
+                pps->write("(...)");
+                return false;
             }
         }
-#endif
 
     } /*namespace scm*/
 } /*namespace xo*/

utest/X1Collector.test.cpp

@@ -16,8 +16,8 @@
 #include <xo/gc/detail/IAllocator_DX1Collector.hpp>
 #include <xo/gc/detail/ICollector_DX1Collector.hpp>
 
-#include <xo/alloc2/AllocInfo.hpp>
-#include <xo/alloc2/padding.hpp>
+#include <xo/arena/AllocInfo.hpp>
+#include <xo/arena/padding.hpp>
 
 #include <xo/indentlog/scope.hpp>
 #include <xo/indentlog/print/tag.hpp>