apaki/unicstl
1
0
Fork 0
mirror of https://gitee.com/apaki/unicstl.git synced 2025-07-03 23:56:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

tree_order枚举类型重命名，防冲突

Browse Source
This commit is contained in:
建峰 2025-04-27 11:41:20 +08:00
parent 7b672b6e77
commit d278ef008f
3 changed files with 14 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
include/tree.h
View File

@ -22,29 +22,17 @@ typedef enum {
RBT_BLACK, RBT_BLACK,
}rbt_color; }rbt_color;
/** // dfs and bfs traversal order
* @brief dfs amd bfs traversal order enum _tree_order{
* ORDER_PRE, // pre-order
* pre-order traversal ORDER_IN, // in-order
* in-order traversal ORDER_POST, // post-order
* post-order traversal ORDER_BREADTH, // breadth-first search [BFS]
* breadth-first search traversal [BFS]
*
* right-first pre-order traversal
* right-first in-order traversal
* right-first post-order traversal
* breadth-first search traversal [BFS]
*/
enum _order{
ORDER_PRE,
ORDER_IN,
ORDER_POST,
ORDER_BREADTH,
ORDER_PRE_R, ORDER_PRE_R, // right-first pre-order
ORDER_IN_R, ORDER_IN_R, // right-first in-order
ORDER_POST_R, ORDER_POST_R, // right-first post-order
ORDER_BREADTH_R, ORDER_BREADTH_R,// right-first breadth-first search [BFS]
}; };
struct _tree_node struct _tree_node
@ -71,7 +59,7 @@ struct _tree
uint32_t _capacity; uint32_t _capacity;
uint32_t _ratio; uint32_t _ratio;
enum _order _order; enum _tree_order _order;
bool _right_priority; bool _right_priority;
stack_t stack; stack_t stack;
@ -94,7 +82,7 @@ struct _tree
uint32_t (*size)(struct _tree* self); uint32_t (*size)(struct _tree* self);
// iter // iter
iterator_t (*iter)(struct _tree* self, enum _order); iterator_t (*iter)(struct _tree* self, enum _tree_order);
// others // others
bool (*min)(struct _tree* self, void* obj); bool (*min)(struct _tree* self, void* obj);

2
src/tree.c
View File

@ -1151,7 +1151,7 @@ static bool tree_rb_delete(struct _tree* self, void* obj)
return true; return true;
} }
static iterator_t tree_iter(struct _tree* self, enum _order order) static iterator_t tree_iter(struct _tree* self, enum _tree_order order)
{ {
assert(self != NULL); assert(self != NULL);
iterator_t iter = &self->_iter; iterator_t iter = &self->_iter;

6
test/test_tree.c
View File

@ -67,7 +67,7 @@ static const int expected_int_array_orderpre_delete[15][15] = {
{ 13, }, { 13, },
}; };
static const enum _order order[8] = { static const enum _tree_order order[8] = {
ORDER_PRE, ORDER_IN, ORDER_POST, ORDER_BREADTH, ORDER_PRE, ORDER_IN, ORDER_POST, ORDER_BREADTH,
ORDER_PRE_R, ORDER_IN_R, ORDER_POST_R, ORDER_BREADTH_R ORDER_PRE_R, ORDER_IN_R, ORDER_POST_R, ORDER_BREADTH_R
}; };
@ -335,10 +335,6 @@ static void test_rbtree_delete(void)
int temp = 0; int temp = 0;
int count = 0; int count = 0;
iterator_t iter = NULL; iterator_t iter = NULL;
enum _order order[8] = {
ORDER_PRE, ORDER_IN, ORDER_POST, ORDER_BREADTH,
ORDER_PRE_R, ORDER_IN_R, ORDER_POST_R, ORDER_BREADTH_R
};
tree_t tree = tree_rb_new(sizeof(int)); tree_t tree = tree_rb_new(sizeof(int));
TEST_ASSERT_NOT_NULL(tree); TEST_ASSERT_NOT_NULL(tree);