pnx/archived
Archived
1
0
Fork 0
Code Activity

rbtree.c: killed some dragons

Browse source
This commit is contained in:
Henrik Hautakoski 2010-05-18 08:05:59 +02:00 • committed by Henrik Hautakoski
parent 319b76216b
commit 6fea192c60
1 changed files with 26 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/common/rbtree.c
View file

@ -197,8 +197,6 @@ int rbtree_insert(rbtree *tree, uint key, void *data) {
unsigned char dir = 0, dir2, last, inserted = 0; unsigned char dir = 0, dir2, last, inserted = 0;
/* somewhere in here, there should be dragons */
if (tree->root == NULL) { if (tree->root == NULL) {
tree->root = node_alloc(key, data); tree->root = node_alloc(key, data);
if (tree->root == NULL) if (tree->root == NULL)
@ -210,6 +208,8 @@ int rbtree_insert(rbtree *tree, uint key, void *data) {
g = p = NULL; g = p = NULL;
q = t->child[1] = tree->root; q = t->child[1] = tree->root;
/* somewhere in here, there should be dragons */
for(;;) { for(;;) {
if (q == NULL) { if (q == NULL) {
p->child[dir] = q = node_alloc(key, data); p->child[dir] = q = node_alloc(key, data);
@ -279,7 +279,7 @@ void* rbtree_delete(rbtree *tree, uint key) {
g = p = NULL; g = p = NULL;
q->child[1] = tree->root; q->child[1] = tree->root;
/* more dragons, TODO: reduce indentation */ /* more dragons (killed some of them though) */
while(q->child[dir] != NULL) { while(q->child[dir] != NULL) {
last = dir; last = dir;
@ -291,14 +291,17 @@ void* rbtree_delete(rbtree *tree, uint key) {
if (q->key == key) if (q->key == key)
f = q; f = q;
if (!is_red(q) && !is_red(q->child[dir])) { if (is_red(q) || is_red(q->child[dir]))
if (is_red(q->child[!dir])) continue;
if (is_red(q->child[!dir])) {
p = p->child[last] = rotate_single(q, dir); p = p->child[last] = rotate_single(q, dir);
else if (!is_red(q->child[!dir])) { } else {
s = p->child[!last]; s = p->child[!last];
if (s != NULL) { if (s == NULL)
/* swap color if both child's are black */ continue;
if (!is_red(s->child[!last]) && !is_red(s->child[last])) { if (!is_red(s->child[!last]) && !is_red(s->child[last])) {
p->color = RB_BLACK; p->color = RB_BLACK;
s->color = q->color = RB_RED; s->color = q->color = RB_RED;
@ -316,8 +319,6 @@ void* rbtree_delete(rbtree *tree, uint key) {
} }
} }
} }
}
}
tree->root = head.child[1]; tree->root = head.child[1];
if (tree->root != NULL) if (tree->root != NULL)