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

Update comments & assert

Browse Source
This commit is contained in:
Patrick Pelissier committed 2017-03-13 23:19:53 +01:00
1 parent 9c7fcc6659
commit eda7c58594
1 file changed
+5 -3
Download Patch File Download Diff File Expand all files Collapse all files
m-rbtree.h
+5 -3
View File
@@ -33,7 +33,7 @@
#include "m-core.h" #include "m-core.h"
/* Define a binary tree of a given type. /* Define a Red/Black binary tree of a given type.
USAGE: RBTREE_DEF(name, type [, oplist_of_the_type]) */ USAGE: RBTREE_DEF(name, type [, oplist_of_the_type]) */
#define RBTREE_DEF(name, ...) \ #define RBTREE_DEF(name, ...) \
M_IF_NARGS_EQ1(__VA_ARGS__) \ M_IF_NARGS_EQ1(__VA_ARGS__) \
@@ -324,6 +324,7 @@ typedef enum {
if (cpt == 2) { \ if (cpt == 2) { \
tree->node = p; \ tree->node = p; \
} else { \ } else { \
assert (cpt >= 3); \
tab[cpt-3]->child[(int) which[cpt-3]] = p; \ tab[cpt-3]->child[(int) which[cpt-3]] = p; \
} \ } \
/* Done */ \ /* Done */ \
@@ -392,6 +393,7 @@ typedef enum {
{ \ { \
assert (it != NULL); \ assert (it != NULL); \
assert (child == 0 || child == 1); \ assert (child == 0 || child == 1); \
/* FIXME: If end_p, do nothing ? */ \
unsigned int cpt = it->cpt - 1; \ unsigned int cpt = it->cpt - 1; \
node_t *n = it->stack[cpt]; \ node_t *n = it->stack[cpt]; \
const int right = 1 ^ child; \ const int right = 1 ^ child; \
@@ -433,7 +435,7 @@ typedef enum {
M_C3(rbtree_, name, _ref)(const M_C3(rbtree_it_, name,_t) it) \ M_C3(rbtree_, name, _ref)(const M_C3(rbtree_it_, name,_t) it) \
{ \ { \
assert(it != NULL && it->cpt > 0); \ assert(it != NULL && it->cpt > 0); \
/* NOTE: partially unsafe if the user modify its order */ \ /* NOTE: partially unsafe if the user modify the order of the el */ \
return &(it->stack[it->cpt-1]->data); \ return &(it->stack[it->cpt-1]->data); \
} \ } \
\ \
@@ -621,7 +623,7 @@ typedef enum {
unsigned int cpt = 0; \ unsigned int cpt = 0; \
node_t *n = tree->node; \ node_t *n = tree->node; \
which[0] = 0; \ which[0] = 0; \
tab[cpt++] = (node_t*) &tree->node; /* hug! */ \ tab[cpt++] = (node_t*) &tree->node; /* FIXME: To clean! */ \
/* Search for the deletion point */ \ /* Search for the deletion point */ \
tab[cpt] = n; \ tab[cpt] = n; \
while (n != NULL) { \ while (n != NULL) { \