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

xo-ordinaltree: minor tidy

Browse source
This commit is contained in:
Roland Conybeare 2025-12-05 23:29:00 -05:00
commit 7e149d0558
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
xo-ordinaltree/include/xo/ordinaltree/rbtree/Node.hpp
View file

@ -291,9 +291,9 @@ namespace xo {
void assign_color(Color x) { this->color_ = x; }
void assign_size(size_t z) { this->size_ = z; }
void _assign_contents(const Value & x) { contents_.second = x; }
Node * const * _parent_addr() const { return &parent_; }
Node * const * _child_addr(Direction d) const { return &child_v_[d]; }
void assign_contents(const Value & x) { this->contents_.second = x; }
Node * const * parent_addr() const { return &parent_; }
Node * const * child_addr(Direction d) const { return &child_v_[d]; }
/* recalculate size from immediate childrens' sizes
* editor bait: recalc_local_size()

10
xo-ordinaltree/include/xo/ordinaltree/rbtree/RbTreeUtil.hpp
View file

@ -808,7 +808,7 @@ namespace xo {
/* match on this key already present in tree
* -> just update assoc'd value
*/
N->_assign_contents(kv_pair.second);
N->assign_contents(kv_pair.second);
}
/* after modifying a node n, must recalculate reductions
@ -856,7 +856,7 @@ namespace xo {
const void * src = N;
const void * const * lhs
= reinterpret_cast<const void * const *>(N->_child_addr(Direction::D_Left));
= reinterpret_cast<const void * const *>(N->child_addr(Direction::D_Left));
XO_EXPECT(gc.check_write_barrier(src, lhs, false),
tostr("RbTreeUtil::insert_aux",
@ -1736,7 +1736,7 @@ namespace xo {
if (x->parent()) {
const void * src = x;
const void * const * lhs = reinterpret_cast<const void * const *>(x->_parent_addr());
const void * const * lhs = reinterpret_cast<const void * const *>(x->parent_addr());
XO_EXPECT(gc.check_write_barrier(src, lhs, false),
tostr(c_self, (": expect mlog entry for xgen parent pointer"),
@ -1757,7 +1757,7 @@ namespace xo {
{
const void * parent = x;
const void * const * lhs = reinterpret_cast<const void * const *>(x->_child_addr(detail::Direction(0)));
const void * const * lhs = reinterpret_cast<const void * const *>(x->child_addr(detail::Direction(0)));
XO_EXPECT(gc.check_write_barrier(parent, lhs, false),
tostr(c_self, (": expect mlog entry for xgen left child pointer"),
@ -1790,7 +1790,7 @@ namespace xo {
{
const void * parent = x;
const void * const * lhs
= reinterpret_cast<const void * const *>(x->_child_addr(Direction::D_Right));
= reinterpret_cast<const void * const *>(x->child_addr(Direction::D_Right));
XO_EXPECT(gc.check_write_barrier(parent, lhs, false),
tostr(c_self, (": expect mlog entry for xgen right child pointer"),