Add an element disposal function.

[pspp] / lib / gl_anytree_oset.h

diff --git a/lib/gl_anytree_oset.h b/lib/gl_anytree_oset.h
index 84286bdd809eb1eda8012c5409d041e2161cd942..48de0e51cfaf9a4d500b7ce489a4f73e3dc279c9 100644 (file)
--- a/lib/gl_anytree_oset.h
+++ b/lib/gl_anytree_oset.h
@@ -1,5 +1,5 @@
 /* Ordered set data type implemented by a binary tree.
-   Copyright (C) 2006 Free Software Foundation, Inc.
+   Copyright (C) 2006-2007 Free Software Foundation, Inc.
    Written by Bruno Haible <bruno@clisp.org>, 2006.
 
    This program is free software; you can redistribute it and/or modify
@@ -30,13 +30,14 @@ typedef iterstack_item_t iterstack_t[MAXHEIGHT];
 
 static gl_oset_t
 gl_tree_create_empty (gl_oset_implementation_t implementation,
-                     gl_setelement_compar_fn compar_fn)
+                     gl_setelement_compar_fn compar_fn,
+                     gl_setelement_dispose_fn dispose_fn)
 {
-  struct gl_oset_impl *set =
-    (struct gl_oset_impl *) xmalloc (sizeof (struct gl_oset_impl));
+  struct gl_oset_impl *set = XMALLOC (struct gl_oset_impl);
 
   set->base.vtable = implementation;
   set->base.compar_fn = compar_fn;
+  set->base.dispose_fn = dispose_fn;
   set->root = NULL;
   set->count = 0;
 
@@ -73,6 +74,41 @@ gl_tree_search (gl_oset_t set, const void *elt)
   return false;
 }
 
+static bool
+gl_tree_search_atleast (gl_oset_t set,
+                       gl_setelement_threshold_fn threshold_fn,
+                       const void *threshold,
+                       const void **eltp)
+{
+  gl_oset_node_t node;
+
+  for (node = set->root; node != NULL; )
+    {
+      if (! threshold_fn (node->value, threshold))
+       node = node->right;
+      else
+       {
+         /* We have an element >= VALUE.  But we need the leftmost such
+            element.  */
+         gl_oset_node_t found = node;
+         node = node->left;
+         for (; node != NULL; )
+           {
+             if (! threshold_fn (node->value, threshold))
+               node = node->right;
+             else
+               {
+                 found = node;
+                 node = node->left;
+               }
+           }
+         *eltp = found->value;
+         return true;
+       }
+    }
+  return false;
+}
+
 static gl_oset_node_t
 gl_tree_search_node (gl_oset_t set, const void *elt)
 {
@@ -182,6 +218,8 @@ gl_tree_oset_free (gl_oset_t set)
          if (!stack_ptr->rightp)
            break;
          /* Free the current node.  */
+         if (set->base.dispose_fn != NULL)
+           set->base.dispose_fn (node->value);
          free (node);
        }
       /* Descend on right branch.  */
@@ -211,6 +249,11 @@ gl_tree_iterator (gl_oset_t set)
   result.p = node;
   /* End point is past the rightmost node.  */
   result.q = NULL;
+#ifdef lint
+  result.i = 0;
+  result.j = 0;
+  result.count = 0;
+#endif
 
   return result;
 }