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

xo-object2: obj<ACollector> argument to DArray::push_back()

Browse source
This commit is contained in:
Roland Conybeare 2026-04-28 23:17:00 -04:00
commit d24f851eb5
5 changed files with 114 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

67
include/xo/object2/DArray.hpp
View file

@ -15,6 +15,24 @@
namespace xo {
namespace scm {
class DArray;
namespace detail {
/** null base case **/
static inline bool do_array_push_back(DArray *,
obj<xo::mm::ACollector>)
{
return true;
}
template <typename A, typename... Rest>
requires (std::convertible_to<A, obj<xo::mm::AGCObject>>)
static bool do_array_push_back(DArray * lhs,
obj<xo::mm::ACollector> gc,
A arg1,
Rest... rest);
}
/** @class DArray
* @brief Polymorphic array implementation with gc hooks
*
@ -30,11 +48,8 @@ namespace xo {
/** type for array size **/
using size_type = std::uint32_t;
/** xo allocator facet **/
using AAllocator = xo::mm::AAllocator;
/** garbage collector facet **/
//using ACollector = xo::mm::ACollector;
/** gc-aware object facet **/
using ACollector = xo::mm::ACollector;
using AGCObject = xo::mm::AGCObject;
/** gc-centric object visitor **/
using AGCObjectVisitor = xo::mm::AGCObjectVisitor;
@ -59,8 +74,8 @@ namespace xo {
* using memory from allocator @p mm.
* Nullptr if space exhausted
**/
static DArray * empty(obj<AAllocator> mm,
size_type cap);
static DArray * _empty(obj<AAllocator> mm,
size_type cap);
/** create copy of @p src using memory from @p mm
* with capacity for @p new_cap elements
@ -80,8 +95,13 @@ namespace xo {
static DArray * array(obj<AAllocator> mm, Args... args);
///@}
/** @defgroup darray-access acecss methods **/
/** @defgroup darray-access access methods **/
///@{
/** create fop for this instance **/
template <typename AFacet = AGCObject>
obj<AFacet,DArray> ref() { return obj<AFacet,DArray>(this); }
/** true iff array is empty **/
bool is_empty() const noexcept { return size_ == 0; }
/** only support finite arrays :-) **/
@ -108,13 +128,17 @@ namespace xo {
/** store @p elt at position @p index.
* true on success, false otherwise
**/
bool assign_at(size_type index, obj<AGCObject> elt) noexcept;
bool assign_at(obj<ACollector> gc, size_type index, obj<AGCObject> elt) noexcept;
/** append @p elt at the end of array.
* true on success, false otherwise.
* on failure array is unaltered
**/
bool push_back(obj<AGCObject> elt) noexcept;
bool push_back(obj<ACollector> gc, obj<AGCObject> elt) noexcept;
template <typename... Args>
requires (std::convertible_to<Args, obj<AGCObject>> && ...)
bool push_back_all(obj<ACollector> gc, Args... args) noexcept;
/** store last element in array into @p elt and decrement array size.
* true on success; false on failure (implies array was empty)
@ -182,13 +206,34 @@ namespace xo {
DArray *
DArray::array(obj<AAllocator> mm, Args... args)
{
DArray * result = empty(mm, sizeof...(args));
obj<ACollector> gc = mm.try_to_facet<ACollector>();
DArray * result = _empty(mm, sizeof...(args));
if (result) {
(result->push_back(args), ...);
detail::do_array_push_back(result, gc, args...);
}
return result;
}
namespace detail {
template <typename A, typename... Rest>
requires (std::convertible_to<A, obj<xo::mm::AGCObject>>)
static bool do_array_push_back(DArray * lhs,
obj<xo::mm::ACollector> gc,
A arg1,
Rest... rest)
{
return (lhs->push_back(gc, arg1)
&& do_array_push_back(lhs, gc, rest...));
}
}
template <typename... Args>
requires (std::convertible_to<Args, obj<xo::mm::AGCObject>> && ...)
bool
DArray::push_back_all(obj<ACollector> gc, Args... args) noexcept {
return detail::do_array_push_back(this, gc, args...);
}
} /*namespace scm*/
} /*namespace xo*/

8
include/xo/object2/DDictionary.hpp
View file

@ -144,12 +144,12 @@ namespace xo {
*
* @return true if key-value pair updated; false if key not found
**/
bool try_update(const pair_type & kvpair);
bool try_update(obj<ACollector> gc, const pair_type & kvpair);
/** update key-value pair for existing @p key to map to @p value.
* false if @p key not already present.
**/
bool try_update_cstr(const char * key, obj<AGCObject> value);
bool try_update_cstr(obj<ACollector> gc, const char * key, obj<AGCObject> value);
/** convenience method:
* try_upsert pair (k, @p value), after boxing c-style string @p key with @p mm to get k
@ -167,7 +167,7 @@ namespace xo {
*
* False if dictionary already at capacity
**/
bool try_upsert(const pair_type & kvpair);
bool try_upsert(obj<ACollector> gc, const pair_type & kvpair);
/** upsert key-value pair @p kvpair into dictionary.
* If at capacity, expand capacity, getting new memory from @p mm.
@ -217,7 +217,7 @@ namespace xo {
/** append {key, value} pair @p kv_pair to this dictionary
* Require: @p kv_pair.first not already present in @ref keys_
**/
bool _append_kv_aux(const pair_type & kv_pair);
bool _append_kv_aux(obj<ACollector> gc, const pair_type & kv_pair);
///@}
private: