X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2Fgl_carray_list.c;h=8b43901e2be6f7cb24e19c51e786c31fd63a3a3f;hb=cdfe647f8d29540cdfe90cef0fa568c5d2fd4481;hp=f6c640788bcb75a1e43056904f8a93b9a4aa34ad;hpb=38f4a9e9d6b287ba619fb66bfc048411afee81c6;p=gnulib.git diff --git a/lib/gl_carray_list.c b/lib/gl_carray_list.c index f6c640788..8b43901e2 100644 --- a/lib/gl_carray_list.c +++ b/lib/gl_carray_list.c @@ -1,11 +1,11 @@ /* Sequential list data type implemented by a circular array. - Copyright (C) 2006 Free Software Foundation, Inc. + Copyright (C) 2006-2008 Free Software Foundation, Inc. Written by Bruno Haible , 2006. - This program is free software; you can redistribute it and/or modify + 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. + the Free Software Foundation; either version 3 of the License, 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 @@ -13,12 +13,9 @@ 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. */ + along with this program. If not, see . */ -#ifdef HAVE_CONFIG_H -# include -#endif +#include /* Specification. */ #include "gl_carray_list.h" @@ -59,16 +56,17 @@ struct gl_list_impl 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) + 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->offset = 0; @@ -80,22 +78,22 @@ gl_carray_create_empty (gl_list_implementation_t implementation, 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) + 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 @@ -128,6 +126,21 @@ gl_carray_node_value (gl_list_t list, gl_list_node_t node) return list->elements[i]; } +static void +gl_carray_node_set_value (gl_list_t list, gl_list_node_t node, const void *elt) +{ + 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; + list->elements[i] = elt; +} + static gl_list_node_t gl_carray_next_node (gl_list_t list, gl_list_node_t node) { @@ -187,16 +200,22 @@ gl_carray_set_at (gl_list_t list, size_t position, const void *elt) } static size_t -gl_carray_indexof (gl_list_t list, const void *elt) +gl_carray_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; size_t allocated = list->allocated; size_t i_end; - i_end = list->offset + list->count; + i_end = list->offset + end_index; if (i_end >= allocated) i_end -= allocated; @@ -204,7 +223,11 @@ gl_carray_indexof (gl_list_t list, const void *elt) { size_t i; - for (i = list->offset;;) + i = list->offset + start_index; + if (i >= allocated) /* can only happen if start_index > 0 */ + i -= allocated; + + for (;;) { if (equals (elt, list->elements[i])) return (i >= list->offset ? i : i + allocated) - list->offset; @@ -219,7 +242,11 @@ gl_carray_indexof (gl_list_t list, const void *elt) { size_t i; - for (i = list->offset;;) + i = list->offset + start_index; + if (i >= allocated) /* can only happen if start_index > 0 */ + i -= allocated; + + for (;;) { if (elt == list->elements[i]) return (i >= list->offset ? i : i + allocated) - list->offset; @@ -235,9 +262,10 @@ gl_carray_indexof (gl_list_t list, const void *elt) } static gl_list_node_t -gl_carray_search (gl_list_t list, const void *elt) +gl_carray_search_from_to (gl_list_t list, size_t start_index, size_t end_index, + const void *elt) { - size_t index = gl_carray_indexof (list, elt); + size_t index = gl_carray_indexof_from_to (list, start_index, end_index, elt); return INDEX_TO_NODE (index); } @@ -438,6 +466,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) /* Here we must have list->offset > 0, hence list->allocated > 0. */ size_t i1 = list->allocated - 1; i2 -= list->allocated; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i2]); for (i = i2; i > 0; i--) elements[i] = elements[i - 1]; elements[0] = elements[i1]; @@ -446,6 +476,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) } else { + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i2]); for (i = i2; i > i0; i--) elements[i] = elements[i - 1]; } @@ -464,6 +496,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) { i1 -= list->allocated; i3 -= list->allocated; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i1]); for (i = i1; i < i3; i++) elements[i] = elements[i + 1]; } @@ -472,6 +506,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) /* Here we must have list->offset > 0, hence list->allocated > 0. */ size_t i2 = list->allocated - 1; i3 -= list->allocated; + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i1]); for (i = i1; i < i2; i++) elements[i] = elements[i + 1]; elements[i2] = elements[0]; @@ -480,6 +516,8 @@ gl_carray_remove_at (gl_list_t list, size_t position) } else { + if (list->base.dispose_fn != NULL) + list->base.dispose_fn (elements[i1]); for (i = i1; i < i3; i++) elements[i] = elements[i + 1]; } @@ -503,7 +541,7 @@ gl_carray_remove_node (gl_list_t list, gl_list_node_t node) static bool gl_carray_remove (gl_list_t list, const void *elt) { - size_t position = gl_carray_indexof (list, elt); + size_t position = gl_carray_indexof_from_to (list, 0, list->count, elt); if (position == (size_t)(-1)) return false; else @@ -514,7 +552,42 @@ static void gl_carray_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; + size_t i1 = list->offset; + size_t i3 = list->offset + count - 1; + + if (i3 >= list->allocated) + { + /* Here we must have list->offset > 0, hence + list->allocated > 0. */ + size_t i2 = list->allocated - 1; + size_t i; + + i3 -= list->allocated; + for (i = i1; i <= i2; i++) + dispose (elements[i]); + for (i = 0; i <= i3; i++) + dispose (elements[i]); + } + else + { + size_t i; + + for (i = i1; i <= i3; i++) + dispose (elements[i]); + } + } + } + free (list->elements); + } free (list); } @@ -530,6 +603,10 @@ gl_carray_iterator (gl_list_t list) result.count = list->count; result.i = 0; result.j = list->count; +#ifdef lint + result.p = 0; + result.q = 0; +#endif return result; } @@ -547,6 +624,10 @@ gl_carray_iterator_from_to (gl_list_t list, size_t start_index, size_t end_index result.count = list->count; result.i = start_index; result.j = end_index; +#ifdef lint + result.p = 0; + result.q = 0; +#endif return result; } @@ -589,19 +670,19 @@ 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) +gl_carray_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 { @@ -630,7 +711,7 @@ gl_carray_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 */ size_t i_mid2; int cmp2; @@ -661,11 +742,31 @@ gl_carray_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar, return (size_t)(-1); } +static size_t +gl_carray_sortedlist_indexof (gl_list_t list, gl_listelement_compar_fn compar, + const void *elt) +{ + return gl_carray_sortedlist_indexof_from_to (list, compar, 0, list->count, + elt); +} + +static gl_list_node_t +gl_carray_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_carray_sortedlist_indexof_from_to (list, compar, low, high, elt); + return INDEX_TO_NODE (index); +} + 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); + size_t index = + gl_carray_sortedlist_indexof_from_to (list, compar, 0, list->count, elt); return INDEX_TO_NODE (index); } @@ -722,12 +823,13 @@ const struct gl_list_implementation gl_carray_list_implementation = gl_carray_create, gl_carray_size, gl_carray_node_value, + gl_carray_node_set_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_search_from_to, + gl_carray_indexof_from_to, gl_carray_add_first, gl_carray_add_last, gl_carray_add_before, @@ -742,7 +844,9 @@ const struct gl_list_implementation gl_carray_list_implementation = gl_carray_iterator_next, gl_carray_iterator_free, gl_carray_sortedlist_search, + gl_carray_sortedlist_search_from_to, gl_carray_sortedlist_indexof, + gl_carray_sortedlist_indexof_from_to, gl_carray_sortedlist_add, gl_carray_sortedlist_remove };