idav: comparison ucx/list.c

-:81c4f73236a4
+:c3f2f16fa4b8
 static int cx_pl_cmpfunc(
 const void *l,
 const void *r
 ) {
+// l and r are guaranteed to be non-NULL pointing to the list's memory
 void *const *lptr = l;
 void *const *rptr = r;
-const void *left = lptr == NULL ? NULL : *lptr;
+const void *left = *lptr;
-const void *right = rptr == NULL ? NULL : *rptr;
+const void *right = *rptr;
+if (left == NULL) {
+// NULL is smaller than any value except NULL
+return right == NULL ? 0 : -1;
+} else if (right == NULL) {
+// any value is larger than NULL
+return 1;
+}
 return cx_pl_cmpfunc_impl(left, right);
 }
 static void cx_pl_hack_cmpfunc(const struct cx_list_s *list) {
 // cast away const - this is the hacky thing
 size_t result = list->climpl->insert_sorted(list, array, n);
 cx_pl_unhack_cmpfunc(list);
 return result;
 }
+static size_t cx_pl_insert_unique(
+struct cx_list_s *list,
+const void *array,
+size_t n
+) {
+cx_pl_hack_cmpfunc(list);
+size_t result = list->climpl->insert_unique(list, array, n);
+cx_pl_unhack_cmpfunc(list);
+return result;
+}
 static int cx_pl_insert_iter(
 struct cx_iterator_s *iter,
 const void *elem,
 int prepend
 ) {
 static cx_list_class cx_pointer_list_class = {
 cx_pl_destructor,
 cx_pl_insert_element,
 cx_pl_insert_array,
 cx_pl_insert_sorted,
+cx_pl_insert_unique,
 cx_pl_insert_iter,
 cx_pl_remove,
 cx_pl_clear,
 cx_pl_swap,
 cx_pl_at,
 NULL,
 NULL,
 NULL,
 NULL,
 NULL,
+NULL,
 cx_emptyl_noop,
 NULL,
 cx_emptyl_at,
 cx_emptyl_find_remove,
 cx_emptyl_noop,
 const char *src = data;
 size_t i = 0;
 for (; i < n; i++) {
 if (NULL == invoke_list_func(
 insert_element, list, index + i,
-src + (i * elem_size))) return i;
+src + i * elem_size)
+) {
+return i; // LCOV_EXCL_LINE
+}
 }
 return i;
 }
-size_t cx_list_default_insert_sorted(
+static size_t cx_list_default_insert_sorted_impl(
 struct cx_list_s *list,
 const void *sorted_data,
-size_t n
+size_t n,
+bool allow_duplicates
 ) {
 // corner case
 if (n == 0) return 0;
 size_t elem_size = list->collection.elem_size;
 cx_compare_func cmp = list->collection.cmpfunc;
 const char *src = sorted_data;
 // track indices and number of inserted items
-size_t di = 0, si = 0, inserted = 0;
+size_t di = 0, si = 0, processed = 0;
 // search the list for insertion points
-for (; di < list->collection.size; di++) {
+while (di < list->collection.size) {
 const void *list_elm = invoke_list_func(at, list, di);
-// compare current list element with first source element
+// compare the current list element with the first source element
-// if less or equal, skip
+// if less, skip the list elements
-if (cmp(list_elm, src) <= 0) {
+// if equal, skip the list elements and optionally the source elements
-continue;
+{
-}
+int d = cmp(list_elm, src);
+if (d <= 0) {
-// determine number of consecutive elements that can be inserted
+if (!allow_duplicates && d == 0) {
-size_t ins = 1;
+src += elem_size;
+si++;
+processed++; // we also count duplicates for the return value
+while (si < n && cmp(list_elm, src) == 0) {
+src += elem_size;
+si++;
+processed++;
+}
+if (processed == n) {
+return processed;
+}
+}
+di++;
+continue;
+}
+}
+// determine the number of consecutive elements that can be inserted
+size_t ins = 1, skip = 0;
 const char *next = src;
 while (++si < n) {
+if (!allow_duplicates) {
+// skip duplicates within the source
+if (cmp(next, next + elem_size) == 0) {
+next += elem_size;
+skip++;
+continue;
+} else {
+if (skip > 0) {
+// if we had to skip something, we must wait for the next run
+next += elem_size;
+break;
+}
+}
+}
 next += elem_size;
 // once we become larger than the list elem, break
 if (cmp(list_elm, next) <= 0) {
 break;
 }
 ins++;
 }
 // insert the elements at location si
 if (ins == 1) {
-if (NULL == invoke_list_func(
+if (NULL == invoke_list_func(insert_element, list, di, src)) {
-insert_element, list, di, src)) return inserted;
+return processed; // LCOV_EXCL_LINE
+}
 } else {
 size_t r = invoke_list_func(insert_array, list, di, src, ins);
-if (r < ins) return inserted + r;
+if (r < ins) {
-}
+return processed + r;  // LCOV_EXCL_LINE
-inserted += ins;
+}
+}
+processed += ins + skip;
 di += ins;
 // everything inserted?
-if (inserted == n) return inserted;
+if (processed == n) {
+return processed;
+}
 src = next;
 }
 // insert remaining items
 if (si < n) {
-inserted += invoke_list_func(insert_array, list, di, src, n - si);
+if (allow_duplicates) {
-}
+processed += invoke_list_func(insert_array, list, di, src, n - si);
+} else {
-return inserted;
+const void *last = di == 0 ? NULL : invoke_list_func(at, list, di - 1);
+for (; si < n; si++) {
+// skip duplicates within the source
+if (last == NULL || cmp(last, src) != 0) {
+if (NULL == invoke_list_func(insert_element, list, di, src)) {
+return processed; // LCOV_EXCL_LINE
+}
+last = src;
+di++;
+}
+processed++;
+src += elem_size;
+}
+}
+}
+return processed;
+}
+size_t cx_list_default_insert_sorted(
+struct cx_list_s *list,
+const void *sorted_data,
+size_t n
+) {
+return cx_list_default_insert_sorted_impl(list, sorted_data, n, true);
+}
+size_t cx_list_default_insert_unique(
+struct cx_list_s *list,
+const void *sorted_data,
+size_t n
+) {
+return cx_list_default_insert_sorted_impl(list, sorted_data, n, false);
 }
 void cx_list_default_sort(struct cx_list_s *list) {
 size_t elem_size = list->collection.elem_size;
 size_t list_size = list->collection.size;
 void *tmp = cxMallocDefault(elem_size * list_size);
-if (tmp == NULL) abort();
+if (tmp == NULL) abort(); // LCOV_EXCL_LINE
 // copy elements from source array
 char *loc = tmp;
 for (size_t i = 0; i < list_size; i++) {
 void *src = invoke_list_func(at, list, i);
 if (j >= list->collection.size) return 1;
 size_t elem_size = list->collection.elem_size;
 void *tmp = cxMallocDefault(elem_size);
-if (tmp == NULL) return 1;
+if (tmp == NULL) return 1; // LCOV_EXCL_LINE
 void *ip = invoke_list_func(at, list, i);
 void *jp = invoke_list_func(at, list, j);
 memcpy(tmp, ip, elem_size);
 CxIterator cxListMutIteratorAt(
 CxList *list,
 size_t index
 ) {
+if (list == NULL) list = cxEmptyList;
 CxIterator it = list->cl->iterator(list, index, false);
 it.base.mutating = true;
 return it;
 }
 CxIterator cxListMutBackwardsIteratorAt(
 CxList *list,
 size_t index
 ) {
+if (list == NULL) list = cxEmptyList;
 CxIterator it = list->cl->iterator(list, index, true);
 it.base.mutating = true;
 return it;
 }

Mercurial > hg > idav / file comparison

comparison: ucx/list.c

ucx/list.c