src/array_list.c

Tue, 16 Dec 2025 12:07:01 +0100

author
Mike Becker <universe@uap-core.de>
date
Tue, 16 Dec 2025 12:07:01 +0100
changeset 1611
de21dd0d1426
parent 1608
46d8a8305948
permissions
-rw-r--r--

adds docstrings to the new array API - relates to #619

606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 */
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "cx/array_list.h"
763
741a2040fa33 make cx_cmp_ptr default comparator for pointer lists - relates to #340
Mike Becker <universe@uap-core.de>
parents: 735
diff changeset
30 #include "cx/compare.h"
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
31 #include <assert.h>
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
32 #include <string.h>
998
bb196054f3fd make cx_array_copy() support different types for size/capacity - fixes #492
Mike Becker <universe@uap-core.de>
parents: 995
diff changeset
33 #include <errno.h>
606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
34
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
35 // LOW LEVEL ARRAY LIST FUNCTIONS
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
36
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
37 /**
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
38 * Intelligently calculates a new capacity, reserving some more
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
39 * elements than required to prevent too many allocations.
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
40 *
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
41 * @param current_capacity the current capacity of the array
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
42 * @param needed_capacity the required capacity of the array
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
43 * @return the new capacity
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
44 */
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
45 static size_t cx_array_grow_capacity(
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
46 size_t current_capacity,
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
47 size_t needed_capacity
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
48 ) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
49 if (current_capacity >= needed_capacity) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
50 return current_capacity;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
51 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
52 size_t cap = needed_capacity;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
53 size_t alignment;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
54 if (cap < 128) alignment = 16;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
55 else if (cap < 1024) alignment = 64;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
56 else if (cap < 8192) alignment = 512;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
57 else alignment = 1024;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
58 return cap - (cap % alignment) + alignment;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
59 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
60
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
61 int cx_array_init_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
62 memset(array, 0, sizeof(CxArray));
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
63 return cx_array_reserve_(allocator, array, elem_size, capacity);
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1024
diff changeset
64 }
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1024
diff changeset
65
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
66 void cx_array_init_fixed_(CxArray *array, const void *data, size_t capacity, size_t size) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
67 array->data = (void*) data;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
68 array->capacity = capacity;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
69 array->size = size;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
70 }
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
71
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
72 int cx_array_reserve_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
73 if (cxReallocateArray(allocator, &array->data, capacity, elem_size)) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
74 return -1; // LCOV_EXCL_LINE
999
84fc42b04d3b add cx_array_reserve() and several more array convenience functions
Mike Becker <universe@uap-core.de>
parents: 998
diff changeset
75 }
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
76 array->capacity = capacity;
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
77 if (array->size > capacity) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
78 array->size = capacity;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
79 }
999
84fc42b04d3b add cx_array_reserve() and several more array convenience functions
Mike Becker <universe@uap-core.de>
parents: 998
diff changeset
80 return 0;
84fc42b04d3b add cx_array_reserve() and several more array convenience functions
Mike Becker <universe@uap-core.de>
parents: 998
diff changeset
81 }
84fc42b04d3b add cx_array_reserve() and several more array convenience functions
Mike Becker <universe@uap-core.de>
parents: 998
diff changeset
82
1611
de21dd0d1426 adds docstrings to the new array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1608
diff changeset
83 int cx_array_copy_to_new_(const CxAllocator *allocator, CxArray *array, size_t elem_size, size_t capacity) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
84 CxArray heap_array;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
85 if (cx_array_init_(allocator, &heap_array, elem_size, capacity)) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
86 return -1; // LCOV_EXCL_LINE
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
87 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
88 heap_array.size = array->size;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
89 memcpy(heap_array.data, array->data, elem_size * array->size);
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
90 *array = heap_array;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
91 return 0;
1606
f5883f6e42e7 first draft for simplifying the low-level array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
92 }
f5883f6e42e7 first draft for simplifying the low-level array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
93
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
94 int cx_array_insert_(const CxAllocator *allocator, CxArray *array,
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
95 size_t elem_size, size_t index, const void *other, size_t n) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
96 // out of bounds and special case check
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
97 if (index > array->size) return -1;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
98 if (n == 0) return 0;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
99
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
100 // guarantee enough capacity
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
101 if (array->capacity < array->size + n) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
102 const size_t new_capacity = cx_array_grow_capacity(array->capacity,array->size + n);
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
103 if (cxReallocateArray(allocator, &array->data, new_capacity, elem_size)) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
104 return -1; // LCOV_EXCL_LINE
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
105 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
106 array->capacity = new_capacity;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
107 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
108
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
109 // determine insert position
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
110 char *dst = array->data;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
111 dst += index * elem_size;
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
112
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
113 // do we need to move some elements?
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
114 if (index < array->size) {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
115 size_t elems_to_move = array->size - index;
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
116 char *target = dst + n * elem_size;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
117 memmove(target, dst, elems_to_move * elem_size);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
118 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
119
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
120 // place the new elements, if any
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
121 // otherwise, this function just reserved the memory (a.k.a emplace)
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
122 if (other != NULL) {
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
123 memcpy(dst, other, n * elem_size);
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
124 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
125 array->size += n;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
126
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
127 return 0;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
128 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
129
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
130 int cx_array_insert_sorted_(
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
131 const CxAllocator *allocator,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
132 CxArray *array,
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
133 size_t elem_size,
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
134 cx_compare_func cmp_func,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
135 const void *sorted_data,
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
136 size_t n,
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
137 bool allow_duplicates
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
138 ) {
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
139 // assert pointers
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
140 assert(allocator != NULL);
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
141 assert(array != NULL);
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
142 assert(cmp_func != NULL);
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
143 assert(sorted_data != NULL);
1089
865c84fef6b4 refine docs for array_list.h - issue #548
Mike Becker <universe@uap-core.de>
parents: 1084
diff changeset
144
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
145 // corner case
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
146 if (n == 0) return 0;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
147
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1024
diff changeset
148 // overflow check
1496
1a982f6f2407 add missing exclusions for some allocation error handling (all remaining uncovered lines must be covered eventually)
Mike Becker <universe@uap-core.de>
parents: 1494
diff changeset
149 // LCOV_EXCL_START
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
150 if (n > SIZE_MAX - array->size) {
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1024
diff changeset
151 errno = EOVERFLOW;
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1024
diff changeset
152 return 1;
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1024
diff changeset
153 }
1496
1a982f6f2407 add missing exclusions for some allocation error handling (all remaining uncovered lines must be covered eventually)
Mike Becker <universe@uap-core.de>
parents: 1494
diff changeset
154 // LCOV_EXCL_STOP
1040
1ecf4dbbc60c add some more overflow treatment and make sure to set errno properly
Mike Becker <universe@uap-core.de>
parents: 1024
diff changeset
155
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
156 // store some counts
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
157 const size_t old_size = array->size;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
158 const size_t old_capacity = array->capacity;
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
159 // the necessary capacity is the worst case assumption, including duplicates
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
160 const size_t needed_capacity = cx_array_grow_capacity(old_capacity, old_size + n);
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
161
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
162 // if we need more than we have, try a reallocation
1322
7be10b57f658 fix critical memory overflow in the stack-based array reallocator
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
163 if (needed_capacity > old_capacity) {
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
164 if (cxReallocateArray(allocator, &array->data, needed_capacity, elem_size)) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
165 return -1; // LCOV_EXCL_LINE
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
166 }
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
167 array->capacity = needed_capacity;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
168 }
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
169
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
170 // now we have guaranteed that we can insert everything
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
171 size_t new_size = old_size + n;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
172 array->size = new_size;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
173
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
174 // declare the source and destination indices/pointers
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
175 size_t si = 0, di = 0;
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
176 const char *src = sorted_data;
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
177 char *dest = array->data;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
178
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
179 // find the first insertion point
889
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
180 di = cx_array_binary_search_sup(dest, old_size, elem_size, src, cmp_func);
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
181 dest += di * elem_size;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
182
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
183 // move the remaining elements in the array completely to the right
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
184 // we will call it the "buffer" for parked elements
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
185 size_t buf_size = old_size - di;
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
186 size_t bi = new_size - buf_size;
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
187 char *bptr = ((char *) array->data) + bi * elem_size;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
188 memmove(bptr, dest, buf_size * elem_size);
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
189
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
190 // while there are both source and buffered elements left,
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
191 // copy them interleaving
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
192 while (si < n && bi < new_size) {
1508
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
193 // determine how many source elements can be inserted.
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
194 // the first element that shall not be inserted is the smallest element
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
195 // that is strictly larger than the first buffered element
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
196 // (located at the index of the infimum plus one).
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
197 // the infimum is guaranteed to exist:
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
198 // - if all src elements are larger,
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
199 // there is no buffer, and this loop is skipped
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
200 // - if any src element is smaller or equal, the infimum exists
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
201 // - when all src elements that are smaller are copied, the second part
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
202 // of this loop body will copy the remaining buffer (emptying it)
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
203 // Therefore, the buffer can never contain an element that is smaller
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
204 // than any element in the source and the infimum exists.
889
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
205 size_t copy_len, bytes_copied;
1508
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
206 copy_len = cx_array_binary_search_inf(
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
207 src, n - si, elem_size, bptr, cmp_func
889
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
208 );
1508
dfc0ddd9571e optimize sorted insertion by using the infimum instead of the supremum
Mike Becker <universe@uap-core.de>
parents: 1507
diff changeset
209 copy_len++;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
210
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
211 // copy the source elements
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
212 if (copy_len > 0) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
213 if (allow_duplicates) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
214 // we can copy the entire chunk
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
215 bytes_copied = copy_len * elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
216 memcpy(dest, src, bytes_copied);
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
217 dest += bytes_copied;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
218 src += bytes_copied;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
219 si += copy_len;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
220 di += copy_len;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
221 } else {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
222 // first, check the end of the source chunk
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
223 // for being a duplicate of the bptr
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
224 const char *end_of_src = src + (copy_len - 1) * elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
225 size_t skip_len = 0;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
226 while (copy_len > 0 && cmp_func(bptr, end_of_src) == 0) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
227 end_of_src -= elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
228 skip_len++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
229 copy_len--;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
230 }
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
231 char *last = dest == array->data ? NULL : dest - elem_size;
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
232 // then iterate through the source chunk
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
233 // and skip all duplicates with the last element in the array
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
234 size_t more_skipped = 0;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
235 for (unsigned j = 0; j < copy_len; j++) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
236 if (last != NULL && cmp_func(last, src) == 0) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
237 // duplicate - skip
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
238 src += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
239 si++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
240 more_skipped++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
241 } else {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
242 memcpy(dest, src, elem_size);
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
243 src += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
244 last = dest;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
245 dest += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
246 si++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
247 di++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
248 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
249 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
250 // skip the previously identified elements as well
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
251 src += skip_len * elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
252 si += skip_len;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
253 skip_len += more_skipped;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
254 // reduce the actual size by the number of skipped elements
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
255 array->size -= skip_len;
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
256 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
257 }
889
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
258
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
259 // when all source elements are in place, we are done
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
260 if (si >= n) break;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
261
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
262 // determine how many buffered elements need to be restored
889
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
263 copy_len = cx_array_binary_search_sup(
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
264 bptr,
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
265 new_size - bi,
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
266 elem_size,
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
267 src,
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
268 cmp_func
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
269 );
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
270
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
271 // restore the buffered elements
889
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
272 bytes_copied = copy_len * elem_size;
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
273 memmove(dest, bptr, bytes_copied);
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
274 dest += bytes_copied;
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
275 bptr += bytes_copied;
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
276 di += copy_len;
889
f549fd9fbd8f apply binary search in cx_array_insert_sorted()
Mike Becker <universe@uap-core.de>
parents: 888
diff changeset
277 bi += copy_len;
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
278 }
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
279
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
280 // still source elements left?
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
281 if (si < n) {
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
282 if (allow_duplicates) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
283 // duplicates allowed or nothing inserted yet: simply copy everything
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
284 memcpy(dest, src, elem_size * (n - si));
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
285 } else {
1509
0437871200d6 complete test coverage for array_list.c and delete unreachable code
Mike Becker <universe@uap-core.de>
parents: 1508
diff changeset
286 // we must check the remaining source elements one by one
0437871200d6 complete test coverage for array_list.c and delete unreachable code
Mike Becker <universe@uap-core.de>
parents: 1508
diff changeset
287 // to skip the duplicates.
0437871200d6 complete test coverage for array_list.c and delete unreachable code
Mike Becker <universe@uap-core.de>
parents: 1508
diff changeset
288 // Note that no source element can equal the last element in the
0437871200d6 complete test coverage for array_list.c and delete unreachable code
Mike Becker <universe@uap-core.de>
parents: 1508
diff changeset
289 // destination, because that would have created an insertion point
0437871200d6 complete test coverage for array_list.c and delete unreachable code
Mike Becker <universe@uap-core.de>
parents: 1508
diff changeset
290 // and a buffer, s.t. the above loop already handled the duplicates
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
291 while (si < n) {
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
292 // find a chain of elements that can be copied
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
293 size_t copy_len = 1, skip_len = 0;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
294 {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
295 const char *left_src = src;
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
296 while (si + copy_len + skip_len < n) {
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
297 const char *right_src = left_src + elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
298 int d = cmp_func(left_src, right_src);
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
299 if (d < 0) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
300 if (skip_len > 0) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
301 // new larger element found;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
302 // handle it in the next cycle
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
303 break;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
304 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
305 left_src += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
306 copy_len++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
307 } else if (d == 0) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
308 left_src += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
309 skip_len++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
310 } else {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
311 break;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
312 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
313 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
314 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
315 size_t bytes_copied = copy_len * elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
316 memcpy(dest, src, bytes_copied);
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
317 dest += bytes_copied;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
318 src += bytes_copied + skip_len * elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
319 si += copy_len + skip_len;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
320 di += copy_len;
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
321 array->size -= skip_len;
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
322 }
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
323 }
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
324 }
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
325
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
326 // buffered elements need to be moved when we skipped duplicates
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
327 size_t total_skipped = new_size - array->size;
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
328 if (bi < new_size && total_skipped > 0) {
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
329 // move the remaining buffer to the end of the array
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
330 memmove(dest, bptr, elem_size * (new_size - bi));
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
331 }
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
332
986
38fa7e41194c simplify cx_array_copy() - fixes #474
Mike Becker <universe@uap-core.de>
parents: 985
diff changeset
333 return 0;
883
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
334 }
3012e9b4214e add low level cx_array_insert_sorted() and convenience macros
Mike Becker <universe@uap-core.de>
parents: 881
diff changeset
335
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
336 CxIterator cx_array_iterator_(CxArray *array, size_t elem_size) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
337 return cxIterator(array->data, elem_size, array->size);
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
338 }
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
339
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
340 CxIterator cx_array_iterator_ptr_(CxArray *array) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
341 return cxIteratorPtr(array->data, array->size);
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
342 }
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
343
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
344 void cx_array_free_(const CxAllocator *allocator, CxArray *array) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
345 cxFree(allocator, array->data);
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
346 array->data = NULL;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
347 array->size = array->capacity = 0;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
348 }
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
349
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
350
1507
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
351 // implementation that finds ANY index
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
352 static size_t cx_array_binary_search_inf_impl(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
353 const void *arr,
884
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
354 size_t size,
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
355 size_t elem_size,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
356 const void *elem,
884
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
357 cx_compare_func cmp_func
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
358 ) {
888
6f44b1f1275c fix for empty arrays
Mike Becker <universe@uap-core.de>
parents: 885
diff changeset
359 // special case: empty array
6f44b1f1275c fix for empty arrays
Mike Becker <universe@uap-core.de>
parents: 885
diff changeset
360 if (size == 0) return 0;
6f44b1f1275c fix for empty arrays
Mike Becker <universe@uap-core.de>
parents: 885
diff changeset
361
884
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
362 // declare a variable that will contain the compare results
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
363 int result;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
364
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
365 // cast the array pointer to something we can use offsets with
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
366 const char *array = arr;
884
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
367
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
368 // check the first array element
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
369 result = cmp_func(elem, array);
885
878a450e79bd fixes incorrect result from cx_array_binary_search() when searched element is smaller than the entire array
Mike Becker <universe@uap-core.de>
parents: 884
diff changeset
370 if (result < 0) {
878a450e79bd fixes incorrect result from cx_array_binary_search() when searched element is smaller than the entire array
Mike Becker <universe@uap-core.de>
parents: 884
diff changeset
371 return size;
878a450e79bd fixes incorrect result from cx_array_binary_search() when searched element is smaller than the entire array
Mike Becker <universe@uap-core.de>
parents: 884
diff changeset
372 } else if (result == 0) {
884
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
373 return 0;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
374 }
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
375
1024
2911c1f4a570 add shortcut to binary search when array size is one
Mike Becker <universe@uap-core.de>
parents: 1021
diff changeset
376 // special case: there is only one element and that is smaller
2911c1f4a570 add shortcut to binary search when array size is one
Mike Becker <universe@uap-core.de>
parents: 1021
diff changeset
377 if (size == 1) return 0;
2911c1f4a570 add shortcut to binary search when array size is one
Mike Becker <universe@uap-core.de>
parents: 1021
diff changeset
378
884
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
379 // check the last array element
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
380 result = cmp_func(elem, array + elem_size * (size - 1));
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
381 if (result >= 0) {
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
382 return size - 1;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
383 }
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
384
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
385 // the element is now guaranteed to be somewhere in the list
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
386 // so start the binary search
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
387 size_t left_index = 1;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
388 size_t right_index = size - 1;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
389 size_t pivot_index;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
390
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
391 while (left_index <= right_index) {
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
392 pivot_index = left_index + (right_index - left_index) / 2;
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
393 const char *arr_elem = array + pivot_index * elem_size;
884
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
394 result = cmp_func(elem, arr_elem);
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
395 if (result == 0) {
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
396 // found it!
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
397 return pivot_index;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
398 } else if (result < 0) {
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
399 // element is smaller than pivot, continue search left
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
400 right_index = pivot_index - 1;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
401 } else {
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
402 // element is larger than pivot, continue search right
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
403 left_index = pivot_index + 1;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
404 }
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
405 }
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
406
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
407 // report the largest upper bound
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
408 return result < 0 ? (pivot_index - 1) : pivot_index;
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
409 }
d375d8056262 add cx_array_binary_search() - fixes #424
Mike Becker <universe@uap-core.de>
parents: 883
diff changeset
410
1507
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
411 size_t cx_array_binary_search_inf(
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
412 const void *arr,
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
413 size_t size,
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
414 size_t elem_size,
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
415 const void *elem,
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
416 cx_compare_func cmp_func
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
417 ) {
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
418 size_t index = cx_array_binary_search_inf_impl(
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
419 arr, size, elem_size, elem, cmp_func);
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
420 // in case of equality, report the largest index
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
421 const char *e = ((const char *) arr) + (index + 1) * elem_size;
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
422 while (index + 1 < size && cmp_func(e, elem) == 0) {
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
423 e += elem_size;
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
424 index++;
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
425 }
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
426 return index;
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
427 }
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
428
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
429 size_t cx_array_binary_search(
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
430 const void *arr,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
431 size_t size,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
432 size_t elem_size,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
433 const void *elem,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
434 cx_compare_func cmp_func
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
435 ) {
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
436 size_t index = cx_array_binary_search_inf(
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
437 arr, size, elem_size, elem, cmp_func
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
438 );
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
439 if (index < size &&
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
440 cmp_func(((const char *) arr) + index * elem_size, elem) == 0) {
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
441 return index;
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
442 } else {
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
443 return size;
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
444 }
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
445 }
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
446
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
447 size_t cx_array_binary_search_sup(
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
448 const void *arr,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
449 size_t size,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
450 size_t elem_size,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
451 const void *elem,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
452 cx_compare_func cmp_func
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
453 ) {
1507
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
454 size_t index = cx_array_binary_search_inf_impl(
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
455 arr, size, elem_size, elem, cmp_func
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
456 );
1507
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
457 const char *e = ((const char *) arr) + index * elem_size;
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
458 if (index == size) {
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
459 // no infimum means the first element is supremum
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
460 return 0;
1507
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
461 } else if (cmp_func(e, elem) == 0) {
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
462 // found an equal element, search the smallest index
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
463 e -= elem_size; // e now contains the element at index-1
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
464 while (index > 0 && cmp_func(e, elem) == 0) {
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
465 e -= elem_size;
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
466 index--;
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
467 }
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
468 return index;
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
469 } else {
1507
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
470 // we already have the largest index of the infimum (by design)
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
471 // the next element is the supremum (or there is no supremum)
f4010cda9a2a stable return value for binary search when there are duplicates in the array
Mike Becker <universe@uap-core.de>
parents: 1496
diff changeset
472 return index + 1;
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
473 }
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
474 }
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 968
diff changeset
475
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 641
diff changeset
476 #ifndef CX_ARRAY_SWAP_SBO_SIZE
735
b686d0c98c62 unify the list swap SBO sizes
Mike Becker <universe@uap-core.de>
parents: 708
diff changeset
477 #define CX_ARRAY_SWAP_SBO_SIZE 128
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 641
diff changeset
478 #endif
926
8fdd8d78c14b fix several survivors of east-const and some missing consts
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
479 const unsigned cx_array_swap_sbo_size = CX_ARRAY_SWAP_SBO_SIZE;
804
5136f2fc32ec add CX_DISABLE_ARRAY_LIST_SWAP_SBO flag
Mike Becker <universe@uap-core.de>
parents: 764
diff changeset
480
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
481 void cx_array_swap(
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
482 void *arr,
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
483 size_t elem_size,
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
484 size_t idx1,
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
485 size_t idx2
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
486 ) {
660
4738a9065907 add some asserts
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
487 assert(arr != NULL);
4738a9065907 add some asserts
Mike Becker <universe@uap-core.de>
parents: 655
diff changeset
488
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
489 // short circuit
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
490 if (idx1 == idx2) return;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
491
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
492 char sbo_mem[CX_ARRAY_SWAP_SBO_SIZE];
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
493 void *tmp;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
494
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
495 // decide if we can use the local buffer
807
c8d692131b1e remove flags to disable SBO in tests - fix #343 fix #358
Mike Becker <universe@uap-core.de>
parents: 804
diff changeset
496 if (elem_size > CX_ARRAY_SWAP_SBO_SIZE) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
497 tmp = cxMallocDefault(elem_size);
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
498 // we don't want to enforce error handling
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
499 if (tmp == NULL) abort();
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
500 } else {
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
501 tmp = sbo_mem;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
502 }
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
503
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
504 // calculate memory locations
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
505 char *left = arr, *right = arr;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
506 left += idx1 * elem_size;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
507 right += idx2 * elem_size;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
508
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
509 // three-way swap
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
510 memcpy(tmp, left, elem_size);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
511 memcpy(left, right, elem_size);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
512 memcpy(right, tmp, elem_size);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
513
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
514 // free dynamic memory, if it was needed
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
515 if (tmp != sbo_mem) {
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
516 cxFreeDefault(tmp);
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
517 }
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
518 }
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
519
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
520 // HIGH LEVEL ARRAY LIST FUNCTIONS
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
521
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
522 typedef struct {
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
523 struct cx_list_s base;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
524 void *data;
677
b09aae58bba4 refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents: 676
diff changeset
525 size_t capacity;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
526 } cx_array_list;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
527
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
528 static void cx_arl_destructor(struct cx_list_s *list) {
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
529 cx_array_list *arl = (cx_array_list *) list;
708
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
530
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
531 char *ptr = arl->data;
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
532
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
533 if (list->collection.simple_destructor) {
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
534 for (size_t i = 0; i < list->collection.size; i++) {
708
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
535 cx_invoke_simple_destructor(list, ptr);
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
536 ptr += list->collection.elem_size;
708
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
537 }
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
538 }
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
539 if (list->collection.advanced_destructor) {
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
540 for (size_t i = 0; i < list->collection.size; i++) {
708
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
541 cx_invoke_advanced_destructor(list, ptr);
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
542 ptr += list->collection.elem_size;
708
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
543 }
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
544 }
1caed6c9ba68 fix inconsistent destructor requirements for list and map classes
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
545
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
546 cxFree(list->collection.allocator, arl->data);
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
547 cxFree(list->collection.allocator, list);
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
548 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
549
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
550 static size_t cx_arl_insert_array(
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
551 struct cx_list_s *list,
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
552 size_t index,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
553 const void *array,
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
554 size_t n
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
555 ) {
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
556 cx_array_list *arl = (cx_array_list *) list;
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
557 CxArray wrap = {
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
558 arl->data, list->collection.size, arl->capacity
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
559 };
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
560 if (cx_array_insert_(list->collection.allocator, &wrap,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
561 list->collection.elem_size, index, array, n)) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
562 return 0;
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
563 }
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
564 arl->data = wrap.data;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
565 arl->capacity = wrap.capacity;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1606
diff changeset
566 list->collection.size = wrap.size;
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
567 return n;
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
568 }
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
569
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
570 static size_t cx_arl_insert_sorted_impl(
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
571 struct cx_list_s *list,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
572 const void *sorted_data,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
573 size_t n,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
574 bool allow_duplicates
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
575 ) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
576 cx_array_list *arl = (cx_array_list *) list;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
577 CxArray wrap = {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
578 arl->data, list->collection.size, arl->capacity
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
579 };
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
580
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
581 if (cx_array_insert_sorted_(
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
582 list->collection.allocator,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
583 &wrap,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
584 list->collection.elem_size,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
585 list->collection.cmpfunc,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
586 sorted_data,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
587 n,
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
588 allow_duplicates
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
589 )) {
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
590 // array list implementation is "all or nothing"
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
591 return 0; // LCOV_EXCL_LINE
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
592 }
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
593 arl->data = wrap.data;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
594 arl->capacity = wrap.capacity;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
595 list->collection.size = wrap.size;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
596 return n;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
597 }
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
598
881
1dbbf8c1c42f add optimized implementation of insert_sorted for array lists
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
599 static size_t cx_arl_insert_sorted(
1dbbf8c1c42f add optimized implementation of insert_sorted for array lists
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
600 struct cx_list_s *list,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
601 const void *sorted_data,
881
1dbbf8c1c42f add optimized implementation of insert_sorted for array lists
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
602 size_t n
1dbbf8c1c42f add optimized implementation of insert_sorted for array lists
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
603 ) {
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
604 return cx_arl_insert_sorted_impl(list, sorted_data, n, true);
881
1dbbf8c1c42f add optimized implementation of insert_sorted for array lists
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
605 }
1dbbf8c1c42f add optimized implementation of insert_sorted for array lists
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
606
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
607 static size_t cx_arl_insert_unique(
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
608 struct cx_list_s *list,
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
609 const void *sorted_data,
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
610 size_t n
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
611 ) {
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
612 return cx_arl_insert_sorted_impl(list, sorted_data, n, false);
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
613 }
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
614
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
615 static void *cx_arl_insert_element(
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
616 struct cx_list_s *list,
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
617 size_t index,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
618 const void *element
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
619 ) {
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
620 if (cx_arl_insert_array(list, index, element, 1) == 1) {
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
621 return ((char*)((cx_array_list *) list)->data) + index * list->collection.elem_size;
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
622 } else {
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
623 return NULL;
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
624 }
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
625 }
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
626
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
627 static int cx_arl_insert_iter(
853
d4baf4dd55c3 simplify iterator structures
Mike Becker <universe@uap-core.de>
parents: 850
diff changeset
628 struct cx_iterator_s *iter,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
629 const void *elem,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
630 int prepend
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
631 ) {
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
632 struct cx_list_s *list = iter->src_handle;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
633 if (iter->index < list->collection.size) {
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
634 if (cx_arl_insert_element(list,
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
635 iter->index + 1 - prepend, elem) == NULL) {
1496
1a982f6f2407 add missing exclusions for some allocation error handling (all remaining uncovered lines must be covered eventually)
Mike Becker <universe@uap-core.de>
parents: 1494
diff changeset
636 return 1; // LCOV_EXCL_LINE
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
637 }
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
638 iter->elem_count++;
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
639 if (prepend != 0) {
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
640 iter->index++;
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
641 iter->elem_handle = ((char *) iter->elem_handle) + list->collection.elem_size;
619
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
642 }
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
643 return 0;
619
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
644 } else {
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
645 if (cx_arl_insert_element(list, list->collection.size, elem) == NULL) {
1496
1a982f6f2407 add missing exclusions for some allocation error handling (all remaining uncovered lines must be covered eventually)
Mike Becker <universe@uap-core.de>
parents: 1494
diff changeset
646 return 1; // LCOV_EXCL_LINE
874
cdce47f34d48 fix inserting via iterator correctly increases element count
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
647 }
1316
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
648 iter->elem_count++;
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
649 iter->index = list->collection.size;
c41538edfcef add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
650 return 0;
619
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
651 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
652 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
653
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
654 static size_t cx_arl_remove(
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
655 struct cx_list_s *list,
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
656 size_t index,
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
657 size_t num,
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
658 void *targetbuf
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
659 ) {
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
660 cx_array_list *arl = (cx_array_list *) list;
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
661
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
662 // out-of-bounds check
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
663 size_t remove;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
664 if (index >= list->collection.size) {
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
665 remove = 0;
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
666 } else if (index + num > list->collection.size) {
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
667 remove = list->collection.size - index;
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
668 } else {
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
669 remove = num;
613
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
670 }
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
671
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
672 // easy exit
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
673 if (remove == 0) return 0;
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
674
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
675 // destroy or copy contents
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
676 if (targetbuf == NULL) {
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
677 for (size_t idx = index; idx < index + remove; idx++) {
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
678 cx_invoke_destructor(
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
679 list,
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
680 ((char *) arl->data) + idx * list->collection.elem_size
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
681 );
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
682 }
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
683 } else {
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
684 memcpy(
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
685 targetbuf,
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
686 ((char *) arl->data) + index * list->collection.elem_size,
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
687 remove * list->collection.elem_size
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
688 );
624
b0bdff7d8203 #219: cx_arl_remove short-circuit for last element
Mike Becker <universe@uap-core.de>
parents: 623
diff changeset
689 }
613
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
690
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
691 // calculate how many elements would need to be moved
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
692 size_t remaining = list->collection.size - index - remove;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
693
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
694 // short-circuit removal of last elements
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
695 if (remaining == 0) {
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
696 list->collection.size -= remove;
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
697 return remove;
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
698 }
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
699
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
700 // just move the elements to the left
1608
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
701 char *first_remaining = arl->data;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
702 first_remaining += (index + remove) * list->collection.elem_size;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
703 char *dst_move = arl->data;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
704 dst_move += index * list->collection.elem_size;
46d8a8305948 complete refactoring of low-level array list functions - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
705 memmove(dst_move, first_remaining, remaining * list->collection.elem_size);
820
8b86ee2e09bb remove check that is always true in cx_arl_remove()
Mike Becker <universe@uap-core.de>
parents: 819
diff changeset
706
8b86ee2e09bb remove check that is always true in cx_arl_remove()
Mike Becker <universe@uap-core.de>
parents: 819
diff changeset
707 // decrease the size
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
708 list->collection.size -= remove;
820
8b86ee2e09bb remove check that is always true in cx_arl_remove()
Mike Becker <universe@uap-core.de>
parents: 819
diff changeset
709
919
75da57d4634e add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents: 890
diff changeset
710 return remove;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
711 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
712
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
713 static void cx_arl_clear(struct cx_list_s *list) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
714 if (list->collection.size == 0) return;
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
715
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
716 cx_array_list *arl = (cx_array_list *) list;
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
717 char *ptr = arl->data;
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
718
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
719 if (list->collection.simple_destructor) {
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
720 for (size_t i = 0; i < list->collection.size; i++) {
677
b09aae58bba4 refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents: 676
diff changeset
721 cx_invoke_simple_destructor(list, ptr);
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
722 ptr += list->collection.elem_size;
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
723 }
677
b09aae58bba4 refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents: 676
diff changeset
724 }
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
725 if (list->collection.advanced_destructor) {
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
726 for (size_t i = 0; i < list->collection.size; i++) {
677
b09aae58bba4 refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents: 676
diff changeset
727 cx_invoke_advanced_destructor(list, ptr);
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
728 ptr += list->collection.elem_size;
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
729 }
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
730 }
666
b5dd654deb3b add unit test for cxListClear + fix destructor functions not always invoked with the correct pointer
Mike Becker <universe@uap-core.de>
parents: 664
diff changeset
731
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
732 memset(arl->data, 0, list->collection.size * list->collection.elem_size);
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
733 list->collection.size = 0;
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
734 }
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
735
653
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
736 static int cx_arl_swap(
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
737 struct cx_list_s *list,
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
738 size_t i,
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
739 size_t j
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
740 ) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
741 if (i >= list->collection.size || j >= list->collection.size) return 1;
653
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
742 cx_array_list *arl = (cx_array_list *) list;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
743 cx_array_swap(arl->data, list->collection.elem_size, i, j);
653
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
744 return 0;
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
745 }
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
746
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
747 static void *cx_arl_at(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
748 const struct cx_list_s *list,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
749 size_t index
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
750 ) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
751 if (index < list->collection.size) {
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
752 const cx_array_list *arl = (const cx_array_list *) list;
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
753 char *space = arl->data;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
754 return space + index * list->collection.elem_size;
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
755 } else {
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
756 return NULL;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
757 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
758 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
759
1162
e3bb67b72d33 remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents: 1111
diff changeset
760 static size_t cx_arl_find_remove(
764
ccbdbd088455 add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents: 763
diff changeset
761 struct cx_list_s *list,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
762 const void *elem,
764
ccbdbd088455 add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents: 763
diff changeset
763 bool remove
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
764 ) {
1163
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
765 assert(list != NULL);
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
766 assert(list->collection.cmpfunc != NULL);
1163
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
767 if (list->collection.size == 0) return 0;
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
768 char *cur = ((const cx_array_list *) list)->data;
614
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
769
1163
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
770 // optimize with binary search, when sorted
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
771 if (list->collection.sorted) {
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
772 size_t i = cx_array_binary_search(
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
773 cur,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
774 list->collection.size,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
775 list->collection.elem_size,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
776 elem,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
777 list->collection.cmpfunc
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
778 );
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
779 if (remove && i < list->collection.size) {
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
780 cx_arl_remove(list, i, 1, NULL);
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
781 }
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
782 return i;
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
783 }
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
784
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
785 // fallback: linear search
1162
e3bb67b72d33 remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents: 1111
diff changeset
786 for (size_t i = 0; i < list->collection.size; i++) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
787 if (0 == list->collection.cmpfunc(elem, cur)) {
764
ccbdbd088455 add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents: 763
diff changeset
788 if (remove) {
1163
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
789 cx_arl_remove(list, i, 1, NULL);
764
ccbdbd088455 add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents: 763
diff changeset
790 }
1163
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
791 return i;
614
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
792 }
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
793 cur += list->collection.elem_size;
614
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
794 }
1162
e3bb67b72d33 remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents: 1111
diff changeset
795 return list->collection.size;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
796 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
797
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
798 static void cx_arl_sort(struct cx_list_s *list) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
799 assert(list->collection.cmpfunc != NULL);
615
b52b66dcd44b #219 array list: implement sort
Mike Becker <universe@uap-core.de>
parents: 614
diff changeset
800 qsort(((cx_array_list *) list)->data,
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
801 list->collection.size,
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
802 list->collection.elem_size,
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
803 list->collection.cmpfunc
615
b52b66dcd44b #219 array list: implement sort
Mike Becker <universe@uap-core.de>
parents: 614
diff changeset
804 );
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
805 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
806
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
807 static int cx_arl_compare(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
808 const struct cx_list_s *list,
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
809 const struct cx_list_s *other
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
810 ) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
811 assert(list->collection.cmpfunc != NULL);
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
812 if (list->collection.size == other->collection.size) {
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
813 const char *left = ((const cx_array_list *) list)->data;
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
814 const char *right = ((const cx_array_list *) other)->data;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
815 for (size_t i = 0; i < list->collection.size; i++) {
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
816 int d = list->collection.cmpfunc(left, right);
622
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
817 if (d != 0) {
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
818 return d;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
819 }
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
820 left += list->collection.elem_size;
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
821 right += other->collection.elem_size;
622
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
822 }
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
823 return 0;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
824 } else {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
825 return list->collection.size < other->collection.size ? -1 : 1;
622
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
826 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
827 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
828
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
829 static void cx_arl_reverse(struct cx_list_s *list) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
830 if (list->collection.size < 2) return;
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
831 void *data = ((const cx_array_list *) list)->data;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
832 size_t half = list->collection.size / 2;
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
833 for (size_t i = 0; i < half; i++) {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
834 cx_array_swap(data, list->collection.elem_size, i, list->collection.size - 1 - i);
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
835 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
836 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
837
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
838 static bool cx_arl_iter_valid(const void *it) {
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
839 const struct cx_iterator_s *iter = it;
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
840 const struct cx_list_s *list = iter->src_handle;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
841 return iter->index < list->collection.size;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
842 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
843
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
844 static void *cx_arl_iter_current(const void *it) {
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
845 const struct cx_iterator_s *iter = it;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
846 return iter->elem_handle;
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
847 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
848
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
849 static void cx_arl_iter_next(void *it) {
853
d4baf4dd55c3 simplify iterator structures
Mike Becker <universe@uap-core.de>
parents: 850
diff changeset
850 struct cx_iterator_s *iter = it;
854
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
851 if (iter->base.remove) {
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
852 iter->base.remove = false;
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
853 cx_arl_remove(iter->src_handle, iter->index, 1, NULL);
1387
9bdd053820b7 the elem_count member of an iterator was not updated after removing an element flagged by cxIteratorFlagRemoval() - fixes #728
Mike Becker <universe@uap-core.de>
parents: 1322
diff changeset
854 iter->elem_count--;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
855 } else {
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
856 iter->index++;
620
f220695aded6 #219 improve cx_arl_iter_next
Mike Becker <universe@uap-core.de>
parents: 619
diff changeset
857 iter->elem_handle =
f220695aded6 #219 improve cx_arl_iter_next
Mike Becker <universe@uap-core.de>
parents: 619
diff changeset
858 ((char *) iter->elem_handle)
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
859 + ((const struct cx_list_s *) iter->src_handle)->collection.elem_size;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
860 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
861 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
862
655
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
863 static void cx_arl_iter_prev(void *it) {
853
d4baf4dd55c3 simplify iterator structures
Mike Becker <universe@uap-core.de>
parents: 850
diff changeset
864 struct cx_iterator_s *iter = it;
854
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
865 if (iter->base.remove) {
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
866 iter->base.remove = false;
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
867 cx_arl_remove(iter->src_handle, iter->index, 1, NULL);
1387
9bdd053820b7 the elem_count member of an iterator was not updated after removing an element flagged by cxIteratorFlagRemoval() - fixes #728
Mike Becker <universe@uap-core.de>
parents: 1322
diff changeset
868 iter->elem_count--;
655
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
869 }
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
870 iter->index--;
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
871 cx_array_list *list = iter->src_handle;
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
872 if (iter->index < list->base.collection.size) {
655
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
873 iter->elem_handle = ((char *) list->data)
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
874 + iter->index * list->base.collection.elem_size;
655
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
875 }
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
876 }
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
877
1482
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
878 static int cx_arl_change_capacity(
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
879 struct cx_list_s *list,
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
880 size_t new_capacity
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
881 ) {
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
882 cx_array_list *arl = (cx_array_list *)list;
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
883 return cxReallocateArray(list->collection.allocator,
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
884 &arl->data, new_capacity, list->collection.elem_size);
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
885 }
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
886
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
887 static struct cx_iterator_s cx_arl_iterator(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
888 const struct cx_list_s *list,
655
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
889 size_t index,
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 654
diff changeset
890 bool backwards
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
891 ) {
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
892 struct cx_iterator_s iter;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
893
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
894 iter.index = index;
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
895 iter.src_handle = (void*)list;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
896 iter.elem_handle = cx_arl_at(list, index);
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
897 iter.elem_size = list->collection.elem_size;
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
898 iter.elem_count = list->collection.size;
854
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
899 iter.base.valid = cx_arl_iter_valid;
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
900 iter.base.current = cx_arl_iter_current;
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
901 iter.base.next = backwards ? cx_arl_iter_prev : cx_arl_iter_next;
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
902 iter.base.remove = false;
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1425
diff changeset
903 iter.base.allow_remove = true;
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
904
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
905 return iter;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
906 }
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
907
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
908 static cx_list_class cx_array_list_class = {
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
909 cx_arl_destructor,
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
910 cx_arl_insert_element,
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
911 cx_arl_insert_array,
881
1dbbf8c1c42f add optimized implementation of insert_sorted for array lists
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
912 cx_arl_insert_sorted,
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1387
diff changeset
913 cx_arl_insert_unique,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
914 cx_arl_insert_iter,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
915 cx_arl_remove,
664
af5bf4603a5d add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents: 662
diff changeset
916 cx_arl_clear,
653
2e6e9d9f2159 implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents: 643
diff changeset
917 cx_arl_swap,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
918 cx_arl_at,
764
ccbdbd088455 add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents: 763
diff changeset
919 cx_arl_find_remove,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
920 cx_arl_sort,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
921 cx_arl_compare,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
922 cx_arl_reverse,
1482
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1476
diff changeset
923 cx_arl_change_capacity,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
924 cx_arl_iterator,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
925 };
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
926
670
4ad8ea3aee49 allow NULL for allocator and comparator
Mike Becker <universe@uap-core.de>
parents: 667
diff changeset
927 CxList *cxArrayListCreate(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 889
diff changeset
928 const CxAllocator *allocator,
855
35bcb3216c0d fix inconsistent use of item_size and elem_size
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
929 size_t elem_size,
606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
930 size_t initial_capacity
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
931 ) {
670
4ad8ea3aee49 allow NULL for allocator and comparator
Mike Becker <universe@uap-core.de>
parents: 667
diff changeset
932 if (allocator == NULL) {
4ad8ea3aee49 allow NULL for allocator and comparator
Mike Becker <universe@uap-core.de>
parents: 667
diff changeset
933 allocator = cxDefaultAllocator;
4ad8ea3aee49 allow NULL for allocator and comparator
Mike Becker <universe@uap-core.de>
parents: 667
diff changeset
934 }
4ad8ea3aee49 allow NULL for allocator and comparator
Mike Becker <universe@uap-core.de>
parents: 667
diff changeset
935
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
936 cx_array_list *list = cxCalloc(allocator, 1, sizeof(cx_array_list));
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
937 if (list == NULL) return NULL;
1111
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1089
diff changeset
938 cx_list_init((CxList*)list, &cx_array_list_class,
1605
55b13f583356 refactor the list and map construction functions and remove the simple macros
Mike Becker <universe@uap-core.de>
parents: 1531
diff changeset
939 allocator, elem_size);
677
b09aae58bba4 refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents: 676
diff changeset
940 list->capacity = initial_capacity;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
941
855
35bcb3216c0d fix inconsistent use of item_size and elem_size
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
942 // allocate the array after the real elem_size is known
1111
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1089
diff changeset
943 list->data = cxCalloc(allocator, initial_capacity,
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1089
diff changeset
944 list->base.collection.elem_size);
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1047
diff changeset
945 if (list->data == NULL) { // LCOV_EXCL_START
676
d0680a23d850 fix initial storage allocation for array lists created with CX_STORE_POINTERS
Mike Becker <universe@uap-core.de>
parents: 670
diff changeset
946 cxFree(allocator, list);
d0680a23d850 fix initial storage allocation for array lists created with CX_STORE_POINTERS
Mike Becker <universe@uap-core.de>
parents: 670
diff changeset
947 return NULL;
1065
6eb7b54975ee improve coverage metrics
Mike Becker <universe@uap-core.de>
parents: 1047
diff changeset
948 } // LCOV_EXCL_STOP
676
d0680a23d850 fix initial storage allocation for array lists created with CX_STORE_POINTERS
Mike Becker <universe@uap-core.de>
parents: 670
diff changeset
949
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
950 return (CxList *) list;
606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
951 }

mercurial