X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_array_list.c;h=661cf79c4fde019a0481f5bdfc09a59173ceac97;hb=dd6ceef65e424d30db8706273f88c20b015012ce;hp=f8010ca11feddb3c52ac90a2ae704f91b3b910d7;hpb=7aa40057cd5a93af7c8ee8b619b20cf0107c4172;p=gnulib.git

diff --git a/lib/gl_array_list.c b/lib/gl_array_list.c
index f8010ca11..661cf79c4 100644
--- a/lib/gl_array_list.c
+++ b/lib/gl_array_list.c
@@ -1,5 +1,5 @@
 /* Sequential list 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
@@ -16,9 +16,7 @@
    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_list.h"
@@ -58,14 +56,15 @@ static gl_list_t
 gl_array_create_empty (gl_list_implementation_t implementation,
 		       gl_listelement_equals_fn equals_fn,
 		       gl_listelement_hashcode_fn hashcode_fn,
+		       gl_listelement_dispose_fn dispose_fn,
 		       bool allow_duplicates)
 {
-  struct gl_list_impl *list =
-    (struct gl_list_impl *) xmalloc (sizeof (struct gl_list_impl));
+  struct gl_list_impl *list = XMALLOC (struct gl_list_impl);
 
   list->base.vtable = implementation;
   list->base.equals_fn = equals_fn;
   list->base.hashcode_fn = hashcode_fn;
+  list->base.dispose_fn = dispose_fn;
   list->base.allow_duplicates = allow_duplicates;
   list->elements = NULL;
   list->count = 0;
@@ -78,20 +77,20 @@ static gl_list_t
 gl_array_create (gl_list_implementation_t implementation,
 		 gl_listelement_equals_fn equals_fn,
 		 gl_listelement_hashcode_fn hashcode_fn,
+		 gl_listelement_dispose_fn dispose_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));
+  struct gl_list_impl *list = XMALLOC (struct gl_list_impl);
 
   list->base.vtable = implementation;
   list->base.equals_fn = equals_fn;
   list->base.hashcode_fn = hashcode_fn;
+  list->base.dispose_fn = dispose_fn;
   list->base.allow_duplicates = allow_duplicates;
   if (count > 0)
     {
-      list->elements =
-	(const void **) xmalloc (count * sizeof (const void *));
+      list->elements = XNMALLOC (count, const void *);
       memcpy (list->elements, contents, count * sizeof (const void *));
     }
   else
@@ -169,22 +168,28 @@ gl_array_set_at (gl_list_t list, size_t position, const void *elt)
 }
 
 static size_t
-gl_array_indexof (gl_list_t list, const void *elt)
+gl_array_indexof_from_to (gl_list_t list, size_t start_index, size_t end_index,
+			  const void *elt)
 {
   size_t count = list->count;
-  if (count > 0)
+
+  if (!(start_index <= end_index && end_index <= count))
+    /* Invalid arguments.  */
+    abort ();
+
+  if (start_index < end_index)
     {
       gl_listelement_equals_fn equals = list->base.equals_fn;
       if (equals != NULL)
 	{
 	  size_t i;
 
-	  for (i = 0;;)
+	  for (i = start_index;;)
 	    {
 	      if (equals (elt, list->elements[i]))
 		return i;
 	      i++;
-	      if (i == count)
+	      if (i == end_index)
 		break;
 	    }
 	}
@@ -192,12 +197,12 @@ gl_array_indexof (gl_list_t list, const void *elt)
 	{
 	  size_t i;
 
-	  for (i = 0;;)
+	  for (i = start_index;;)
 	    {
 	      if (elt == list->elements[i])
 		return i;
 	      i++;
-	      if (i == count)
+	      if (i == end_index)
 		break;
 	    }
 	}
@@ -206,9 +211,10 @@ gl_array_indexof (gl_list_t list, const void *elt)
 }
 
 static gl_list_node_t
-gl_array_search (gl_list_t list, const void *elt)
+gl_array_search_from_to (gl_list_t list, size_t start_index, size_t end_index,
+			 const void *elt)
 {
-  size_t index = gl_array_indexof (list, elt);
+  size_t index = gl_array_indexof_from_to (list, start_index, end_index, elt);
   return INDEX_TO_NODE (index);
 }
 
@@ -343,6 +349,8 @@ gl_array_remove_node (gl_list_t list, gl_list_node_t node)
     abort ();
   position = index;
   elements = list->elements;
+  if (list->base.dispose_fn != NULL)
+    list->base.dispose_fn (elements[position]);
   for (i = position + 1; i < count; i++)
     elements[i - 1] = elements[i];
   list->count = count - 1;
@@ -360,6 +368,8 @@ gl_array_remove_at (gl_list_t list, size_t position)
     /* Invalid argument.  */
     abort ();
   elements = list->elements;
+  if (list->base.dispose_fn != NULL)
+    list->base.dispose_fn (elements[position]);
   for (i = position + 1; i < count; i++)
     elements[i - 1] = elements[i];
   list->count = count - 1;
@@ -369,7 +379,7 @@ gl_array_remove_at (gl_list_t list, size_t position)
 static bool
 gl_array_remove (gl_list_t list, const void *elt)
 {
-  size_t position = gl_array_indexof (list, elt);
+  size_t position = gl_array_indexof_from_to (list, 0, list->count, elt);
   if (position == (size_t)(-1))
     return false;
   else
@@ -380,7 +390,23 @@ static void
 gl_array_list_free (gl_list_t list)
 {
   if (list->elements != NULL)
-    free (list->elements);
+    {
+      if (list->base.dispose_fn != NULL)
+	{
+	  size_t count = list->count;
+
+	  if (count > 0)
+	    {
+	      gl_listelement_dispose_fn dispose = list->base.dispose_fn;
+	      const void **elements = list->elements;
+
+	      do
+		dispose (*elements++);
+	      while (--count > 0);
+	    }
+	}
+      free (list->elements);
+    }
   free (list);
 }
 
@@ -396,6 +422,10 @@ gl_array_iterator (gl_list_t list)
   result.count = list->count;
   result.p = list->elements + 0;
   result.q = list->elements + list->count;
+#ifdef lint
+  result.i = 0;
+  result.j = 0;
+#endif
 
   return result;
 }
@@ -413,6 +443,10 @@ gl_array_iterator_from_to (gl_list_t list, size_t start_index, size_t end_index)
   result.count = list->count;
   result.p = list->elements + start_index;
   result.q = list->elements + end_index;
+#ifdef lint
+  result.i = 0;
+  result.j = 0;
+#endif
 
   return result;
 }
@@ -429,8 +463,8 @@ gl_array_iterator_next (gl_list_iterator_t *iterator,
 	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)
     {
@@ -453,19 +487,19 @@ gl_array_iterator_free (gl_list_iterator_t *iterator)
 /* ---------------------- Sorted gl_list_t Data Type ---------------------- */
 
 static size_t
-gl_array_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar,
-			     const void *elt)
+gl_array_sortedlist_indexof_from_to (gl_list_t list,
+				     gl_listelement_compar_fn compar,
+				     size_t low, size_t high,
+				     const void *elt)
 {
-  size_t count = list->count;
-
-  if (count > 0)
+  if (!(low <= high && high <= list->count))
+    /* Invalid arguments.  */
+    abort ();
+  if (low < high)
     {
-      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
+	 than ELT.  So, if the element occurs in the list, it is at
 	 low <= position < high.  */
       do
 	{
@@ -487,7 +521,7 @@ gl_array_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar,
 		 low <= position <= high.  */
 	      while (low < high)
 		{
-		  size_t mid2 = low + (high - low) / 2; /* low <= mid < high */
+		  size_t mid2 = low + (high - low) / 2; /* low <= mid2 < high */
 		  int cmp2 = compar (list->elements[mid2], elt);
 
 		  if (cmp2 < 0)
@@ -511,11 +545,31 @@ gl_array_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar,
   return (size_t)(-1);
 }
 
+static size_t
+gl_array_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar,
+			     const void *elt)
+{
+  return gl_array_sortedlist_indexof_from_to (list, compar, 0, list->count,
+					      elt);
+}
+
+static gl_list_node_t
+gl_array_sortedlist_search_from_to (gl_list_t list,
+				    gl_listelement_compar_fn compar,
+				    size_t low, size_t high,
+				    const void *elt)
+{
+  size_t index =
+    gl_array_sortedlist_indexof_from_to (list, compar, low, high, elt);
+  return INDEX_TO_NODE (index);
+}
+
 static gl_list_node_t
 gl_array_sortedlist_search (gl_list_t list, gl_listelement_compar_fn compar,
 			    const void *elt)
 {
-  size_t index = gl_array_sortedlist_indexof (list, compar, elt);
+  size_t index =
+    gl_array_sortedlist_indexof_from_to (list, compar, 0, list->count, elt);
   return INDEX_TO_NODE (index);
 }
 
@@ -569,8 +623,8 @@ const struct gl_list_implementation gl_array_list_implementation =
     gl_array_previous_node,
     gl_array_get_at,
     gl_array_set_at,
-    gl_array_search,
-    gl_array_indexof,
+    gl_array_search_from_to,
+    gl_array_indexof_from_to,
     gl_array_add_first,
     gl_array_add_last,
     gl_array_add_before,
@@ -585,7 +639,9 @@ const struct gl_list_implementation gl_array_list_implementation =
     gl_array_iterator_next,
     gl_array_iterator_free,
     gl_array_sortedlist_search,
+    gl_array_sortedlist_search_from_to,
     gl_array_sortedlist_indexof,
+    gl_array_sortedlist_indexof_from_to,
     gl_array_sortedlist_add,
     gl_array_sortedlist_remove
   };