wip bin tree remove

src/tree/node.c

@@ -15,7 +15,7 @@ vieter_tree_error vieter_tree_node_insert(vieter_tree_node *node, uint64_t key,
 
     parent = node;
 
-    if (key < node->key) {
+    if (key < parent->key) {
       node = parent->left;
     } else {
       node = parent->right;
@@ -27,7 +27,7 @@ vieter_tree_error vieter_tree_node_insert(vieter_tree_node *node, uint64_t key,
   new_node->data = data;
   new_node->parent = parent;
 
-  if (key < node->key) {
+  if (key < parent->key) {
     parent->left = new_node;
   } else {
     parent->right = new_node;
@@ -36,11 +36,10 @@ vieter_tree_error vieter_tree_node_insert(vieter_tree_node *node, uint64_t key,
   return vieter_tree_ok;
 }
 
-vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *node,
+vieter_tree_error vieter_tree_node_search_node(vieter_tree_node **out, vieter_tree_node *node, uint64_t key) {
-                                          uint64_t key) {
   while (node != NULL) {
     if (node->key == key) {
-      *out = node->data;
+      *out = node;
 
       return vieter_tree_ok;
     }
@@ -55,7 +54,50 @@ vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *node,
   return vieter_tree_not_present;
 }
 
+vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *node,
+                                          uint64_t key) {
+    vieter_tree_node *target;
+    vieter_tree_error res = vieter_tree_node_search_node(&target, node, key);
+
+    if (res != vieter_tree_ok) {
+        return res;
+    }
+
+    *out = target->data;
+
+    return vieter_tree_ok;
+}
+
+vieter_tree_node *vieter_tree_node_successor(vieter_tree_node *node) {
+    if (node->left != NULL ^ node->right != NULL) {
+        return node->left != NULL ? node-> left : node->right;
+    }
+
+    node = node->right;
+
+    while (node->left != NULL) {
+        node = node->left;
+    }
+
+    return node;
+}
+
+void vieter_tree_node_replace(vieter_tree_node *to_replace, vieter_tree_node *replacement) {
+
+}
+
 vieter_tree_error vieter_tree_node_remove(void **out, vieter_tree_node *node,
                                           uint64_t key) {
-  return vieter_tree_not_present;
+    vieter_tree_node *target;
+    vieter_tree_error res = vieter_tree_node_search_node(&target, node, key);
+
+    if (res != vieter_tree_ok) {
+        return res;
+    }
+
+    *out = target->data;
+
+    if (target->left == NULL && target->right == NULL) {
+
+    }
 }

src/tree/node.h

@@ -16,8 +16,13 @@ vieter_tree_node *vieter_tree_node_init();
 
 vieter_tree_error vieter_tree_node_insert(vieter_tree_node *node, uint64_t key, void *data);
 
+vieter_tree_error vieter_tree_node_search_node(vieter_tree_node **out, vieter_tree_node *node, uint64_t key);
 vieter_tree_error vieter_tree_node_search(void **out, vieter_tree_node *node, uint64_t key);
 
 vieter_tree_error vieter_tree_node_remove(void **out, vieter_tree_node *node, uint64_t key);
 
+vieter_tree_node *vieter_tree_node_successor(vieter_tree_node *node);
+
+void vieter_tree_node_replace(vieter_tree_node *to_replace, vieter_tree_node *replacement);
+
 #endif

test/tree/test_binary_tree.c

@@ -28,5 +28,7 @@ void test_insert() {
 }
 
 TEST_LIST = {
+    {"test_init", test_init},
+    {"test_insert", test_insert},
     {NULL, NULL}
 };