* splay-tree.c (splay_tree_remove): New.

diff --git a/libiberty/ChangeLog b/libiberty/ChangeLog
index c858409d301e51de9e05d34cbf8f3c0b50038ddd..37c565831b154456f03aeeeaba1712396d1c2421 100644 (file)
--- a/libiberty/ChangeLog
+++ b/libiberty/ChangeLog
@@ -1,3 +1,7 @@
+2000-04-05  Richard Henderson  <rth@cygnus.com>
+
+       * splay-tree.c (splay_tree_remove): New.
+
 Thu Mar 16 01:33:58 2000  Jeffrey A Law  (law@cygnus.com)
 
        * Makefile.in (partition.o): Depend on config.h

diff --git a/libiberty/splay-tree.c b/libiberty/splay-tree.c
index 22ea07d84adb5eada30579685da96e21d99f6841..de66d11bf563f0ce37d0bffe57ef9e48e0cf65dd 100644 (file)
--- a/libiberty/splay-tree.c
+++ b/libiberty/splay-tree.c
@@ -309,6 +309,47 @@ splay_tree_insert (sp, key, value)
   return sp->root;
 }
 
+/* Remove KEY from SP.  It is not an error if it did not exist.  */
+
+void
+splay_tree_remove (sp, key)
+     splay_tree sp;
+     splay_tree_key key;
+{
+  splay_tree_splay (sp, key);
+
+  if (sp->root && (*sp->comp) (sp->root->key, key) == 0)
+    {
+      splay_tree_node left, right;
+
+      left = sp->root->left;
+      right = sp->root->right;
+
+      /* Delete the root node itself.  */
+      if (sp->delete_value)
+       (*sp->delete_value) (sp->root->value);
+      free (sp->root);
+
+      /* One of the children is now the root.  Doesn't matter much
+        which, so long as we preserve the properties of the tree.  */
+      if (left)
+       {
+         sp->root = left;
+
+         /* If there was a right child as well, hang it off the 
+            right-most leaf of the left child.  */
+         if (right)
+           {
+             while (left->right)
+               left = left->right;
+             left->right = right;
+           }
+       }
+      else
+       sp->root = right;
+    }
+}
+
 /* Lookup KEY in SP, returning VALUE if present, and NULL 
    otherwise.  */