/* Ordered set data type implemented by an array.
- 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
along with this program; if not, write to the Free Software Foundation,
Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "gl_array_oset.h"
static gl_oset_t
gl_array_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->elements = NULL;
set->count = 0;
set->allocated = 0;
/* At each loop iteration, low < high; for indices < low the values
are smaller than ELT; for indices >= high the values are greater
- than ELT. So, if the element occurs in the list, is at
+ than ELT. So, if the element occurs in the list, it is at
low <= position < high. */
do
{
int cmp = (compar != NULL
? compar (set->elements[mid], elt)
: (set->elements[mid] > elt ? 1 :
- set->elements[mid] < elt ? -1 : 0));
+ set->elements[mid] < elt ? -1 : 0));
if (cmp < 0)
low = mid + 1;
return gl_array_indexof (set, elt) != (size_t)(-1);
}
+static bool
+gl_array_search_atleast (gl_oset_t set,
+ gl_setelement_threshold_fn threshold_fn,
+ const void *threshold,
+ const void **eltp)
+{
+ size_t count = set->count;
+
+ if (count > 0)
+ {
+ size_t low = 0;
+ size_t high = count;
+
+ /* At each loop iteration, low < high; for indices < low the values are
+ smaller than THRESHOLD; for indices >= high the values are nonexistent.
+ So, if an element >= THRESHOLD occurs in the list, it is at
+ low <= position < high. */
+ do
+ {
+ size_t mid = low + (high - low) / 2; /* low <= mid < high */
+
+ if (! threshold_fn (set->elements[mid], threshold))
+ low = mid + 1;
+ else
+ {
+ /* We have an element >= THRESHOLD at index MID. But we need the
+ minimal such index. */
+ high = mid;
+ /* At each loop iteration, low <= high and
+ compar (list->elements[high], value) >= 0,
+ and we know that the first occurrence of the element is at
+ low <= position <= high. */
+ while (low < high)
+ {
+ size_t mid2 = low + (high - low) / 2; /* low <= mid2 < high */
+
+ if (! threshold_fn (set->elements[mid2], threshold))
+ low = mid2 + 1;
+ else
+ high = mid2;
+ }
+ *eltp = set->elements[low];
+ return true;
+ }
+ }
+ while (low < high);
+ }
+ return false;
+}
+
/* Ensure that set->allocated > set->count. */
static void
grow (gl_oset_t set)
size_t i;
elements = set->elements;
+ if (set->base.dispose_fn != NULL)
+ set->base.dispose_fn (elements[position]);
for (i = position + 1; i < count; i++)
elements[i - 1] = elements[i];
set->count = count - 1;
/* At each loop iteration, low < high; for indices < low the values
are smaller than ELT; for indices >= high the values are greater
- than ELT. So, if the element occurs in the list, is at
+ than ELT. So, if the element occurs in the list, it is at
low <= position < high. */
do
{
gl_array_free (gl_oset_t set)
{
if (set->elements != NULL)
- free (set->elements);
+ {
+ if (set->base.dispose_fn != NULL)
+ {
+ size_t count = set->count;
+
+ if (count > 0)
+ {
+ gl_setelement_dispose_fn dispose = set->base.dispose_fn;
+ const void **elements = set->elements;
+
+ do
+ dispose (*elements++);
+ while (--count > 0);
+ }
+ }
+ free (set->elements);
+ }
free (set);
}
result.count = set->count;
result.p = set->elements + 0;
result.q = set->elements + set->count;
+#ifdef lint
+ result.i = 0;
+ result.j = 0;
+#endif
return result;
}
abort ();
/* The last returned element was removed. */
iterator->count--;
- iterator->p--;
- iterator->q--;
+ iterator->p = (const void **) iterator->p - 1;
+ iterator->q = (const void **) iterator->q - 1;
}
if (iterator->p < iterator->q)
{
gl_array_create_empty,
gl_array_size,
gl_array_search,
+ gl_array_search_atleast,
gl_array_add,
gl_array_remove,
gl_array_free,