admin/mlib
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix issue in _next / _previous in some corner cases. Fix issue in _remove (IT was not updated to next item)

Browse Source
This commit is contained in:
Patrick Pelissier committed 2021-10-10 20:35:18 +02:00
1 parent fbc8f407eb
commit 9eabc86bdd
1 file changed
+15 -7
Download Patch File Download Diff File Expand all files Collapse all files
m-rbtree.h
+15 -7
View File
@@ -502,7 +502,7 @@ typedef enum {
node_t *n = it->stack[cpt]; \
/* Get the other child */ \
const int right = 1 ^ child; \
if (n->child[right] != NULL && it->which[cpt] == child) { \
if (n->child[right] != NULL) { \
/* Going right */ \
M_ASSERT (cpt < M_RBTR33_MAX_STACK); \
n = n->child[right]; \
@@ -955,12 +955,20 @@ typedef enum {
return true; \
} \
\
static inline void M_C(name,_remove)(tree_t t, it_t it) \
{ \
/* Not optimum: another search in the tree is performed */ \
M_C(name, _pop_at)(NULL, t, *M_C(name,_cref)(it)); \
} \
\
static inline void M_C(name,_remove)(tree_t t, it_t it) \
{ \
/* Not optimum: another search in the tree is performed */ \
type data; \
M_CALL_INIT_SET(oplist, data, *M_C(name,_cref)(it)); \
M_C(name,_next)(it); \
M_C(name, _pop_at)(NULL, t, data); \
/* We have changed the tree: the iterator is partialy invalid */ \
if (!M_C(name, _end_p)(it)) { \
M_C(name, _it_from)(it, t, *M_C(name,_cref)(it)); \
} \
M_CALL_CLEAR(oplist, data); \
} \
\
M_IF_METHOD(EQUAL, oplist)( \
static inline bool M_C(name,_equal_p)(const tree_t t1, const tree_t t2) { \
M_RBTR33_CONTRACT(t1); \