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

xo-interpreter2 stack: + dict.make() + Dictionary impl

Browse source
This commit is contained in:
Roland Conybeare 2026-03-03 16:45:54 +11:00
commit 0c01058154
17 changed files with 935 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

31
xo-interpreter2/src/interpreter2/VirtualSchematikaMachine.cpp
View file

@ -18,6 +18,7 @@
#include <xo/expression2/Constant.hpp>
#include <xo/expression2/SequenceExpr.hpp>
#include <xo/expression2/UniqueString.hpp>
#include <xo/object2/Dictionary.hpp>
#include <xo/object2/Boolean.hpp>
#include <xo/procedure2/RuntimeContext.hpp>
#include <xo/procedure2/Primitive_gco_0.hpp>
@ -30,6 +31,7 @@
#include <unistd.h> // for getcwd()
namespace xo {
using xo::scm::DDictionary;
using xo::print::APrintable;
using xo::print::ppconfig;
using xo::print::ppstate_standalone;
@ -40,6 +42,7 @@ namespace xo {
using xo::mm::DX1Collector;
using xo::mm::DArena;
using xo::facet::FacetRegistry;
using xo::facet::TypeRegistry;
using std::cout;
namespace scm {
@ -878,6 +881,8 @@ namespace xo {
xtag("resv", info.reserved_));
};
FacetRegistry::instance().visit_pools(visitor);
TypeRegistry::instance().visit_pools(visitor);
rcx.visit_pools(visitor);
return DBoolean::box<AGCObject>(rcx.allocator(), true);
@ -900,11 +905,24 @@ namespace xo {
static DPrimitive_gco_0 s_cwd_pm("_cwd",
&xfer_cwd);
// ----- primitive: dict_make() -----
obj<AGCObject>
xfer_dict_make(obj<ARuntimeContext> rcx)
{
return obj<AGCObject,DDictionary>(DDictionary::empty(rcx.allocator(),
8 /*cap*/));
}
static DPrimitive_gco_0 s_dict_make_pm("_dict_make",
&xfer_dict_make);
// ----- install primitives -----
void
VirtualSchematikaMachine::install_core_primitives()
{
/* report_memory_use */
{
const DUniqueString * name
= reader_.intern_string("report_memory_use");
@ -916,6 +934,7 @@ namespace xo {
obj<AGCObject,DPrimitive_gco_0>(&s_report_memory_use_pm));
}
/* cwd */
{
const DUniqueString * name
= reader_.intern_string("cwd");
@ -926,6 +945,18 @@ namespace xo {
Reflect::require<DPrimitive_gco_0>(),
obj<AGCObject,DPrimitive_gco_0>(&s_cwd_pm));
}
/* dict_make */
{
const DUniqueString * name
= reader_.intern_string("dict_make");
global_env_->_upsert_value
(mm_.to_op(),
name,
Reflect::require<DPrimitive_gco_0>(),
obj<AGCObject,DPrimitive_gco_0>(&s_dict_make_pm));
}
}
} /*namespace scm*/

20
xo-object2/CMakeLists.txt
View file

@ -165,6 +165,26 @@ xo_add_genfacetimpl(
# ----------------------------------------------------------------
# note: manual target; generated code committed to git
xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-printable-dictionary
FACET_PKG xo_printable2
FACET Printable
REPR Dictionary
INPUT idl/IPrintable_DDictionary.json5
)
# note: manual target; generated code committed to git
xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-gcobject-dictionary
FACET_PKG xo_gc
FACET GCObject
REPR Dictionary
INPUT idl/IGCObject_DDictionary.json5
)
# ----------------------------------------------------------------
# note: manual target; generated code committed to git
xo_add_genfacetimpl(
TARGET xo-object2-facetimpl-printable-runtimeerror

18
xo-object2/idl/IGCObject_DDictionary.json5 Normal file
View file

@ -0,0 +1,18 @@
{
mode: "implementation",
output_cpp_dir: "src/object2",
output_hpp_dir: "include/xo/object2",
output_impl_subdir: "dictionary",
includes: [
"<xo/gc/GCObject.hpp>",
"<xo/alloc2/Allocator.hpp>"
],
local_types: [ ],
namespace1: "xo",
namespace2: "scm",
facet_idl: "idl/GCObject.json5",
brief: "provide AGCObject interface for DDictionary",
using_doxygen: true,
repr: "DDictionary",
doc: [ "implement AGCObject for DDictionary" ],
}

16
xo-object2/idl/IPrintable_DDictionary.json5 Normal file
View file

@ -0,0 +1,16 @@
{
mode: "implementation",
output_cpp_dir: "src/object2",
output_hpp_dir: "include/xo/object2",
output_impl_subdir: "dictionary",
includes: [ "<xo/printable2/Printable.hpp>",
"<xo/printable2/detail/IPrintable_Xfer.hpp>" ],
local_types: [ ],
namespace1: "xo",
namespace2: "scm",
facet_idl: "idl/Printable.json5",
brief: "provide APrintable interface for DDictionary",
using_doxygen: true,
repr: "DDictionary",
doc: [ "implement APrintable for DDictionary" ],
}

8
xo-object2/include/xo/object2/DArray.hpp
View file

@ -90,6 +90,7 @@ namespace xo {
obj<AGCObject> at(size_type index) const;
const obj<AGCObject> & operator[](size_type index) const noexcept { return elts_[index]; }
// TODO: nuke this or provide LValue shim. need write barrier!
obj<AGCObject> & operator[](size_type index) noexcept { return elts_[index]; }
///@}
@ -99,10 +100,17 @@ namespace xo {
///@}
/** @defgroup darray-assign assignment **/
///@{
/** store @p elt at position @p index.
* true on success, false otherwise
**/
bool assign_at(size_type index, obj<AGCObject> elt) noexcept;
/** append @p elt at the end of array.
* true on success, false otherwise
**/
bool push_back(obj<AGCObject> elt) noexcept;
///@}
/** @defgroup darray-general general methods **/
///@{

217
xo-object2/include/xo/object2/DDictionary.hpp Normal file
View file

@ -0,0 +1,217 @@
/** @file DDictionary.hpp
*
* @author Roland Conybeare, Jan 2026
**/
#pragma once
#include "DArray.hpp"
#include "DString.hpp"
#include <xo/gc/GCObject.hpp>
#include <xo/gc/Collector.hpp>
#include <xo/alloc2/Allocator.hpp>
#include <xo/facet/obj.hpp>
#include <xo/indentlog/print/ppindentinfo.hpp>
#include <concepts>
#include <cstdint>
namespace xo {
namespace scm {
/** @class DStruct
* @brief Polymorphic in-memory key-value store with gc hooks
*
* Small dictionary implementation for Schematika.
* O(n) lookup, at least for now. Not typed. Keys are strings,
* so functionally equivalent to python dictionaries.
**/
class DDictionary {
public:
/** @defgroup ddictionary-types type traits **/
///@{
/** 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 AGCObject = xo::mm::AGCObject;
/** pretty-printer state for APrintable **/
using ppindentinfo = xo::print::ppindentinfo;
/** canonical type representing a key-value pair **/
using pair_type = std::pair<const DString *, obj<AGCObject>>;
/** shim to represent result of expression like @c dict[key]
**/
template <typename DictPtr>
class LValue {
public:
LValue(DictPtr d, const DString * key) : dict_{d}, key_{key} {}
bool is_sentinel() const noexcept { return dict_ == nullptr; }
bool is_valid() const noexcept { return dict_ != nullptr; }
obj<AGCObject> & operator=(obj<AGCObject> & rvalue) {
return dict_->upsert(key_, rvalue);
}
operator std::optional<obj<AGCObject>>() const noexcept {
return dict_->lookup(key_);
}
private:
/** sentinel LValue represented by null ptr here **/
DictPtr dict_ = nullptr;
/** sentinel LValue has null ptr here **/
const DString * key_ = nullptr;
};
///@}
/** @defgroup ddictionary-ctors constructors **/
///@{
/** default ctor. zero capacity sentinel **/
DDictionary(DArray * keys, DArray * values);
/** create empty array with space for @p cap elements
* using memory from allocator @p mm.
* Nullptr if space exhausted
**/
static DDictionary * empty(obj<AAllocator> mm,
size_type cap);
/** create copy of @p src using memory from @p mm
* with capacity for @p new_cap elements
**/
static DDictionary * copy(obj<AAllocator> mm,
DDictionary * src,
size_type new_cap);
/** create dictionary containing elements @p kv_pairs, using memory from @p mm.
* Nullptr if space exhausted.
*
* Use:
* auto kv1 = std::make_pair<const DString *, obj<AGCObject>>(...);
* auto kv2 = std::make_pair<const DString *, obj<AGCObject>>(...);
* Ddictionary * v = DDictionary::make(mm, kv1, kv2, ..);
**/
template <typename... Args>
requires (std::same_as<Args, std::pair<const DString*, obj<AGCObject>>> && ...)
static DDictionary * make(obj<AAllocator> mm, Args... args);
///@}
/** @defgroup ddictionary-access acecss methods **/
///@{
/** true iff array is empty **/
bool is_empty() const noexcept { return keys_->size() == 0; }
/** array capacity **/
size_type capacity() const noexcept { return keys_->capacity(); }
/** current dictionary size (number of key-value pairs) **/
size_type size() const noexcept { return keys_->size(); }
/** return element @p key-value pair at position @p index (0-based) **/
std::pair<const DString *, obj<AGCObject>> at_index(size_type index) const;
/** return @p i'th key. O(1) **/
const DString * key_at_index(size_type i) const;
/** return @p i'th value. O(1) **/
obj<AGCObject> value_at_index(size_type i) const;
auto operator[](const DString * key) const noexcept { return LValue<decltype(this)>(this, key); }
auto operator[](const DString * key) noexcept { return LValue<decltype(this)>(this, key); }
///@}
/** @defgroup ddictionary-iterators iterators **/
///@{
///@}
/** @defgroup ddictionary-assign assignment **/
///@{
/** update key-value pair @p kvpair in-place,
* provide key is already present.
*
* @return true if key-value pair updated; false if key not found
**/
bool try_update(const pair_type & kvpair);
/** upsert key-value pair @p kvpair into dictionary.
* If key kvpair.first not already present, add it.
* In either case replace/establish associated value with kvpair.second.
*
* False if dictionary already at capacity
**/
bool try_upsert(const pair_type & kvpair);
/** upsert key-value pair @p kvpair into dictionary.
* If at capacity, expand capacity, getting new memory from @p mm.
*
* False iff upsert failed because allocator memory exhausted
**/
bool upsert(obj<AAllocator> mm, const pair_type & kvpair);
///@}
/** @defgroup ddictionary-general general methods **/
///@{
/** reduce array capacity to current array size
*
* note: with X1Collector, capacity is reduced but memory not recycled
* until next collection
**/
void shrink_to_fit() noexcept;
///@}
/** @defgroup ddictionary-conversion-operators conversion operators **/
///@{
///@}
/** @defgroup ddictionary-sequence-methods **/
///@{
///@}
/** @defgroup ddictionary-printable-methods **/
///@{
/** pretty-printing support **/
bool pretty(const ppindentinfo & ppii) const;
///@}
/** @defgroup ddictionary-gcobject-methods **/
///@{
/** shallow memory consumption. Excludes child objects **/
AAllocator::size_type shallow_size() const noexcept;
/** return shallow copy of this array, using memory from @p mm **/
DDictionary * shallow_copy(obj<AAllocator> mm) const noexcept;
/** forward elements to @p gc to-space; replace originals with forarding pointers **/
AAllocator::size_type forward_children(obj<ACollector> gc) noexcept;
///@}
private:
/** @defgroup ddictionary-instance-variables instance variables **/
///@{
/** dictionary keys. These will be strings **/
DArray * keys_;
/** dictionary values. values_[i] associates with keys_[i] **/
DArray * values_;
///@}
};
template <typename... Args>
requires (std::same_as<Args, std::pair<const DString *, obj<DDictionary::AGCObject>>> && ...)
DDictionary *
DDictionary::make(obj<AAllocator> mm, Args... args)
{
DDictionary * result = empty(mm, sizeof...(args));
if (result) {
(result->upsert(args), ...);
}
return result;
}
} /*namespace scm*/
} /*namespace xo*/
/* end DDictionary.hpp */

183
xo-object2/include/xo/object2/DStruct.hpp Normal file
View file

@ -0,0 +1,183 @@
/** @file DStruct.hpp
*
* @author Roland Conybeare, Jan 2026
**/
#pragma once
#include "DArray.hpp"
#include <xo/gc/GCObject.hpp>
#include <xo/gc/Collector.hpp>
#include <xo/alloc2/Allocator.hpp>
#include <xo/facet/obj.hpp>
#include <xo/indentlog/print/ppindentinfo.hpp>
#include <concepts>
#include <cstdint>
namespace xo {
namespace scm {
/** @class DStruct
* @brief Polymorphic in-memory key-value store with gc hooks
*
* Small dictionary implementation for Schematika.
* O(n) lookup, at least for now. Keys are unique strings.
* Intended to have key-space fixed at comptime.
* Relevant since keys are immortal DUniqueStrings.
**/
class DStruct {
public:
/** @defgroup dstruct-types type traits **/
///@{
/** 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 AGCObject = xo::mm::AGCObject;
/** pretty-printer state for APrintable **/
using ppindentinfo = xo::print::ppindentinfo;
///@}
/** @defgroup dstruct-ctors constructors **/
///@{
/** default ctor. zero capacity sentinel **/
DStruct() = default;
/** not simply copyable because of flexible array.
* Need allocator. See @ref clone
**/
DStruct(const DStruct &) = delete;
/** create empty array with space for @p cap elements
* using memory from allocator @p mm.
* Nullptr if space exhausted
**/
static DStruct * empty(obj<AAllocator> mm,
size_type cap);
/** create copy of @p src using memory from @p mm
* with capacity for @p new_cap elements
**/
static DStruct * copy(obj<AAllocator> mm,
DStruct * src,
size_type new_cap);
/** create array containing elements @p args, using memory from @p mm.
* Nullptr if space exhausted.
*
* Use:
* Dstruct * v = DStruct::array(mm, e1, e2, e3);
**/
template <typename... Args>
requires (std::same_as<Args, obj<AGCObject>> && ...)
static DStruct * array(obj<AAllocator> mm, Args... args);
///@}
/** @defgroup dstruct-access acecss methods **/
///@{
/** true iff array is empty **/
bool is_empty() const noexcept { return size_ == 0; }
/** only support finite arrays :-) **/
bool is_finite() const noexcept { return true; }
/** array capacity **/
size_type capacity() const noexcept { return capacity_; }
/** current array size (number of elements) **/
size_type size() const noexcept { return size_; }
/** return element @p index of this array (0-based) **/
obj<AGCObject> at(size_type index) const;
const obj<AGCObject> & operator[](size_type index) const noexcept { return elts_[index]; }
obj<AGCObject> & operator[](size_type index) noexcept { return elts_[index]; }
///@}
/** @defgroup dstruct-iterators iterators **/
///@{
///@}
/** @defgroup dstruct-assign assignment **/
///@{
/** append @p elt at the end of array.
* true on success, false otherwise
**/
bool push_back(obj<AGCObject> elt) noexcept;
///@}
/** @defgroup dstruct-general general methods **/
///@{
/** resize to @p new_size. @p new_size may not be larger than capacity
* Return true if resize was accomplished; false otherwise.
**/
bool resize(size_type new_size) noexcept;
/** reduce array capacity to current array size
*
* note: with X1Collector, capacity is reduced but memory not recycled
* until next collection
**/
void shrink_to_fit() noexcept;
///@}
/** @defgroup dstruct-conversion-operators conversion operators **/
///@{
///@}
/** @defgroup dstruct-sequence-methods **/
///@{
///@}
/** @defgroup dstruct-printable-methods **/
///@{
/** pretty-printing support **/
bool pretty(const ppindentinfo & ppii) const;
///@}
/** @defgroup dstruct-gcobject-methods **/
///@{
/** shallow memory consumption. Excludes child objects **/
AAllocator::size_type shallow_size() const noexcept;
/** return shallow copy of this array, using memory from @p mm **/
DStruct * shallow_copy(obj<AAllocator> mm) const noexcept;
/** forward elements to @p gc to-space; replace originals with forarding pointers **/
AAllocator::size_type forward_children(obj<ACollector> gc) noexcept;
///@}
private:
/** @defgroup dstruct-instance-variables instance variables **/
///@{
/** extent of @ref elts_ array **/
size_type capacity_ = 0;
/** array size
* Invariant: size_ <= capacity_
**/
size_type size_ = 0;
/** struct keys. These will be unique strings **/
DArray * keys_ = nullptr;
/** struct member values **/
DArray * values_ = nullptr;
///@}
};
template <typename... Args>
requires (std::same_as<Args, obj<DStruct::AGCObject>> && ...)
DStruct *
DStruct::array(obj<AAllocator> mm, Args... args)
{
DStruct * result = empty(mm, sizeof...(args));
if (result) {
(result->push_back(args), ...);
}
return result;
}
} /*namespace scm*/
} /*namespace xo*/
/* end DStruct.hpp */

12
xo-object2/include/xo/object2/Dictionary.hpp Normal file
View file

@ -0,0 +1,12 @@
/** @file Dictionary.hpp
*
* @author Roland Conybeare, Mar 2026
**/
#pragma once
#include "DDictionary.hpp"
#include "dictionary/IGCObject_DDictionary.hpp"
#include "dictionary/IPrintable_DDictionary.hpp"
/* end Dictionary.hpp */

67
xo-object2/include/xo/object2/dictionary/IGCObject_DDictionary.hpp Normal file
View file

@ -0,0 +1,67 @@
/** @file IGCObject_DDictionary.hpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IGCObject_DDictionary.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_repr.hpp.j2]
* 3. idl for facet methods
* [idl/IGCObject_DDictionary.json5]
**/
#pragma once
#include "GCObject.hpp"
#include <xo/gc/GCObject.hpp>
#include <xo/alloc2/Allocator.hpp>
#include "DDictionary.hpp"
namespace xo { namespace scm { class IGCObject_DDictionary; } }
namespace xo {
namespace facet {
template <>
struct FacetImplementation<xo::mm::AGCObject,
xo::scm::DDictionary>
{
using ImplType = xo::mm::IGCObject_Xfer
<xo::scm::DDictionary,
xo::scm::IGCObject_DDictionary>;
};
}
}
namespace xo {
namespace scm {
/** @class IGCObject_DDictionary
**/
class IGCObject_DDictionary {
public:
/** @defgroup scm-gcobject-ddictionary-type-traits **/
///@{
using size_type = xo::mm::AGCObject::size_type;
using AAllocator = xo::mm::AGCObject::AAllocator;
using ACollector = xo::mm::AGCObject::ACollector;
using Copaque = xo::mm::AGCObject::Copaque;
using Opaque = xo::mm::AGCObject::Opaque;
///@}
/** @defgroup scm-gcobject-ddictionary-methods **/
///@{
// const methods
/** memory consumption for this instance **/
static size_type shallow_size(const DDictionary & self) noexcept;
/** copy instance using allocator **/
static Opaque shallow_copy(const DDictionary & self, obj<AAllocator> mm) noexcept;
// non-const methods
/** during GC: forward immdiate children **/
static size_type forward_children(DDictionary & self, obj<ACollector> gc) noexcept;
///@}
};
} /*namespace scm*/
} /*namespace xo*/
/* end */

62
xo-object2/include/xo/object2/dictionary/IPrintable_DDictionary.hpp Normal file
View file

@ -0,0 +1,62 @@
/** @file IPrintable_DDictionary.hpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IPrintable_DDictionary.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_repr.hpp.j2]
* 3. idl for facet methods
* [idl/IPrintable_DDictionary.json5]
**/
#pragma once
#include "Printable.hpp"
#include <xo/printable2/Printable.hpp>
#include <xo/printable2/detail/IPrintable_Xfer.hpp>
#include "DDictionary.hpp"
namespace xo { namespace scm { class IPrintable_DDictionary; } }
namespace xo {
namespace facet {
template <>
struct FacetImplementation<xo::print::APrintable,
xo::scm::DDictionary>
{
using ImplType = xo::print::IPrintable_Xfer
<xo::scm::DDictionary,
xo::scm::IPrintable_DDictionary>;
};
}
}
namespace xo {
namespace scm {
/** @class IPrintable_DDictionary
**/
class IPrintable_DDictionary {
public:
/** @defgroup scm-printable-ddictionary-type-traits **/
///@{
using ppindentinfo = xo::print::APrintable::ppindentinfo;
using Copaque = xo::print::APrintable::Copaque;
using Opaque = xo::print::APrintable::Opaque;
///@}
/** @defgroup scm-printable-ddictionary-methods **/
///@{
// const methods
/** Pretty-printing support for this object.
See [xo-indentlog/xo/indentlog/pretty.hpp] **/
static bool pretty(const DDictionary & self, const ppindentinfo & ppii);
// non-const methods
///@}
};
} /*namespace scm*/
} /*namespace xo*/
/* end */

4
xo-object2/src/object2/CMakeLists.txt
View file

@ -37,6 +37,10 @@ set(SELF_SRCS
IGCObject_DString.cpp
IPrintable_DString.cpp
DDictionary.cpp
IGCObject_DDictionary.cpp
IPrintable_DDictionary.cpp
DRuntimeError.cpp
IGCObject_DRuntimeError.cpp
IPrintable_DRuntimeError.cpp

13
xo-object2/src/object2/DArray.cpp
View file

@ -67,6 +67,19 @@ namespace xo {
}
}
bool
DArray::assign_at(size_type ix, obj<AGCObject> x) noexcept
{
if (ix >= size_)
return false;
scope log(XO_DEBUG(true), "need write barrier");
this->elts_[ix] = x;
return true;
}
bool
DArray::push_back(obj<AGCObject> elt) noexcept
{

208
xo-object2/src/object2/DDictionary.cpp Normal file
View file

@ -0,0 +1,208 @@
/** @file DDictionary.cpp
*
* @author Roland Conybeare, Mar 2026
**/
#include "DDictionary.hpp"
#include "Array.hpp"
#include "String.hpp"
#include <xo/facet/FacetRegistry.hpp>
#include <utility>
namespace xo {
using xo::print::APrintable;
using xo::facet::FacetRegistry;
using xo::mm::AGCObject;
namespace scm {
DDictionary::DDictionary(DArray * keys,
DArray * values)
: keys_{keys}, values_{values}
{}
DDictionary *
DDictionary::empty(obj<AAllocator> mm, size_type cap)
{
void * mem = mm.alloc_for<DDictionary>();
if (cap <= 0)
cap = 1;
DArray * keys = DArray::empty(mm, cap);
DArray * values = DArray::empty(mm, cap);
return new (mem) DDictionary(keys, values);
}
std::pair<const DString *, obj<AGCObject>>
DDictionary::at_index(size_type ix) const
{
if (ix < keys_->size()) {
auto key_str = obj<AGCObject,DString>::from((*keys_)[ix]);
assert(key_str);
return pair_type(this->key_at_index(ix), (*values_)[ix]);
}
return pair_type();
}
const DString *
DDictionary::key_at_index(size_type ix) const
{
auto key_str = obj<AGCObject,DString>::from((*keys_)[ix]);
assert(key_str);
return key_str.data();
}
obj<AGCObject>
DDictionary::value_at_index(size_type ix) const
{
if (ix < keys_->size()) {
assert(ix < values_->size());
return (*values_)[ix];
}
return obj<AGCObject>();
}
bool
DDictionary::try_update(const pair_type & kv_pair)
{
for (size_type i = 0, n = keys_->size(); i < n; ++i) {
auto key_i = obj<AGCObject,DString>::from((*keys_)[i]);
assert(key_i);
if (*(key_i.data()) == *(kv_pair.first)) {
values_->assign_at(i, kv_pair.second);
return true;
}
}
return false;
}
bool
DDictionary::try_upsert(const pair_type & kv_pair)
{
if (this->try_update(kv_pair))
return true;
if (keys_->size() == keys_->capacity())
return false;
keys_->push_back(obj<AGCObject,DString>(const_cast<DString *>(kv_pair.first)));
values_->push_back(kv_pair.second);
return true;
}
bool
DDictionary::upsert(obj<AAllocator> mm, const pair_type & kv_pair)
{
if (this->try_update(kv_pair))
return true;
if (keys_->size() == keys_->capacity()) {
assert(keys_->capacity() > 0);
size_type cap_2x = 2 * keys_->capacity();
DArray * keys_2x = DArray::copy(mm, keys_, cap_2x);
DArray * values_2x = DArray::copy(mm, values_, cap_2x);
if (keys_2x && values_2x) {
this->keys_ = keys_2x;
this->values_ = values_2x;
} else {
return false;
}
}
keys_->push_back(obj<AGCObject,DString>(const_cast<DString *>(kv_pair.first)));
values_->push_back(kv_pair.second);
return true;
}
void
DDictionary::shrink_to_fit() noexcept
{
keys_->shrink_to_fit();
values_->shrink_to_fit();
}
// ----- printable facet ----
bool
DDictionary::pretty(const ppindentinfo & ppii) const
{
using xo::print::ppstate;
ppstate * pps = ppii.pps();
if (ppii.upto()) {
pps->write("{");
for (size_type i = 0, n = this->size(); i < n; ++i) {
if (i > 0)
pps->write(" ");
obj<APrintable> key
= FacetRegistry::instance().variant<APrintable,AGCObject>((*keys_)[i]);
obj<APrintable> value
= FacetRegistry::instance().variant<APrintable,AGCObject>((*values_)[i]);
assert(key.data());
assert(value.data());
if (!pps->print_upto(key))
return false;
pps->write(": ");
if (!pps->print_upto(value))
return false;
}
pps->write("}");
return true;
} else {
pps->write("{...}");
return false;
}
}
// ----- gcobject facet -----
std::size_t
DDictionary::shallow_size() const noexcept
{
return sizeof(DDictionary);
}
DDictionary *
DDictionary::shallow_copy(obj<AAllocator> mm) const noexcept
{
return mm.std_copy_for(this);
}
std::size_t
DDictionary::forward_children(obj<ACollector> gc) noexcept
{
gc.forward_inplace(&keys_);
gc.forward_inplace(&values_);
return this->shallow_size();
}
} /*namespace scm*/
} /*namespace xo*/
/* end DDictionary.cpp */

39
xo-object2/src/object2/IGCObject_DDictionary.cpp Normal file
View file

@ -0,0 +1,39 @@
/** @file IGCObject_DDictionary.cpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IGCObject_DDictionary.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_any.hpp.j2]
* 3. idl for facet methods
* [idl/IGCObject_DDictionary.json5]
**/
#include "dictionary/IGCObject_DDictionary.hpp"
namespace xo {
namespace scm {
auto
IGCObject_DDictionary::shallow_size(const DDictionary & self) noexcept -> size_type
{
return self.shallow_size();
}
auto
IGCObject_DDictionary::shallow_copy(const DDictionary & self, obj<AAllocator> mm) noexcept -> Opaque
{
return self.shallow_copy(mm);
}
auto
IGCObject_DDictionary::forward_children(DDictionary & self, obj<ACollector> gc) noexcept -> size_type
{
return self.forward_children(gc);
}
} /*namespace scm*/
} /*namespace xo*/
/* end IGCObject_DDictionary.cpp */

28
xo-object2/src/object2/IPrintable_DDictionary.cpp Normal file
View file

@ -0,0 +1,28 @@
/** @file IPrintable_DDictionary.cpp
*
* Generated automagically from ingredients:
* 1. code generator:
* [xo-facet/codegen/genfacet]
* arguments:
* --input [idl/IPrintable_DDictionary.json5]
* 2. jinja2 template for abstract facet .hpp file:
* [iface_facet_any.hpp.j2]
* 3. idl for facet methods
* [idl/IPrintable_DDictionary.json5]
**/
#include "dictionary/IPrintable_DDictionary.hpp"
namespace xo {
namespace scm {
auto
IPrintable_DDictionary::pretty(const DDictionary & self, const ppindentinfo & ppii) -> bool
{
return self.pretty(ppii);
}
} /*namespace scm*/
} /*namespace xo*/
/* end IPrintable_DDictionary.cpp */

24
xo-object2/src/object2/object2_register_facets.cpp
View file

@ -6,30 +6,14 @@
#include "object2_register_facets.hpp"
#include "RuntimeError.hpp"
#include <xo/object2/Dictionary.hpp>
#include <xo/object2/Array.hpp>
//#include <xo/object2/List.hpp>
#include <xo/object2/List.hpp>
#include <xo/object2/Boolean.hpp>
#include <xo/object2/Integer.hpp>
#include <xo/object2/Float.hpp>
#include <xo/object2/String.hpp>
//#include <xo/object2/array/IGCObject_DArray.hpp>
#include <xo/object2/list/IGCObject_DList.hpp>
//#include <xo/object2/boolean/IGCObject_DBoolean.hpp>
//#include <xo/object2/number/IGCObject_DFloat.hpp>
//#include <xo/object2/number/IGCObject_DInteger.hpp>
//#include <xo/object2/string/IGCObject_DString.hpp>
//#include <xo/object2/array/IPrintable_DArray.hpp>
#include <xo/object2/list/IPrintable_DList.hpp>
//#include <xo/object2/boolean/IPrintable_DBoolean.hpp>
//#include <xo/object2/number/IPrintable_DFloat.hpp>
//#include <xo/object2/number/IPrintable_DInteger.hpp>
//#include <xo/object2/string/IPrintable_DString.hpp>
#include <xo/object2/list/ISequence_DList.hpp>
//#include <xo/object2/array/ISequence_DArray.hpp>
#include <xo/printable2/detail/APrintable.hpp>
#include <xo/alloc2/alloc/AAllocator.hpp>
#include <xo/facet/FacetRegistry.hpp>
@ -74,6 +58,9 @@ namespace xo {
FacetRegistry::register_impl<APrintable, DArray>();
FacetRegistry::register_impl<ASequence, DArray>();
FacetRegistry::register_impl<AGCObject, DDictionary>();
FacetRegistry::register_impl<APrintable, DDictionary>();
FacetRegistry::register_impl<AGCObject, DRuntimeError>();
FacetRegistry::register_impl<APrintable, DRuntimeError>();
@ -85,6 +72,7 @@ namespace xo {
log && log(xtag("DInteger.tseq", typeseq::id<DInteger>()));
log && log(xtag("DString.tseq", typeseq::id<DString>()));
log && log(xtag("DArray.tseq", typeseq::id<DArray>()));
log && log(xtag("DDictionary.tseq", typeseq::id<DDictionary>()));
log && log(xtag("DRuntimeError.tseq", typeseq::id<DRuntimeError>()));
log && log(xtag("AAllocator.tseq", typeseq::id<AAllocator>()));

8
xo-object2/src/object2/object2_register_types.cpp
View file

@ -11,10 +11,7 @@
#include "string/IGCObject_DString.hpp"
#include "list/IGCObject_DList.hpp"
#include "array/IGCObject_DArray.hpp"
//#include "list/IPrintable_DList.hpp"
//#include "IPrintable_DFloat.hpp"
//#include "number/IPrintable_DInteger.hpp"
#include "dictionary/IGCObject_DDictionary.hpp"
#include <xo/facet/FacetRegistry.hpp>
#include <xo/indentlog/scope.hpp>
@ -23,7 +20,6 @@ namespace xo {
using xo::mm::ACollector;
using xo::mm::AGCObject;
using xo::facet::impl_for;
using xo::facet::typeseq;
using xo::scope;
namespace scm {
@ -46,6 +42,8 @@ namespace xo {
ok &= gc.install_type(impl_for<AGCObject, DArray>());
ok &= gc.install_type(impl_for<AGCObject, DDictionary>());
return ok;
}
}