changeset 6977:e6c62f234610

Sequential list data type implemented by a circular array.
author Bruno Haible <bruno@clisp.org>
date Mon, 17 Jul 2006 11:29:21 +0000
parents c77399b5682d
children ec26419f7c0b
files lib/gl_carray_list.c lib/gl_carray_list.h modules/carray-list modules/carray-list-tests tests/test-carray_list.c
diffstat 5 files changed, 1208 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
new file mode 100644
--- /dev/null
+++ b/lib/gl_carray_list.c
@@ -0,0 +1,748 @@
+/* Sequential list data type implemented by a circular array.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2006.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   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
+
+/* Specification.  */
+#include "gl_carray_list.h"
+
+#include <stdlib.h>
+/* Get memcpy.  */
+#include <string.h>
+
+#include "xalloc.h"
+
+/* Checked size_t computations.  */
+#include "xsize.h"
+
+#ifndef uintptr_t
+# define uintptr_t unsigned long
+#endif
+
+/* -------------------------- gl_list_t Data Type -------------------------- */
+
+/* Concrete gl_list_impl type, valid for this file only.  */
+struct gl_list_impl
+{
+  struct gl_list_impl_base base;
+  /* An array of ALLOCATED elements, of which the elements
+     OFFSET, (OFFSET + 1) % ALLOCATED, ..., (OFFSET + COUNT - 1) % ALLOCATED
+     are used.  0 <= COUNT <= ALLOCATED.  Either OFFSET = ALLOCATED = 0 or
+     0 <= OFFSET < ALLOCATED.  */
+  const void **elements;
+  size_t offset;
+  size_t count;
+  size_t allocated;
+};
+
+/* struct gl_list_node_impl doesn't exist here.  The pointers are actually
+   indices + 1.  */
+#define INDEX_TO_NODE(index) (gl_list_node_t)(uintptr_t)(size_t)((index) + 1)
+#define NODE_TO_INDEX(node) ((uintptr_t)(node) - 1)
+
+static gl_list_t
+gl_carray_create_empty (gl_list_implementation_t implementation,
+		       gl_listelement_equals_fn equals_fn,
+		       gl_listelement_hashcode_fn hashcode_fn,
+		       bool allow_duplicates)
+{
+  struct gl_list_impl *list =
+    (struct gl_list_impl *) xmalloc (sizeof (struct gl_list_impl));
+
+  list->base.vtable = implementation;
+  list->base.equals_fn = equals_fn;
+  list->base.hashcode_fn = hashcode_fn;
+  list->base.allow_duplicates = allow_duplicates;
+  list->elements = NULL;
+  list->offset = 0;
+  list->count = 0;
+  list->allocated = 0;
+
+  return list;
+}
+
+static gl_list_t
+gl_carray_create (gl_list_implementation_t implementation,
+		 gl_listelement_equals_fn equals_fn,
+		 gl_listelement_hashcode_fn hashcode_fn,
+		 bool allow_duplicates,
+		 size_t count, const void **contents)
+{
+  struct gl_list_impl *list =
+    (struct gl_list_impl *) xmalloc (sizeof (struct gl_list_impl));
+
+  list->base.vtable = implementation;
+  list->base.equals_fn = equals_fn;
+  list->base.hashcode_fn = hashcode_fn;
+  list->base.allow_duplicates = allow_duplicates;
+  if (count > 0)
+    {
+      list->elements =
+	(const void **) xmalloc (count * sizeof (const void *));
+      memcpy (list->elements, contents, count * sizeof (const void *));
+    }
+  else
+    list->elements = NULL;
+  list->offset = 0;
+  list->count = count;
+  list->allocated = count;
+
+  return list;
+}
+
+static size_t
+gl_carray_size (gl_list_t list)
+{
+  return list->count;
+}
+
+static const void *
+gl_carray_node_value (gl_list_t list, gl_list_node_t node)
+{
+  uintptr_t index = NODE_TO_INDEX (node);
+  size_t i;
+
+  if (!(index < list->count))
+    /* Invalid argument.  */
+    abort ();
+  i = list->offset + index;
+  if (i >= list->allocated)
+    i -= list->allocated;
+  return list->elements[i];
+}
+
+static gl_list_node_t
+gl_carray_next_node (gl_list_t list, gl_list_node_t node)
+{
+  uintptr_t index = NODE_TO_INDEX (node);
+  if (!(index < list->count))
+    /* Invalid argument.  */
+    abort ();
+  index++;
+  if (index < list->count)
+    return INDEX_TO_NODE (index);
+  else
+    return NULL;
+}
+
+static gl_list_node_t
+gl_carray_previous_node (gl_list_t list, gl_list_node_t node)
+{
+  uintptr_t index = NODE_TO_INDEX (node);
+  if (!(index < list->count))
+    /* Invalid argument.  */
+    abort ();
+  if (index > 0)
+    return INDEX_TO_NODE (index - 1);
+  else
+    return NULL;
+}
+
+static const void *
+gl_carray_get_at (gl_list_t list, size_t position)
+{
+  size_t count = list->count;
+  size_t i;
+
+  if (!(position < count))
+    /* Invalid argument.  */
+    abort ();
+  i = list->offset + position;
+  if (i >= list->allocated)
+    i -= list->allocated;
+  return list->elements[i];
+}
+
+static gl_list_node_t
+gl_carray_set_at (gl_list_t list, size_t position, const void *elt)
+{
+  size_t count = list->count;
+  size_t i;
+
+  if (!(position < count))
+    /* Invalid argument.  */
+    abort ();
+  i = list->offset + position;
+  if (i >= list->allocated)
+    i -= list->allocated;
+  list->elements[i] = elt;
+  return INDEX_TO_NODE (position);
+}
+
+static size_t
+gl_carray_indexof (gl_list_t list, const void *elt)
+{
+  size_t count = list->count;
+  if (count > 0)
+    {
+      gl_listelement_equals_fn equals = list->base.equals_fn;
+      size_t allocated = list->allocated;
+      size_t i_end;
+
+      i_end = list->offset + list->count;
+      if (i_end >= allocated)
+	i_end -= allocated;
+
+      if (equals != NULL)
+	{
+	  size_t i;
+
+	  for (i = list->offset;;)
+	    {
+	      if (equals (elt, list->elements[i]))
+		return (i >= list->offset ? i : i + allocated) - list->offset;
+	      i++;
+	      if (i == allocated)
+		i = 0;
+	      if (i == i_end)
+		break;
+	    }
+	}
+      else
+	{
+	  size_t i;
+
+	  for (i = list->offset;;)
+	    {
+	      if (elt == list->elements[i])
+		return (i >= list->offset ? i : i + allocated) - list->offset;
+	      i++;
+	      if (i == allocated)
+		i = 0;
+	      if (i == i_end)
+		break;
+	    }
+	}
+    }
+  return (size_t)(-1);
+}
+
+static gl_list_node_t
+gl_carray_search (gl_list_t list, const void *elt)
+{
+  size_t index = gl_carray_indexof (list, elt);
+  return INDEX_TO_NODE (index);
+}
+
+/* Ensure that list->allocated > list->count.  */
+static void
+grow (gl_list_t list)
+{
+  size_t new_allocated;
+  size_t memory_size;
+  const void **memory;
+
+  new_allocated = xtimes (list->allocated, 2);
+  new_allocated = xsum (new_allocated, 1);
+  memory_size = xtimes (new_allocated, sizeof (const void *));
+  if (size_overflow_p (memory_size))
+    /* Overflow, would lead to out of memory.  */
+    xalloc_die ();
+  if (list->offset > 0 && list->count > 0)
+    {
+      memory = (const void **) xmalloc (memory_size);
+      if (memory == NULL)
+	/* Out of memory.  */
+	xalloc_die ();
+      if (list->offset + list->count > list->allocated)
+	{
+	  memcpy (memory, &list->elements[list->offset],
+		  (list->allocated - list->offset) * sizeof (const void *));
+	  memcpy (memory + (list->allocated - list->offset), list->elements,
+		  (list->offset + list->count - list->allocated)
+		  * sizeof (const void *));
+
+	}
+      else
+	memcpy (memory, &list->elements[list->offset],
+		list->count * sizeof (const void *));
+      if (list->elements != NULL)
+	free (list->elements);
+    }
+  else
+    {
+      memory = (const void **) xrealloc (list->elements, memory_size);
+      if (memory == NULL)
+	/* Out of memory.  */
+	xalloc_die ();
+    }
+  list->elements = memory;
+  list->offset = 0;
+  list->allocated = new_allocated;
+}
+
+static gl_list_node_t
+gl_carray_add_first (gl_list_t list, const void *elt)
+{
+  size_t count = list->count;
+
+  if (count == list->allocated)
+    grow (list);
+  list->offset = (list->offset == 0 ? list->allocated : list->offset) - 1;
+  list->elements[list->offset] = elt;
+  list->count = count + 1;
+  return INDEX_TO_NODE (0);
+}
+
+static gl_list_node_t
+gl_carray_add_last (gl_list_t list, const void *elt)
+{
+  size_t count = list->count;
+  size_t i;
+
+  if (count == list->allocated)
+    grow (list);
+  i = list->offset + count;
+  if (i >= list->allocated)
+    i -= list->allocated;
+  list->elements[i] = elt;
+  list->count = count + 1;
+  return INDEX_TO_NODE (count);
+}
+
+static gl_list_node_t
+gl_carray_add_at (gl_list_t list, size_t position, const void *elt)
+{
+  size_t count = list->count;
+  const void **elements;
+
+  if (!(position <= count))
+    /* Invalid argument.  */
+    abort ();
+  if (count == list->allocated)
+    grow (list);
+  elements = list->elements;
+  if (position <= (count / 2))
+    {
+      /* Shift at most count/2 elements to the left.  */
+      size_t i2, i;
+
+      list->offset = (list->offset == 0 ? list->allocated : list->offset) - 1;
+
+      i2 = list->offset + position;
+      if (i2 >= list->allocated)
+	{
+	  /* Here we must have list->offset > 0, hence list->allocated > 0.  */
+	  size_t i1 = list->allocated - 1;
+	  i2 -= list->allocated;
+	  for (i = list->offset; i < i1; i++)
+	    elements[i] = elements[i + 1];
+	  elements[i1] = elements[0];
+	  for (i = 0; i < i2; i++)
+	    elements[i] = elements[i + 1];
+	}
+      else
+	{
+	  for (i = list->offset; i < i2; i++)
+	    elements[i] = elements[i + 1];
+	}
+      elements[i2] = elt;
+    }
+  else
+    {
+      /* Shift at most (count+1)/2 elements to the right.  */
+      size_t i1, i3, i;
+
+      i1 = list->offset + position;
+      i3 = list->offset + count;
+      if (i1 >= list->allocated)
+	{
+	  i1 -= list->allocated;
+	  i3 -= list->allocated;
+	  for (i = i3; i > i1; i--)
+	    elements[i] = elements[i - 1];
+	}
+      else if (i3 >= list->allocated)
+	{
+	  /* Here we must have list->offset > 0, hence list->allocated > 0.  */
+	  size_t i2 = list->allocated - 1;
+	  i3 -= list->allocated;
+	  for (i = i3; i > 0; i--)
+	    elements[i] = elements[i - 1];
+	  elements[0] = elements[i2];
+	  for (i = i2; i > i1; i--)
+	    elements[i] = elements[i - 1];
+	}
+      else
+	{
+	  for (i = i3; i > i1; i--)
+	    elements[i] = elements[i - 1];
+	}
+      elements[i1] = elt;
+    }
+  list->count = count + 1;
+  return INDEX_TO_NODE (position);
+}
+
+static gl_list_node_t
+gl_carray_add_before (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+  size_t count = list->count;
+  uintptr_t index = NODE_TO_INDEX (node);
+
+  if (!(index < count))
+    /* Invalid argument.  */
+    abort ();
+  return gl_carray_add_at (list, index, elt);
+}
+
+static gl_list_node_t
+gl_carray_add_after (gl_list_t list, gl_list_node_t node, const void *elt)
+{
+  size_t count = list->count;
+  uintptr_t index = NODE_TO_INDEX (node);
+
+  if (!(index < count))
+    /* Invalid argument.  */
+    abort ();
+  return gl_carray_add_at (list, index + 1, elt);
+}
+
+static bool
+gl_carray_remove_at (gl_list_t list, size_t position)
+{
+  size_t count = list->count;
+  const void **elements;
+
+  if (!(position < count))
+    /* Invalid argument.  */
+    abort ();
+  /* Here we know count > 0.  */
+  elements = list->elements;
+  if (position <= ((count - 1) / 2))
+    {
+      /* Shift at most (count-1)/2 elements to the right.  */
+      size_t i0, i2, i;
+
+      i0 = list->offset;
+      i2 = list->offset + position;
+      if (i2 >= list->allocated)
+	{
+	  /* Here we must have list->offset > 0, hence list->allocated > 0.  */
+	  size_t i1 = list->allocated - 1;
+	  i2 -= list->allocated;
+	  for (i = i2; i > 0; i--)
+	    elements[i] = elements[i - 1];
+	  elements[0] = elements[i1];
+	  for (i = i1; i > i0; i--)
+	    elements[i] = elements[i - 1];
+	}
+      else
+	{
+	  for (i = i2; i > i0; i--)
+	    elements[i] = elements[i - 1];
+	}
+
+      i0++;
+      list->offset = (i0 == list->allocated ? 0 : i0);
+    }
+  else
+    {
+      /* Shift at most count/2 elements to the left.  */
+      size_t i1, i3, i;
+
+      i1 = list->offset + position;
+      i3 = list->offset + count - 1;
+      if (i1 >= list->allocated)
+	{
+	  i1 -= list->allocated;
+	  i3 -= list->allocated;
+	  for (i = i1; i < i3; i++)
+	    elements[i] = elements[i + 1];
+	}
+      else if (i3 >= list->allocated)
+	{
+	  /* Here we must have list->offset > 0, hence list->allocated > 0.  */
+	  size_t i2 = list->allocated - 1;
+	  i3 -= list->allocated;
+	  for (i = i1; i < i2; i++)
+	    elements[i] = elements[i + 1];
+	  elements[i2] = elements[0];
+	  for (i = 0; i < i3; i++)
+	    elements[i] = elements[i + 1];
+	}
+      else
+	{
+	  for (i = i1; i < i3; i++)
+	    elements[i] = elements[i + 1];
+	}
+    }
+  list->count = count - 1;
+  return true;
+}
+
+static bool
+gl_carray_remove_node (gl_list_t list, gl_list_node_t node)
+{
+  size_t count = list->count;
+  uintptr_t index = NODE_TO_INDEX (node);
+
+  if (!(index < count))
+    /* Invalid argument.  */
+    abort ();
+  return gl_carray_remove_at (list, index);
+}
+
+static bool
+gl_carray_remove (gl_list_t list, const void *elt)
+{
+  size_t position = gl_carray_indexof (list, elt);
+  if (position == (size_t)(-1))
+    return false;
+  else
+    return gl_carray_remove_at (list, position);
+}
+
+static void
+gl_carray_list_free (gl_list_t list)
+{
+  if (list->elements != NULL)
+    free (list->elements);
+  free (list);
+}
+
+/* --------------------- gl_list_iterator_t Data Type --------------------- */
+
+static gl_list_iterator_t
+gl_carray_iterator (gl_list_t list)
+{
+  gl_list_iterator_t result;
+
+  result.vtable = list->base.vtable;
+  result.list = list;
+  result.count = list->count;
+  result.i = 0;
+  result.j = list->count;
+
+  return result;
+}
+
+static gl_list_iterator_t
+gl_carray_iterator_from_to (gl_list_t list, size_t start_index, size_t end_index)
+{
+  gl_list_iterator_t result;
+
+  if (!(start_index <= end_index && end_index <= list->count))
+    /* Invalid arguments.  */
+    abort ();
+  result.vtable = list->base.vtable;
+  result.list = list;
+  result.count = list->count;
+  result.i = start_index;
+  result.j = end_index;
+
+  return result;
+}
+
+static bool
+gl_carray_iterator_next (gl_list_iterator_t *iterator,
+			 const void **eltp, gl_list_node_t *nodep)
+{
+  gl_list_t list = iterator->list;
+  if (iterator->count != list->count)
+    {
+      if (iterator->count != list->count + 1)
+	/* Concurrent modifications were done on the list.  */
+	abort ();
+      /* The last returned element was removed.  */
+      iterator->count--;
+      iterator->i--;
+      iterator->j--;
+    }
+  if (iterator->i < iterator->j)
+    {
+      size_t i = list->offset + iterator->i;
+      if (i >= list->allocated)
+	i -= list->allocated;
+      *eltp = list->elements[i];
+      if (nodep != NULL)
+	*nodep = INDEX_TO_NODE (iterator->i);
+      iterator->i++;
+      return true;
+    }
+  else
+    return false;
+}
+
+static void
+gl_carray_iterator_free (gl_list_iterator_t *iterator)
+{
+}
+
+/* ---------------------- Sorted gl_list_t Data Type ---------------------- */
+
+static size_t
+gl_carray_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar,
+			      const void *elt)
+{
+  size_t count = list->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 ELT; for indices >= high the values are greater
+	 than ELT.  So, if the element occurs in the list, is at
+	 low <= position < high.  */
+      do
+	{
+	  size_t mid = low + (high - low) / 2; /* low <= mid < high */
+	  size_t i_mid;
+	  int cmp;
+
+	  i_mid = list->offset + mid;
+	  if (i_mid >= list->allocated)
+	    i_mid -= list->allocated;
+
+	  cmp = compar (list->elements[i_mid], elt);
+
+	  if (cmp < 0)
+	    low = mid + 1;
+	  else if (cmp > 0)
+	    high = mid;
+	  else /* cmp == 0 */
+	    {
+	      /* We have an element equal to ELT at index MID.  But we need
+		 the minimal such index.  */
+	      high = mid;
+	      /* At each loop iteration, low <= high and
+		   compar (list->elements[i_high], elt) == 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 <= mid < high */
+		  size_t i_mid2;
+		  int cmp2;
+
+		  i_mid2 = list->offset + mid2;
+		  if (i_mid2 >= list->allocated)
+		    i_mid2 -= list->allocated;
+
+		  cmp2 = compar (list->elements[i_mid2], elt);
+
+		  if (cmp2 < 0)
+		    low = mid2 + 1;
+		  else if (cmp2 > 0)
+		    /* The list was not sorted.  */
+		    abort ();
+		  else /* cmp2 == 0 */
+		    {
+		      if (mid2 == low)
+			break;
+		      high = mid2 - 1;
+		    }
+		}
+	      return low;
+	    }
+	}
+      while (low < high);
+      /* Here low == high.  */
+    }
+  return (size_t)(-1);
+}
+
+static gl_list_node_t
+gl_carray_sortedlist_search (gl_list_t list, gl_listelement_compar_fn compar,
+			     const void *elt)
+{
+  size_t index = gl_carray_sortedlist_indexof (list, compar, elt);
+  return INDEX_TO_NODE (index);
+}
+
+static gl_list_node_t
+gl_carray_sortedlist_add (gl_list_t list, gl_listelement_compar_fn compar,
+			  const void *elt)
+{
+  size_t count = list->count;
+  size_t low = 0;
+  size_t high = count;
+
+  /* At each loop iteration, low <= high; for indices < low the values are
+     smaller than ELT; for indices >= high the values are greater than ELT.  */
+  while (low < high)
+    {
+      size_t mid = low + (high - low) / 2; /* low <= mid < high */
+      size_t i_mid;
+      int cmp;
+
+      i_mid = list->offset + mid;
+      if (i_mid >= list->allocated)
+	i_mid -= list->allocated;
+
+      cmp = compar (list->elements[i_mid], elt);
+
+      if (cmp < 0)
+	low = mid + 1;
+      else if (cmp > 0)
+	high = mid;
+      else /* cmp == 0 */
+	{
+	  low = mid;
+	  break;
+	}
+    }
+  return gl_carray_add_at (list, low, elt);
+}
+
+static bool
+gl_carray_sortedlist_remove (gl_list_t list, gl_listelement_compar_fn compar,
+			     const void *elt)
+{
+  size_t index = gl_carray_sortedlist_indexof (list, compar, elt);
+  if (index == (size_t)(-1))
+    return false;
+  else
+    return gl_carray_remove_at (list, index);
+}
+
+
+const struct gl_list_implementation gl_carray_list_implementation =
+  {
+    gl_carray_create_empty,
+    gl_carray_create,
+    gl_carray_size,
+    gl_carray_node_value,
+    gl_carray_next_node,
+    gl_carray_previous_node,
+    gl_carray_get_at,
+    gl_carray_set_at,
+    gl_carray_search,
+    gl_carray_indexof,
+    gl_carray_add_first,
+    gl_carray_add_last,
+    gl_carray_add_before,
+    gl_carray_add_after,
+    gl_carray_add_at,
+    gl_carray_remove_node,
+    gl_carray_remove_at,
+    gl_carray_remove,
+    gl_carray_list_free,
+    gl_carray_iterator,
+    gl_carray_iterator_from_to,
+    gl_carray_iterator_next,
+    gl_carray_iterator_free,
+    gl_carray_sortedlist_search,
+    gl_carray_sortedlist_indexof,
+    gl_carray_sortedlist_add,
+    gl_carray_sortedlist_remove
+  };
new file mode 100644
--- /dev/null
+++ b/lib/gl_carray_list.h
@@ -0,0 +1,35 @@
+/* Sequential list data type implemented by a circular array.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2006.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software Foundation,
+   Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.  */
+
+#ifndef _GL_CARRAY_LIST_H
+#define _GL_CARRAY_LIST_H
+
+#include "gl_list.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+extern const struct gl_list_implementation gl_carray_list_implementation;
+#define GL_CARRAY_LIST &gl_carray_list_implementation
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _GL_CARRAY_LIST_H */
new file mode 100644
--- /dev/null
+++ b/modules/carray-list
@@ -0,0 +1,26 @@
+Description:
+Sequential list data type implemented by a circular array.
+
+Files:
+lib/gl_carray_list.h
+lib/gl_carray_list.c
+
+Depends-on:
+list
+xalloc
+xsize
+
+configure.ac:
+
+Makefile.am:
+lib_SOURCES += gl_carray_list.h gl_carray_list.c
+
+Include:
+"gl_carray_list.h"
+
+License:
+GPL
+
+Maintainer:
+Bruno Haible
+
new file mode 100644
--- /dev/null
+++ b/modules/carray-list-tests
@@ -0,0 +1,12 @@
+Files:
+tests/test-carray_list.c
+
+Depends-on:
+array-list
+
+configure.ac:
+
+Makefile.am:
+TESTS += test-carray_list$(EXEEXT)
+check_PROGRAMS += test-carray_list
+
new file mode 100644
--- /dev/null
+++ b/tests/test-carray_list.c
@@ -0,0 +1,387 @@
+/* Test of sequential list data type implementation.
+   Copyright (C) 2006 Free Software Foundation, Inc.
+   Written by Bruno Haible <bruno@clisp.org>, 2006.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2, or (at your option)
+   any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   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 <stdlib.h>
+
+#include "gl_array_list.h"
+#include "gl_carray_list.h"
+
+static const char *objects[15] =
+  {
+    "a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k", "l", "m", "n", "o"
+  };
+
+#define SIZEOF(array) (sizeof (array) / sizeof (array[0]))
+#define ASSERT(condition) if (!(condition)) abort ()
+#define RANDOM(n) (rand () % (n))
+#define RANDOM_OBJECT() objects[RANDOM (SIZEOF (objects))]
+
+static void
+check_equals (gl_list_t list1, gl_list_t list2)
+{
+  size_t n, i;
+
+  n = gl_list_size (list1);
+  ASSERT (n == gl_list_size (list2));
+  for (i = 0; i < n; i++)
+    {
+      ASSERT (gl_list_get_at (list1, i) == gl_list_get_at (list2, i));
+    }
+}
+
+static void
+check_all (gl_list_t list1, gl_list_t list2, gl_list_t list3)
+{
+  check_equals (list1, list2);
+  check_equals (list1, list3);
+}
+
+int
+main (int argc, char *argv[])
+{
+  gl_list_t list1, list2, list3;
+
+  /* Allow the user to provide a non-default random seed on the command line.  */
+  if (argc > 1)
+    srand (atoi (argv[1]));
+
+  {
+    size_t initial_size = RANDOM (50);
+    const void **contents =
+      (const void **) malloc (initial_size * sizeof (const void *));
+    size_t i;
+    unsigned int repeat;
+
+    for (i = 0; i < initial_size; i++)
+      contents[i] = RANDOM_OBJECT ();
+
+    /* Create list1.  */
+    list1 = gl_list_create (GL_ARRAY_LIST, NULL, NULL, true,
+                            initial_size, contents);
+    /* Create list2.  */
+    list2 = gl_list_create_empty (GL_CARRAY_LIST, NULL, NULL, true);
+    for (i = 0; i < initial_size; i++)
+      gl_list_add_last (list2, contents[i]);
+
+    /* Create list3.  */
+    list3 = gl_list_create (GL_CARRAY_LIST, NULL, NULL, true,
+                            initial_size, contents);
+
+    check_all (list1, list2, list3);
+
+    for (repeat = 0; repeat < 10000; repeat++)
+      {
+        unsigned int operation = RANDOM (16);
+        switch (operation)
+          {
+          case 0:
+            if (gl_list_size (list1) > 0)
+              {
+                size_t index = RANDOM (gl_list_size (list1));
+                const char *obj = RANDOM_OBJECT ();
+                gl_list_node_t node1, node2, node3;
+
+                node1 = gl_list_set_at (list1, index, obj);
+                ASSERT (gl_list_get_at (list1, index) == obj);
+                ASSERT (gl_list_node_value (list1, node1) == obj);
+
+                node2 = gl_list_set_at (list2, index, obj);
+                ASSERT (gl_list_get_at (list2, index) == obj);
+                ASSERT (gl_list_node_value (list2, node2) == obj);
+
+                node3 = gl_list_set_at (list3, index, obj);
+                ASSERT (gl_list_get_at (list3, index) == obj);
+                ASSERT (gl_list_node_value (list3, node3) == obj);
+
+                if (index > 0)
+                  {
+                    ASSERT (gl_list_node_value (list1, gl_list_previous_node (list1, node1))
+                            == gl_list_get_at (list1, index - 1));
+                    ASSERT (gl_list_node_value (list2, gl_list_previous_node (list3, node3))
+                            == gl_list_get_at (list2, index - 1));
+                    ASSERT (gl_list_node_value (list3, gl_list_previous_node (list3, node3))
+                            == gl_list_get_at (list2, index - 1));
+                  }
+                if (index + 1 < gl_list_size (list1))
+                  {
+                    ASSERT (gl_list_node_value (list1, gl_list_next_node (list1, node1))
+                            == gl_list_get_at (list1, index + 1));
+                    ASSERT (gl_list_node_value (list2, gl_list_next_node (list3, node3))
+                            == gl_list_get_at (list2, index + 1));
+                    ASSERT (gl_list_node_value (list3, gl_list_next_node (list3, node3))
+                            == gl_list_get_at (list2, index + 1));
+                  }
+              }
+            break;
+          case 1:
+            {
+              const char *obj = RANDOM_OBJECT ();
+              gl_list_node_t node1, node2, node3;
+              node1 = gl_list_search (list1, obj);
+              node2 = gl_list_search (list2, obj);
+              node3 = gl_list_search (list3, obj);
+              if (node1 == NULL)
+                {
+                  ASSERT (node2 == NULL);
+                  ASSERT (node3 == NULL);
+                }
+              else
+                {
+                  ASSERT (node2 != NULL);
+                  ASSERT (node3 != NULL);
+                  ASSERT (gl_list_node_value (list1, node1) == obj);
+                  ASSERT (gl_list_node_value (list2, node2) == obj);
+                  ASSERT (gl_list_node_value (list3, node3) == obj);
+                }
+            }
+            break;
+          case 2:
+            {
+              const char *obj = RANDOM_OBJECT ();
+              size_t index1, index2, index3;
+              index1 = gl_list_indexof (list1, obj);
+              index2 = gl_list_indexof (list2, obj);
+              index3 = gl_list_indexof (list3, obj);
+              if (index1 == (size_t)(-1))
+                {
+                  ASSERT (index2 == (size_t)(-1));
+                  ASSERT (index3 == (size_t)(-1));
+                }
+              else
+                {
+                  ASSERT (index2 != (size_t)(-1));
+                  ASSERT (index3 != (size_t)(-1));
+                  ASSERT (gl_list_get_at (list1, index1) == obj);
+                  ASSERT (gl_list_get_at (list2, index2) == obj);
+                  ASSERT (gl_list_get_at (list3, index3) == obj);
+                  ASSERT (index2 == index1);
+                  ASSERT (index3 == index1);
+                }
+            }
+            break;
+          case 3: /* add 1 element */
+            {
+              const char *obj = RANDOM_OBJECT ();
+              gl_list_node_t node1, node2, node3;
+              node1 = gl_list_add_first (list1, obj);
+              node2 = gl_list_add_first (list2, obj);
+              node3 = gl_list_add_first (list3, obj);
+              ASSERT (gl_list_node_value (list1, node1) == obj);
+              ASSERT (gl_list_node_value (list2, node2) == obj);
+              ASSERT (gl_list_node_value (list3, node3) == obj);
+              ASSERT (gl_list_get_at (list1, 0) == obj);
+              ASSERT (gl_list_get_at (list2, 0) == obj);
+              ASSERT (gl_list_get_at (list3, 0) == obj);
+            }
+            break;
+          case 4: /* add 1 element */
+            {
+              const char *obj = RANDOM_OBJECT ();
+              gl_list_node_t node1, node2, node3;
+              node1 = gl_list_add_last (list1, obj);
+              node2 = gl_list_add_last (list2, obj);
+              node3 = gl_list_add_last (list3, obj);
+              ASSERT (gl_list_node_value (list1, node1) == obj);
+              ASSERT (gl_list_node_value (list2, node2) == obj);
+              ASSERT (gl_list_node_value (list3, node3) == obj);
+              ASSERT (gl_list_get_at (list1, gl_list_size (list1) - 1) == obj);
+              ASSERT (gl_list_get_at (list2, gl_list_size (list2) - 1) == obj);
+              ASSERT (gl_list_get_at (list3, gl_list_size (list3) - 1) == obj);
+            }
+            break;
+          case 5: /* add 3 elements */
+            {
+              const char *obj0 = RANDOM_OBJECT ();
+              const char *obj1 = RANDOM_OBJECT ();
+              const char *obj2 = RANDOM_OBJECT ();
+              gl_list_node_t node1, node2, node3;
+              node1 = gl_list_add_first (list1, obj2);
+              node1 = gl_list_add_before (list1, node1, obj0);
+              node1 = gl_list_add_after (list1, node1, obj1);
+              node2 = gl_list_add_first (list2, obj2);
+              node2 = gl_list_add_before (list2, node2, obj0);
+              node2 = gl_list_add_after (list2, node2, obj1);
+              node3 = gl_list_add_first (list3, obj2);
+              node3 = gl_list_add_before (list3, node3, obj0);
+              node3 = gl_list_add_after (list3, node3, obj1);
+              ASSERT (gl_list_node_value (list1, node1) == obj1);
+              ASSERT (gl_list_node_value (list2, node2) == obj1);
+              ASSERT (gl_list_node_value (list3, node3) == obj1);
+              ASSERT (gl_list_get_at (list1, 0) == obj0);
+              ASSERT (gl_list_get_at (list1, 1) == obj1);
+              ASSERT (gl_list_get_at (list1, 2) == obj2);
+              ASSERT (gl_list_get_at (list2, 0) == obj0);
+              ASSERT (gl_list_get_at (list2, 1) == obj1);
+              ASSERT (gl_list_get_at (list2, 2) == obj2);
+              ASSERT (gl_list_get_at (list3, 0) == obj0);
+              ASSERT (gl_list_get_at (list3, 1) == obj1);
+              ASSERT (gl_list_get_at (list3, 2) == obj2);
+            }
+            break;
+          case 6: /* add 1 element */
+            {
+              size_t index = RANDOM (gl_list_size (list1) + 1);
+              const char *obj = RANDOM_OBJECT ();
+              gl_list_node_t node1, node2, node3;
+              node1 = gl_list_add_at (list1, index, obj);
+              node2 = gl_list_add_at (list2, index, obj);
+              node3 = gl_list_add_at (list3, index, obj);
+              ASSERT (gl_list_get_at (list1, index) == obj);
+              ASSERT (gl_list_node_value (list1, node1) == obj);
+              ASSERT (gl_list_get_at (list2, index) == obj);
+              ASSERT (gl_list_node_value (list2, node2) == obj);
+              ASSERT (gl_list_get_at (list3, index) == obj);
+              ASSERT (gl_list_node_value (list3, node3) == obj);
+              if (index > 0)
+                {
+                  ASSERT (gl_list_node_value (list1, gl_list_previous_node (list1, node1))
+                          == gl_list_get_at (list1, index - 1));
+                  ASSERT (gl_list_node_value (list2, gl_list_previous_node (list3, node3))
+                          == gl_list_get_at (list2, index - 1));
+                  ASSERT (gl_list_node_value (list3, gl_list_previous_node (list3, node3))
+                          == gl_list_get_at (list2, index - 1));
+                }
+              if (index + 1 < gl_list_size (list1))
+                {
+                  ASSERT (gl_list_node_value (list1, gl_list_next_node (list1, node1))
+                          == gl_list_get_at (list1, index + 1));
+                  ASSERT (gl_list_node_value (list2, gl_list_next_node (list3, node3))
+                          == gl_list_get_at (list2, index + 1));
+                  ASSERT (gl_list_node_value (list3, gl_list_next_node (list3, node3))
+                          == gl_list_get_at (list2, index + 1));
+                }
+            }
+            break;
+          case 7: case 8: /* remove 1 element */
+            if (gl_list_size (list1) > 0)
+              {
+                size_t n = gl_list_size (list1);
+                const char *obj = gl_list_get_at (list1, RANDOM (n));
+                gl_list_node_t node1, node2, node3;
+                node1 = gl_list_search (list1, obj);
+                node2 = gl_list_search (list2, obj);
+                node3 = gl_list_search (list3, obj);
+                ASSERT (node1 != NULL);
+                ASSERT (node2 != NULL);
+                ASSERT (node3 != NULL);
+                ASSERT (gl_list_remove_node (list1, node1));
+                ASSERT (gl_list_remove_node (list2, node2));
+                ASSERT (gl_list_remove_node (list3, node3));
+                ASSERT (gl_list_size (list1) == n - 1);
+              }
+            break;
+          case 9: case 10: /* remove 1 element */
+            if (gl_list_size (list1) > 0)
+              {
+                size_t n = gl_list_size (list1);
+                size_t index = RANDOM (n);
+                ASSERT (gl_list_remove_at (list1, index));
+                ASSERT (gl_list_remove_at (list2, index));
+                ASSERT (gl_list_remove_at (list3, index));
+                ASSERT (gl_list_size (list1) == n - 1);
+              }
+            break;
+          case 11: case 12: /* remove 1 element */
+            if (gl_list_size (list1) > 0)
+              {
+                size_t n = gl_list_size (list1);
+                const char *obj = gl_list_get_at (list1, RANDOM (n));
+                ASSERT (gl_list_remove (list1, obj));
+                ASSERT (gl_list_remove (list2, obj));
+                ASSERT (gl_list_remove (list3, obj));
+                ASSERT (gl_list_size (list1) == n - 1);
+              }
+            break;
+          case 13:
+            if (gl_list_size (list1) > 0)
+              {
+                size_t n = gl_list_size (list1);
+                const char *obj = "xyzzy";
+                ASSERT (!gl_list_remove (list1, obj));
+                ASSERT (!gl_list_remove (list2, obj));
+                ASSERT (!gl_list_remove (list3, obj));
+                ASSERT (gl_list_size (list1) == n);
+              }
+            break;
+          case 14:
+            {
+              size_t n = gl_list_size (list1);
+              gl_list_iterator_t iter1, iter2, iter3;
+              const void *elt;
+              iter1 = gl_list_iterator (list1);
+              iter2 = gl_list_iterator (list2);
+              iter3 = gl_list_iterator (list3);
+              for (i = 0; i < n; i++)
+                {
+                  ASSERT (gl_list_iterator_next (&iter1, &elt, NULL));
+                  ASSERT (gl_list_get_at (list1, i) == elt);
+                  ASSERT (gl_list_iterator_next (&iter2, &elt, NULL));
+                  ASSERT (gl_list_get_at (list2, i) == elt);
+                  ASSERT (gl_list_iterator_next (&iter3, &elt, NULL));
+                  ASSERT (gl_list_get_at (list3, i) == elt);
+                }
+              ASSERT (!gl_list_iterator_next (&iter1, &elt, NULL));
+              ASSERT (!gl_list_iterator_next (&iter2, &elt, NULL));
+              ASSERT (!gl_list_iterator_next (&iter3, &elt, NULL));
+              gl_list_iterator_free (&iter1);
+              gl_list_iterator_free (&iter2);
+              gl_list_iterator_free (&iter3);
+            }
+            break;
+          case 15:
+            {
+              size_t end = RANDOM (gl_list_size (list1) + 1);
+              size_t start = RANDOM (end + 1);
+              gl_list_iterator_t iter1, iter2, iter3;
+              const void *elt;
+              iter1 = gl_list_iterator_from_to (list1, start, end);
+              iter2 = gl_list_iterator_from_to (list2, start, end);
+              iter3 = gl_list_iterator_from_to (list3, start, end);
+              for (i = start; i < end; i++)
+                {
+                  ASSERT (gl_list_iterator_next (&iter1, &elt, NULL));
+                  ASSERT (gl_list_get_at (list1, i) == elt);
+                  ASSERT (gl_list_iterator_next (&iter2, &elt, NULL));
+                  ASSERT (gl_list_get_at (list2, i) == elt);
+                  ASSERT (gl_list_iterator_next (&iter3, &elt, NULL));
+                  ASSERT (gl_list_get_at (list3, i) == elt);
+                }
+              ASSERT (!gl_list_iterator_next (&iter1, &elt, NULL));
+              ASSERT (!gl_list_iterator_next (&iter2, &elt, NULL));
+              ASSERT (!gl_list_iterator_next (&iter3, &elt, NULL));
+              gl_list_iterator_free (&iter1);
+              gl_list_iterator_free (&iter2);
+              gl_list_iterator_free (&iter3);
+            }
+            break;
+          }
+        check_all (list1, list2, list3);
+      }
+
+    gl_list_free (list1);
+    gl_list_free (list2);
+    gl_list_free (list3);
+    free (contents);
+  }
+
+  return 0;
+}