roland/xo-object2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Roland Conybeare 2026-01-06 10:39:22 -05:00
commit dd1eee8c26
3 changed files with 13 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/xo/object2/DList.hpp
View file

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

13
src/object2/DList.cpp
View file

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

4
utest/X1Collector.test.cpp
View file

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