X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_array_list.c;h=9537b1fb53fd5dd9a596227587303f9ee1a7e546;hb=fdbaafb43b00f78c1fa350b8808a390918248cd1;hp=cb39fa0fc9fe9f8538d2aa8d96c20219497892de;hpb=99099106c3c1cb16ed1e91be970332fe225e278b;p=gnulib.git

diff --git a/lib/gl_array_list.c b/lib/gl_array_list.c
index cb39fa0fc..9537b1fb5 100644
--- a/lib/gl_array_list.c
+++ b/lib/gl_array_list.c
@@ -58,8 +58,7 @@ gl_array_create_empty (gl_list_implementation_t implementation,
 		       gl_listelement_hashcode_fn hashcode_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;
@@ -79,8 +78,7 @@ gl_array_create (gl_list_implementation_t implementation,
 		 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;
@@ -88,8 +86,7 @@ gl_array_create (gl_list_implementation_t implementation,
   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
@@ -167,22 +164,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;
 	    }
 	}
@@ -190,12 +193,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;
 	    }
 	}
@@ -204,9 +207,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);
 }
 
@@ -367,7 +371,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
@@ -394,6 +398,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;
 }
@@ -411,6 +419,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;
 }
@@ -427,8 +439,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)
     {
@@ -451,19 +463,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
 	{
@@ -485,7 +497,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)
@@ -509,11 +521,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);
 }
 
@@ -567,8 +599,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,
@@ -583,7 +615,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
   };