ds: tree: update iterator interface

This commit is contained in:
2025-10-29 14:35:46 +00:00
parent b292168c70
commit 2d5da8605d
2 changed files with 185 additions and 139 deletions

View File

@@ -8,45 +8,30 @@
B_DECLS_BEGIN;
#define B_TYPE_TREE (b_tree_get_type())
#define B_TYPE_TREE (b_tree_get_type())
#define B_TYPE_TREE_ITERATOR (b_tree_iterator_get_type())
B_DECLARE_TYPE(b_tree);
B_DECLARE_TYPE(b_tree_iterator);
B_TYPE_CLASS_DECLARATION_BEGIN(b_tree)
B_TYPE_CLASS_DECLARATION_END(b_tree)
B_TYPE_CLASS_DECLARATION_BEGIN(b_tree_iterator)
B_TYPE_CLASS_DECLARATION_END(b_tree_iterator)
#define B_TREE_NODE_INIT ((b_tree_node) {0})
#define B_TREE_CONTAINER(t, m, v) \
((void *)((v) ? (uintptr_t)(v) - (offsetof(t, m)) : 0))
#define b_tree_node_foreach(it, node) \
for (int z__b_unique_name() = b_tree_iterator_begin_at_node(node, it); \
(it)->node != NULL; b_tree_iterator_next(it))
#define b_tree_node_foreach_recursive(it, node) \
for (int z__b_unique_name() \
= b_tree_iterator_begin_at_node_recursive(node, it); \
(it)->node != NULL; b_tree_iterator_next(it))
#define b_tree_foreach(it, tree) \
for (int z__b_unique_name() = b_tree_iterator_begin(tree, it); \
(it)->node != NULL; b_tree_iterator_next(it))
typedef struct b_tree_node {
struct b_tree_node *__p01, *__p02, *__p03;
struct b_queue_entry __q01;
} b_tree_node;
typedef struct b_tree_iterator {
b_iterator _base;
size_t i, depth;
b_tree_node *node;
unsigned char _f01;
} b_tree_iterator;
BLUE_API b_type b_tree_get_type(void);
BLUE_API b_type b_tree_iterator_get_type(void);
B_TYPE_DEFAULT_CONSTRUCTOR(b_tree, B_TYPE_TREE);
@@ -58,14 +43,14 @@ BLUE_API void b_tree_node_add_sibling(b_tree_node *node, b_tree_node *to_add);
BLUE_API b_tree_node *b_tree_node_get_child(b_tree_node *node, size_t at);
BLUE_API b_tree_node *b_tree_node_get_parent(b_tree_node *node);
BLUE_API int b_tree_iterator_begin(b_tree *tree, b_tree_iterator *it);
BLUE_API int b_tree_iterator_begin_at_node(b_tree_node *node, b_tree_iterator *it);
BLUE_API int b_tree_iterator_begin_at_node_recursive(
b_tree_node *node, b_tree_iterator *it);
BLUE_API b_iterator *b_tree_begin(b_tree *tree);
BLUE_API const b_iterator *b_tree_cbegin(const b_tree *tree);
BLUE_API bool b_tree_iterator_next(b_tree_iterator *it);
BLUE_API b_status b_tree_iterator_erase(b_tree_iterator *it);
BLUE_API bool b_tree_iterator_is_valid(const b_tree_iterator *it);
BLUE_API b_iterator *b_tree_node_begin(b_tree_node *node);
BLUE_API const b_iterator *b_tree_node_cbegin(const b_tree_node *node);
BLUE_API b_iterator *b_tree_node_begin_recursive(b_tree_node *node);
BLUE_API const b_iterator *b_tree_node_cbegin_recursive(const b_tree_node *node);
B_DECLS_END;