src/list.c

Wed, 17 Dec 2025 19:05:50 +0100

author
Mike Becker <universe@uap-core.de>
date
Wed, 17 Dec 2025 19:05:50 +0100
changeset 1618
ef7cab6eb131
parent 1616
bdc04a8e0dd3
permissions
-rw-r--r--

huge refactoring of collections to add support for 3-arg compare functions

503
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved.
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 *
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 *
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 *
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 *
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
a89857072ace add new destructor API and apply it to CxList
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
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 */
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "cx/list.h"
a89857072ace add new destructor API and apply it to CxList
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30
640
55cc3b373c5e simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
31 #include <string.h>
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
32 #include <assert.h>
640
55cc3b373c5e simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
33
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
34 int cx_list_compare_wrapper(const void *l, const void *r, void *c) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
35 CxList *list = c;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
36 const void *left;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
37 const void *right;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
38 if (cxCollectionStoresPointers(list)) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
39 left = *(void**)l;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
40 right = *(void**)r;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
41 // for historic reasons, we are handling the NULL case here
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
42 // because every UCX compare function does not support NULL arguments
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
43 if (left == NULL) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
44 if (right == NULL) return 0;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
45 return -1;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
46 } else if (right == NULL) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
47 return 1;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
48 }
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
49 } else {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
50 left = l;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
51 right = r;
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
52 }
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
53 return cx_invoke_compare_func(list, left, right);
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
54 }
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
55
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
56 #define cx_list_compare_wrapper(l, r, c) cx_list_compare_wrapper(l, r, (void*)c)
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
57
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
58 // <editor-fold desc="empty list implementation">
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
59
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
60 static void cx_emptyl_noop(cx_attr_unused CxList *list) {
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
61 // this is a noop, but MUST be implemented
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
62 }
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
63
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
64 static void *cx_emptyl_at(
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
65 cx_attr_unused const struct cx_list_s *list,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
66 cx_attr_unused size_t index
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
67 ) {
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
68 return NULL;
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
69 }
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
70
1162
e3bb67b72d33 remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents: 1111
diff changeset
71 static size_t cx_emptyl_find_remove(
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
72 cx_attr_unused struct cx_list_s *list,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
73 cx_attr_unused const void *elem,
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
74 cx_attr_unused bool remove
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
75 ) {
1162
e3bb67b72d33 remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents: 1111
diff changeset
76 return 0;
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
77 }
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
78
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
79 static bool cx_emptyl_iter_valid(cx_attr_unused const void *iter) {
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
80 return false;
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
81 }
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
82
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
83 static CxIterator cx_emptyl_iterator(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
84 const struct cx_list_s *list,
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
85 size_t index,
985
68754c7de906 major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents: 919
diff changeset
86 cx_attr_unused bool backwards
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
87 ) {
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
88 CxIterator iter = {0};
1429
6e0c3a8a914a remove the concept of "mutating iterators" - resolves #579
Mike Becker <universe@uap-core.de>
parents: 1428
diff changeset
89 iter.src_handle = (void*) list;
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
90 iter.index = index;
854
fe0d69d72bcd fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents: 853
diff changeset
91 iter.base.valid = cx_emptyl_iter_valid;
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
92 return iter;
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
93 }
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
94
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
95 static cx_list_class cx_empty_list_class = {
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
96 cx_emptyl_noop,
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
97 NULL,
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
98 NULL,
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
99 NULL,
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
100 NULL,
876
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
101 NULL,
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
102 NULL,
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
103 cx_emptyl_noop,
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
104 NULL,
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
105 cx_emptyl_at,
764
ccbdbd088455 add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents: 708
diff changeset
106 cx_emptyl_find_remove,
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
107 cx_emptyl_noop,
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
108 NULL,
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
109 cx_emptyl_noop,
1482
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
110 NULL,
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
111 cx_emptyl_iterator,
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
112 };
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
113
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
114 CxList cx_empty_list = {
1163
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
115 {
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
116 NULL,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
117 0,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
118 0,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
119 NULL,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
120 NULL,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
121 NULL,
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
122 NULL,
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
123 NULL,
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
124 NULL,
1163
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
125 false,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
126 true,
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
127 },
68ff0839bc6a optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents: 1162
diff changeset
128 &cx_empty_list_class,
704
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
129 };
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
130
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
131 CxList *const cxEmptyList = &cx_empty_list;
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
132
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
133 // </editor-fold>
35f06c5eeb0e add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents: 699
diff changeset
134
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
135 size_t cx_list_default_insert_array(
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
136 struct cx_list_s *list,
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
137 size_t index,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
138 const void *data,
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
139 size_t n
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
140 ) {
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
141 const char *src = data;
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
142 size_t i = 0;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
143 for (; i < n; i++) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
144 if (NULL == list->cl->insert_element(list, index + i, src)
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
145 ) {
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
146 return i; // LCOV_EXCL_LINE
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
147 }
1433
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
148 if (src != NULL) {
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
149 src += list->collection.elem_size;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
150 }
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
151 }
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
152 return i;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
153 }
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
154
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
155 static size_t cx_list_default_insert_sorted_impl(
876
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
156 struct cx_list_s *list,
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
157 const void *sorted_data,
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
158 size_t n,
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
159 bool allow_duplicates
876
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
160 ) {
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
161 // corner case
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
162 if (n == 0) return 0;
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
163
876
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
164 size_t elem_size = list->collection.elem_size;
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
165 const char *src = sorted_data;
876
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
166
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
167 // track indices and number of inserted items
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
168 size_t di = 0, si = 0, processed = 0;
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
169
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
170 // search the list for insertion points
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
171 while (di < list->collection.size) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
172 const void *list_elm = list->cl->at(list, di);
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
173
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
174 // compare the current list element with the first source element
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
175 // if less, skip the list elements
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
176 // if equal, skip the list elements and optionally the source elements
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
177 {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
178 int d = cx_list_compare_wrapper(list_elm, src, list);
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
179 if (d <= 0) {
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
180 if (!allow_duplicates && d == 0) {
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
181 src += elem_size;
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
182 si++;
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
183 processed++; // we also count duplicates for the return value
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
184 while (si < n && cx_list_compare_wrapper(list_elm, src, list) == 0) {
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
185 src += elem_size;
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
186 si++;
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
187 processed++;
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
188 }
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
189 if (processed == n) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
190 return processed;
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
191 }
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
192 }
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
193 di++;
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
194 continue;
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
195 }
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
196 }
876
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
197
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
198 // determine the number of consecutive elements that can be inserted
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
199 size_t ins = 1, skip = 0;
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
200 const char *next = src;
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
201 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: 1422
diff changeset
202 if (!allow_duplicates) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
203 // skip duplicates within the source
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
204 if (cx_list_compare_wrapper(next, next + elem_size, list) == 0) {
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
205 next += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
206 skip++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
207 continue;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
208 } else {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
209 if (skip > 0) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
210 // if we had to skip something, we must wait for the next run
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
211 next += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
212 break;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
213 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
214 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
215 }
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
216 next += elem_size;
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
217 // once we become larger than the list elem, break
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
218 if (cx_list_compare_wrapper(list_elm, next, list) <= 0) {
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
219 break;
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
220 }
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
221 // otherwise, we can insert one more
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
222 ins++;
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
223 }
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
224
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
225 // insert the elements at location si
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
226 if (ins == 1) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
227 if (NULL == list->cl->insert_element(list, di, src)) {
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
228 return processed; // LCOV_EXCL_LINE
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
229 }
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
230 } else {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
231 size_t r = list->cl->insert_array(list, di, src, ins);
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
232 if (r < ins) {
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
233 return processed + r; // LCOV_EXCL_LINE
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
234 }
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
235 }
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
236 processed += ins + skip;
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
237 di += ins;
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
238
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
239 // everything inserted?
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
240 if (processed == n) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
241 return processed;
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
242 }
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
243 src = next;
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
244 }
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
245
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
246 // insert remaining items
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
247 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: 1422
diff changeset
248 if (allow_duplicates) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
249 processed += list->cl->insert_array(list, di, src, n - si);
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
250 } else {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
251 const void *last = di == 0 ? NULL : list->cl->at(list, di - 1);
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
252 for (; si < n; si++) {
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
253 // skip duplicates within the source
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
254 if (last == NULL || cx_list_compare_wrapper(last, src, list) != 0) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
255 if (NULL == list->cl->insert_element(list, di, src)) {
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
256 return processed; // LCOV_EXCL_LINE
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
257 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
258 last = src;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
259 di++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
260 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
261 processed++;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
262 src += elem_size;
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
263 }
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
264 }
877
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
265 }
608b14deea18 optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents: 876
diff changeset
266
1423
9a72258446cd fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents: 1422
diff changeset
267 return processed;
876
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
268 }
f4ce7df9cff0 add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents: 875
diff changeset
269
1419
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
270 size_t cx_list_default_insert_sorted(
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
271 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: 1345
diff changeset
272 const void *sorted_data,
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
273 size_t n
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
274 ) {
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
275 return cx_list_default_insert_sorted_impl(list, sorted_data, n, true);
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
276 }
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
277
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
278 size_t cx_list_default_insert_unique(
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
279 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: 1345
diff changeset
280 const void *sorted_data,
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
281 size_t n
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
282 ) {
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
283 return cx_list_default_insert_sorted_impl(list, sorted_data, n, false);
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
284 }
e46406fd1b3c add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents: 1345
diff changeset
285
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
286 // TODO: remove this hack once we have a solution for qsort() / qsort_s()
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
287 static _Thread_local CxList *cx_hack_for_qsort_list;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
288 static int cx_hack_cmp_for_qsort(const void *l, const void *r) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
289 return cx_list_compare_wrapper(l, r, cx_hack_for_qsort_list);
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
290 }
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
291
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
292 void cx_list_default_sort(struct cx_list_s *list) {
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
293 size_t elem_size = list->collection.elem_size;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
294 size_t list_size = list->collection.size;
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
295 void *tmp = cxMallocDefault(elem_size * list_size);
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
296 if (tmp == NULL) abort(); // LCOV_EXCL_LINE
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
297
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
298 // copy elements from source array
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
299 char *loc = tmp;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
300 for (size_t i = 0; i < list_size; i++) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
301 void *src = list->cl->at(list, i);
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
302 memcpy(loc, src, elem_size);
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
303 loc += elem_size;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
304 }
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
305
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
306 // qsort
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
307 // TODO: qsort_s() is not as nice as we thought
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
308 cx_hack_for_qsort_list = list;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
309 qsort(tmp, list_size, elem_size, cx_hack_cmp_for_qsort);
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
310
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
311 // copy elements back
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
312 loc = tmp;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
313 for (size_t i = 0; i < list_size; i++) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
314 void *dest = list->cl->at(list, i);
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
315 memcpy(dest, loc, elem_size);
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
316 loc += elem_size;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
317 }
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
318
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
319 cxFreeDefault(tmp);
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
320 }
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
321
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
322 int cx_list_default_swap(struct cx_list_s *list, size_t i, size_t j) {
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
323 if (i == j) return 0;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
324 if (i >= list->collection.size) return 1;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
325 if (j >= list->collection.size) return 1;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
326
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
327 size_t elem_size = list->collection.elem_size;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
328
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
329 void *tmp = cxMallocDefault(elem_size);
1422
8bfccb342895 changes the compare function wrapper for pointer lists so that it no longer invokes the actual compare function for NULL pointers
Mike Becker <universe@uap-core.de>
parents: 1419
diff changeset
330 if (tmp == NULL) return 1; // LCOV_EXCL_LINE
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
331
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
332 void *ip = list->cl->at(list, i);
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
333 void *jp = list->cl->at(list, j);
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
334
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
335 memcpy(tmp, ip, elem_size);
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
336 memcpy(ip, jp, elem_size);
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
337 memcpy(jp, tmp, elem_size);
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
338
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
339 cxFreeDefault(tmp);
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
340
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
341 return 0;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
342 }
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
343
1111
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
344 void cx_list_init(
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
345 struct cx_list_s *list,
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
346 struct cx_list_class_s *cl,
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
347 const struct cx_allocator_s *allocator,
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
348 size_t elem_size
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
349 ) {
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
350 list->cl = cl;
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
351 list->collection.allocator = allocator;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
352 list->collection.size = 0;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
353 list->collection.sorted = false; // should be set by the implementation
1111
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
354 if (elem_size > 0) {
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
355 list->collection.elem_size = elem_size;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
356 list->collection.simple_cmp = NULL;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
357 list->collection.advanced_cmp = cx_acmp_memcmp;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
358 list->collection.cmp_data = &list->collection.elem_size;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
359 list->collection.store_pointer = false;
1111
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
360 } else {
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
361 list->collection.elem_size = sizeof(void *);
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
362 list->collection.simple_cmp = cx_cmp_ptr;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
363 list->collection.advanced_cmp = NULL;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
364 list->collection.cmp_data = NULL;
1111
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
365 list->collection.store_pointer = true;
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
366 }
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
367 }
78eeeb950883 remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents: 1109
diff changeset
368
618
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
369 int cxListCompare(
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
370 const CxList *list,
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 877
diff changeset
371 const CxList *other
618
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
372 ) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
373 // check if we cannot use the list internal function
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
374 bool cannot_optimize = false;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
375
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
376 // if one is storing pointers but the other is not
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
377 cannot_optimize |= list->collection.store_pointer ^ other->collection.store_pointer;
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
378
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
379 // check if the lists are incompatible or this list does not implement compare
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
380 cx_compare_func list_cmp = (cx_compare_func) list->cl->compare;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
381 cx_compare_func other_cmp = (cx_compare_func) other->cl->compare;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
382 cannot_optimize |= list_cmp != other_cmp;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
383 cannot_optimize |= list_cmp == NULL;
705
0d5447230044 fix cxListCompare if-condition
Mike Becker <universe@uap-core.de>
parents: 704
diff changeset
384
875
ee84ac776cbc add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents: 856
diff changeset
385 if (cannot_optimize) {
680
19379743e5a0 fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents: 677
diff changeset
386 // lists are definitely different - cannot use internal compare function
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
387 if (list->collection.size == other->collection.size) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
388 CxIterator left = cxListIterator(list);
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
389 CxIterator right = cxListIterator(other);
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
390 for (size_t i = 0; i < list->collection.size; i++) {
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
391 void *leftValue = cxIteratorCurrent(left);
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
392 void *rightValue = cxIteratorCurrent(right);
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
393 // values are already unwrapped, invoke immediately
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
394 int d = cx_invoke_compare_func(list, leftValue, rightValue);
618
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
395 if (d != 0) {
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
396 return d;
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
397 }
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
398 cxIteratorNext(left);
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
399 cxIteratorNext(right);
618
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
400 }
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
401 return 0;
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
402 } else {
856
6bbbf219251d fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents: 855
diff changeset
403 return list->collection.size < other->collection.size ? -1 : 1;
618
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
404 }
680
19379743e5a0 fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents: 677
diff changeset
405 } else {
19379743e5a0 fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents: 677
diff changeset
406 // lists are compatible
19379743e5a0 fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents: 677
diff changeset
407 return list->cl->compare(list, other);
618
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
408 }
1f5a8f6f3015 #219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents: 528
diff changeset
409 }
640
55cc3b373c5e simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
410
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
411 size_t cxListSize(const CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
412 return list->collection.size;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
413 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
414
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
415 int cxListAdd(CxList *list, const void *elem) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
416 list->collection.sorted = false;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
417 return list->cl->insert_element(list, list->collection.size, cx_ref(list, elem)) == NULL;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
418 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
419
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
420 size_t cxListAddArray(CxList *list, const void *array, size_t n) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
421 list->collection.sorted = false;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
422 return list->cl->insert_array(list, list->collection.size, array, n);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
423 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
424
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
425 int cxListInsert(CxList *list, size_t index, const void *elem) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
426 list->collection.sorted = false;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
427 return list->cl->insert_element(list, index, cx_ref(list, elem)) == NULL;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
428 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
429
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
430 void *cxListEmplaceAt(CxList *list, size_t index) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
431 list->collection.sorted = false;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
432 return list->cl->insert_element(list, index, NULL);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
433 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
434
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
435 void *cxListEmplace(CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
436 list->collection.sorted = false;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
437 return list->cl->insert_element(list, list->collection.size, NULL);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
438 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
439
1433
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
440 static bool cx_list_emplace_iterator_valid(const void *it) {
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
441 const CxIterator *iter = it;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
442 return iter->index < iter->elem_count;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
443 }
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
444
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
445 CxIterator cxListEmplaceArrayAt(CxList *list, size_t index, size_t n) {
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
446 list->collection.sorted = false;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
447 size_t c = list->cl->insert_array(list, index, NULL, n);
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
448 CxIterator iter = list->cl->iterator(list, index, false);
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
449 // tweak the fields of this iterator
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
450 iter.elem_count = c;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
451 iter.index = 0;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
452 // replace the valid function to abort iteration when c is reached
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
453 iter.base.valid = cx_list_emplace_iterator_valid;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
454 return iter;
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
455 }
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
456
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
457 CxIterator cxListEmplaceArray(CxList *list, size_t n) {
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
458 return cxListEmplaceArrayAt(list, list->collection.size, n);
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
459 }
81c301a59b7c add cxListEmplaceArray() and cxListEmplaceArrayAt() as preparation for the clone implementation
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
460
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
461 int cxListInsertSorted(CxList *list, const void *elem) {
1428
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
462 assert(cxCollectionSorted(list));
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
463 list->collection.sorted = true;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
464 return list->cl->insert_sorted(list, cx_ref(list, elem), 1) == 0;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
465 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
466
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
467 int cxListInsertUnique(CxList *list, const void *elem) {
1428
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
468 if (cxCollectionSorted(list)) {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
469 list->collection.sorted = true;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
470 return list->cl->insert_unique(list, cx_ref(list, elem), 1) == 0;
1428
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
471 } else {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
472 if (cxListContains(list, elem)) {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
473 return 0;
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
474 } else {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
475 return cxListAdd(list, elem);
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
476 }
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
477 }
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
478 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
479
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
480 size_t cxListInsertArray(CxList *list, size_t index, const void *array, size_t n) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
481 list->collection.sorted = false;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
482 return list->cl->insert_array(list, index, array, n);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
483 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
484
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
485 size_t cxListInsertSortedArray(CxList *list, const void *array, size_t n) {
1428
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
486 assert(cxCollectionSorted(list));
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
487 list->collection.sorted = true;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
488 return list->cl->insert_sorted(list, array, n);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
489 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
490
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
491 size_t cxListInsertUniqueArray(CxList *list, const void *array, size_t n) {
1428
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
492 if (cxCollectionSorted(list)) {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
493 list->collection.sorted = true;
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
494 return list->cl->insert_unique(list, array, n);
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
495 } else {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
496 const char *source = array;
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
497 for (size_t i = 0 ; i < n; i++) {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
498 // note: this also checks elements added in a previous iteration
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
499 const void *data = cx_deref(list, source);
1428
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
500 if (!cxListContains(list, data)) {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
501 if (cxListAdd(list, data)) {
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
502 return i; // LCOV_EXCL_LINE
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
503 }
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
504 }
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
505 source += list->collection.elem_size;
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
506 }
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
507 return n;
0ac4aa1737fd add support for non-sorted lists in cxListInsertUnique() and cxListInsertUniqueArray()
Mike Becker <universe@uap-core.de>
parents: 1426
diff changeset
508 }
640
55cc3b373c5e simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
509 }
655
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 653
diff changeset
510
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
511 int cxListInsertAfter(CxIterator *iter, const void *elem) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
512 CxList* list = iter->src_handle;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
513 list->collection.sorted = false;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
514 return list->cl->insert_iter(iter, cx_ref(list, elem), 0);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
515 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
516
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
517 int cxListInsertBefore(CxIterator *iter, const void *elem) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
518 CxList* list = iter->src_handle;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
519 list->collection.sorted = false;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
520 return list->cl->insert_iter(iter, cx_ref(list, elem), 1);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
521 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
522
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
523 int cxListRemove(CxList *list, size_t index) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
524 return list->cl->remove(list, index, 1, NULL) == 0;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
525 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
526
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
527 int cxListRemoveAndGet(CxList *list, size_t index, void *targetbuf) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
528 return list->cl->remove(list, index, 1, targetbuf) == 0;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
529 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
530
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
531 int cxListRemoveAndGetFirst(CxList *list, void *targetbuf) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
532 return list->cl->remove(list, 0, 1, targetbuf) == 0;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
533 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
534
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
535 int cxListRemoveAndGetLast(CxList *list, void *targetbuf) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
536 // note: index may wrap - member function will catch that
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
537 return list->cl->remove(list, list->collection.size - 1, 1, targetbuf) == 0;
655
7340c4255f1f implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents: 653
diff changeset
538 }
1109
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
539
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
540 size_t cxListRemoveArray(CxList *list, size_t index, size_t num) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
541 return list->cl->remove(list, index, num, NULL);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
542 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
543
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
544 size_t cxListRemoveArrayAndGet(CxList *list, size_t index, size_t num, void *targetbuf) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
545 return list->cl->remove(list, index, num, targetbuf);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
546 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
547
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
548 void cxListClear(CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
549 list->cl->clear(list);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
550 list->collection.sorted = true; // empty lists are always sorted
1109
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1065
diff changeset
551 }
1287
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
552
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
553 int cxListSwap(CxList *list, size_t i, size_t j) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
554 list->collection.sorted = false;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
555 return list->cl->swap(list, i, j);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
556 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
557
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
558 void *cxListAt(const CxList *list, size_t index) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
559 void *result = list->cl->at(list, index);
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
560 if (result == NULL) return NULL;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
561 return cx_deref(list, result);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
562 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
563
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
564 void *cxListFirst(const CxList *list) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
565 return cxListAt(list, 0);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
566 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
567
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
568 void *cxListLast(const CxList *list) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
569 return cxListAt(list, list->collection.size - 1);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
570 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
571
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
572 int cxListSet(CxList *list, size_t index, const void *elem) {
1287
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
573 if (index >= list->collection.size) {
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
574 return 1;
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
575 }
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
576
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
577 if (list->collection.store_pointer) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
578 void **target = list->cl->at(list, index);
1287
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
579 *target = (void *)elem;
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
580 } else {
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
581 void *target = list->cl->at(list, index);
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
582 memcpy(target, elem, list->collection.elem_size);
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
583 }
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
584
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
585 return 0;
3a3ffc27813f adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents: 1163
diff changeset
586 }
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
587
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
588 static void *cx_pl_iter_current(const void *it) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
589 const struct cx_iterator_s *iter = it;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
590 void **ptr = iter->base.current_impl(it);
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
591 return ptr == NULL ? NULL : *ptr;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
592 }
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
593
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
594 CX_INLINE CxIterator cx_pl_iter_wrap(const CxList *list, CxIterator iter) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
595 if (cxCollectionStoresPointers(list)) {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
596 iter.base.current_impl = iter.base.current;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
597 iter.base.current = cx_pl_iter_current;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
598 return iter;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
599 } else {
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
600 return iter;
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
601 }
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
602 }
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
603
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
604 CxIterator cxListIteratorAt(const CxList *list, size_t index) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
605 if (list == NULL) list = cxEmptyList;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
606 return cx_pl_iter_wrap(list, list->cl->iterator(list, index, false));
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
607 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
608
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
609 CxIterator cxListBackwardsIteratorAt(const CxList *list, size_t index) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
610 if (list == NULL) list = cxEmptyList;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
611 return cx_pl_iter_wrap(list, list->cl->iterator(list, index, true));
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
612 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
613
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
614 CxIterator cxListIterator(const CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
615 if (list == NULL) list = cxEmptyList;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
616 return cx_pl_iter_wrap(list, list->cl->iterator(list, 0, false));
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
617 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
618
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
619 CxIterator cxListBackwardsIterator(const CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
620 if (list == NULL) list = cxEmptyList;
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
621 return cx_pl_iter_wrap(list, list->cl->iterator(list, list->collection.size - 1, true));
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
622 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
623
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
624 size_t cxListFind(const CxList *list, const void *elem) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
625 return list->cl->find_remove((CxList*)list, cx_ref(list, elem), false);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
626 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
627
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
628 bool cxListContains(const CxList* list, const void* elem) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
629 return list->cl->find_remove((CxList*)list, cx_ref(list, elem), false) < list->collection.size;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
630 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
631
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
632 bool cxListIndexValid(const CxList *list, size_t index) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
633 return index < list->collection.size;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
634 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
635
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
636 size_t cxListFindRemove(CxList *list, const void *elem) {
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
637 return list->cl->find_remove(list, cx_ref(list, elem), true);
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
638 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
639
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
640 void cxListSort(CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
641 if (list->collection.sorted) return;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
642 list->cl->sort(list);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
643 list->collection.sorted = true;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
644 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
645
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
646 void cxListReverse(CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
647 // still sorted, but not according to the cmp_func
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
648 list->collection.sorted = false;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
649 list->cl->reverse(list);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
650 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
651
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
652 void cxListFree(CxList *list) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
653 if (list == NULL) return;
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
654 list->cl->deallocate(list);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1423
diff changeset
655 }
1436
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
656
1453
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
657 static void cx_list_pop_uninitialized_elements(CxList *list, size_t n) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
658 cx_destructor_func destr_bak = list->collection.simple_destructor;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
659 cx_destructor_func2 destr2_bak = list->collection.advanced_destructor;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
660 list->collection.simple_destructor = NULL;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
661 list->collection.advanced_destructor = NULL;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
662 if (n == 1) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
663 cxListRemove(list, list->collection.size - 1);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
664 } else {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
665 cxListRemoveArray(list,list->collection.size - n, n);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
666 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
667 list->collection.simple_destructor = destr_bak;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
668 list->collection.advanced_destructor = destr2_bak;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
669 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
670
1616
bdc04a8e0dd3 update names of internal simple_clone funcs to shallow_clone funcs - relates to #780
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
671 static void* cx_list_shallow_clone_func(void *dst, const void *src, const CxAllocator *al, void *data) {
1479
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
672 size_t elem_size = *(size_t*)data;
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
673 if (dst == NULL) dst = cxMalloc(al, elem_size);
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
674 if (dst != NULL) memcpy(dst, src, elem_size);
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
675 return dst;
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
676 }
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
677
1616
bdc04a8e0dd3 update names of internal simple_clone funcs to shallow_clone funcs - relates to #780
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
678 #define use_shallow_clone_func(list) cx_list_shallow_clone_func, NULL, (void*)&((list)->collection.elem_size)
1479
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
679
1444
dd9dcbb39c2f make clone functions return int instead of size_t
Mike Becker <universe@uap-core.de>
parents: 1436
diff changeset
680 int cxListClone(CxList *dst, const CxList *src, cx_clone_func clone_func,
1446
5732947cbcc2 default NULL allocator to cxDefaultAllocator
Mike Becker <universe@uap-core.de>
parents: 1444
diff changeset
681 const CxAllocator *clone_allocator, void *data) {
5732947cbcc2 default NULL allocator to cxDefaultAllocator
Mike Becker <universe@uap-core.de>
parents: 1444
diff changeset
682 if (clone_allocator == NULL) clone_allocator = cxDefaultAllocator;
1436
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
683
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
684 // remember the original size
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
685 size_t orig_size = dst->collection.size;
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
686
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
687 // first, try to allocate the memory in the new list
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
688 CxIterator empl_iter = cxListEmplaceArray(dst, src->collection.size);
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
689
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
690 // get an iterator over the source elements
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
691 CxIterator src_iter = cxListIterator(src);
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
692
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
693 // now clone the elements
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
694 size_t cloned = empl_iter.elem_count;
1449
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
695 for (size_t i = 0 ; i < empl_iter.elem_count; i++) {
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
696 void *src_elem = cxIteratorCurrent(src_iter);
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
697 void **dest_memory = cxIteratorCurrent(empl_iter);
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
698 void *target = cxCollectionStoresPointers(dst) ? NULL : dest_memory;
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
699 void *dest_ptr = clone_func(target, src_elem, clone_allocator, data);
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
700 if (dest_ptr == NULL) {
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
701 cloned = i;
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
702 break;
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
703 }
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
704 if (cxCollectionStoresPointers(dst)) {
1436
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
705 *dest_memory = dest_ptr;
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
706 }
1449
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
707 cxIteratorNext(src_iter);
bbca398783ed simplify clone implementations
Mike Becker <universe@uap-core.de>
parents: 1446
diff changeset
708 cxIteratorNext(empl_iter);
1436
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
709 }
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
710
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
711 // if we could not clone everything, free the allocated memory
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
712 // (disable the destructors!)
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
713 if (cloned < src->collection.size) {
1453
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
714 cx_list_pop_uninitialized_elements(dst,
1436
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
715 dst->collection.size - cloned - orig_size);
1444
dd9dcbb39c2f make clone functions return int instead of size_t
Mike Becker <universe@uap-core.de>
parents: 1436
diff changeset
716 return 1;
1436
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
717 }
c331add0d9f8 add cxListClone() - resolves #744 except for test coverage
Mike Becker <universe@uap-core.de>
parents: 1433
diff changeset
718
1480
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
719 // set the sorted flag when we know it's sorted
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
720 if (orig_size == 0 && src->collection.sorted) {
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
721 dst->collection.sorted = true;
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
722 }
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
723
1444
dd9dcbb39c2f make clone functions return int instead of size_t
Mike Becker <universe@uap-core.de>
parents: 1436
diff changeset
724 return 0;
1446
5732947cbcc2 default NULL allocator to cxDefaultAllocator
Mike Becker <universe@uap-core.de>
parents: 1444
diff changeset
725 }
1453
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
726
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
727 int cxListDifference(CxList *dst,
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
728 const CxList *minuend, const CxList *subtrahend,
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
729 cx_clone_func clone_func, const CxAllocator *clone_allocator, void *data) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
730 if (clone_allocator == NULL) clone_allocator = cxDefaultAllocator;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
731
1466
a58c65d31342 difference shall not check already present items in the destination - fixes #753
Mike Becker <universe@uap-core.de>
parents: 1463
diff changeset
732 // optimize for sorted collections
1453
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
733 if (cxCollectionSorted(minuend) && cxCollectionSorted(subtrahend)) {
1454
808688e304d5 cxListDifference() sets the sorted flag if it can guarantee that
Mike Becker <universe@uap-core.de>
parents: 1453
diff changeset
734 bool dst_was_empty = cxCollectionSize(dst) == 0;
808688e304d5 cxListDifference() sets the sorted flag if it can guarantee that
Mike Becker <universe@uap-core.de>
parents: 1453
diff changeset
735
1453
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
736 CxIterator min_iter = cxListIterator(minuend);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
737 CxIterator sub_iter = cxListIterator(subtrahend);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
738 while (cxIteratorValid(min_iter)) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
739 void *min_elem = cxIteratorCurrent(min_iter);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
740 void *sub_elem;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
741 int d;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
742 if (cxIteratorValid(sub_iter)) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
743 sub_elem = cxIteratorCurrent(sub_iter);
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
744 d = cx_list_compare_wrapper(sub_elem, min_elem, subtrahend);
1453
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
745 } else {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
746 // no more elements in the subtrahend,
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
747 // i.e., the min_elem is larger than any elem of the subtrahend
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
748 d = 1;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
749 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
750 if (d == 0) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
751 // is contained, so skip it
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
752 cxIteratorNext(min_iter);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
753 } else if (d < 0) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
754 // subtrahend is smaller than minuend,
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
755 // check the next element
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
756 cxIteratorNext(sub_iter);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
757 } else {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
758 // subtrahend is larger than the dst element,
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
759 // clone the minuend and advance
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
760 void **dst_mem = cxListEmplace(dst);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
761 void *target = cxCollectionStoresPointers(dst) ? NULL : dst_mem;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
762 void* dst_ptr = clone_func(target, min_elem, clone_allocator, data);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
763 if (dst_ptr == NULL) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
764 cx_list_pop_uninitialized_elements(dst, 1);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
765 return 1;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
766 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
767 if (cxCollectionStoresPointers(dst)) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
768 *dst_mem = dst_ptr;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
769 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
770 cxIteratorNext(min_iter);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
771 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
772 }
1454
808688e304d5 cxListDifference() sets the sorted flag if it can guarantee that
Mike Becker <universe@uap-core.de>
parents: 1453
diff changeset
773
808688e304d5 cxListDifference() sets the sorted flag if it can guarantee that
Mike Becker <universe@uap-core.de>
parents: 1453
diff changeset
774 // if dst was empty, it is now guaranteed to be sorted
808688e304d5 cxListDifference() sets the sorted flag if it can guarantee that
Mike Becker <universe@uap-core.de>
parents: 1453
diff changeset
775 dst->collection.sorted = dst_was_empty;
1453
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
776 } else {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
777 CxIterator min_iter = cxListIterator(minuend);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
778 cx_foreach(void *, elem, min_iter) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
779 if (cxListContains(subtrahend, elem)) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
780 continue;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
781 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
782 void **dst_mem = cxListEmplace(dst);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
783 void *target = cxCollectionStoresPointers(dst) ? NULL : dst_mem;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
784 void* dst_ptr = clone_func(target, elem, clone_allocator, data);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
785 if (dst_ptr == NULL) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
786 cx_list_pop_uninitialized_elements(dst, 1);
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
787 return 1;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
788 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
789 if (cxCollectionStoresPointers(dst)) {
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
790 *dst_mem = dst_ptr;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
791 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
792 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
793 }
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
794
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
795 return 0;
b6fc5b1d5c5d add implementation for cxListDifference() - issue #745
Mike Becker <universe@uap-core.de>
parents: 1449
diff changeset
796 }
1469
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
797
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
798 int cxListIntersection(CxList *dst,
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
799 const CxList *src, const CxList *other,
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
800 cx_clone_func clone_func, const CxAllocator *clone_allocator, void *data) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
801 if (clone_allocator == NULL) clone_allocator = cxDefaultAllocator;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
802
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
803 // optimize for sorted collections
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
804 if (cxCollectionSorted(src) && cxCollectionSorted(other)) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
805 bool dst_was_empty = cxCollectionSize(dst) == 0;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
806
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
807 CxIterator src_iter = cxListIterator(src);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
808 CxIterator other_iter = cxListIterator(other);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
809 while (cxIteratorValid(src_iter) && cxIteratorValid(other_iter)) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
810 void *src_elem = cxIteratorCurrent(src_iter);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
811 void *other_elem = cxIteratorCurrent(other_iter);
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
812 int d = cx_list_compare_wrapper(src_elem, other_elem, src);
1469
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
813 if (d == 0) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
814 // is contained, clone it
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
815 void **dst_mem = cxListEmplace(dst);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
816 void *target = cxCollectionStoresPointers(dst) ? NULL : dst_mem;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
817 void* dst_ptr = clone_func(target, src_elem, clone_allocator, data);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
818 if (dst_ptr == NULL) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
819 cx_list_pop_uninitialized_elements(dst, 1);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
820 return 1;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
821 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
822 if (cxCollectionStoresPointers(dst)) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
823 *dst_mem = dst_ptr;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
824 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
825 cxIteratorNext(src_iter);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
826 } else if (d < 0) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
827 // the other element is larger, skip the source element
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
828 cxIteratorNext(src_iter);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
829 } else {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
830 // the source element is larger, try to find it in the other list
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
831 cxIteratorNext(other_iter);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
832 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
833 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
834
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
835 // if dst was empty, it is now guaranteed to be sorted
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
836 dst->collection.sorted = dst_was_empty;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
837 } else {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
838 CxIterator src_iter = cxListIterator(src);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
839 cx_foreach(void *, elem, src_iter) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
840 if (!cxListContains(other, elem)) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
841 continue;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
842 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
843 void **dst_mem = cxListEmplace(dst);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
844 void *target = cxCollectionStoresPointers(dst) ? NULL : dst_mem;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
845 void* dst_ptr = clone_func(target, elem, clone_allocator, data);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
846 if (dst_ptr == NULL) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
847 cx_list_pop_uninitialized_elements(dst, 1);
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
848 return 1;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
849 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
850 if (cxCollectionStoresPointers(dst)) {
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
851 *dst_mem = dst_ptr;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
852 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
853 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
854 }
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
855
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
856 return 0;
9b2b40a3c9f0 implement cxListIntersection() - resolves #554
Mike Becker <universe@uap-core.de>
parents: 1466
diff changeset
857 }
1477
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
858
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
859 int cxListUnion(CxList *dst,
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
860 const CxList *src, const CxList *other,
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
861 cx_clone_func clone_func, const CxAllocator *clone_allocator, void *data) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
862 if (clone_allocator == NULL) clone_allocator = cxDefaultAllocator;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
863
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
864 // optimize for sorted collections
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
865 if (cxCollectionSorted(src) && cxCollectionSorted(other)) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
866 bool dst_was_empty = cxCollectionSize(dst) == 0;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
867
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
868 CxIterator src_iter = cxListIterator(src);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
869 CxIterator other_iter = cxListIterator(other);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
870 while (cxIteratorValid(src_iter) || cxIteratorValid(other_iter)) {
1497
cd53fb8703c1 fix MSVC compilation error
Mike Becker <universe@uap-core.de>
parents: 1487
diff changeset
871 void *src_elem = NULL, *other_elem = NULL;
1477
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
872 int d;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
873 if (!cxIteratorValid(src_iter)) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
874 other_elem = cxIteratorCurrent(other_iter);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
875 d = 1;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
876 } else if (!cxIteratorValid(other_iter)) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
877 src_elem = cxIteratorCurrent(src_iter);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
878 d = -1;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
879 } else {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
880 src_elem = cxIteratorCurrent(src_iter);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
881 other_elem = cxIteratorCurrent(other_iter);
1618
ef7cab6eb131 huge refactoring of collections to add support for 3-arg compare functions
Mike Becker <universe@uap-core.de>
parents: 1616
diff changeset
882 d = cx_list_compare_wrapper(src_elem, other_elem, src);
1477
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
883 }
1480
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
884 void *clone_from;
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
885 if (d < 0) {
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
886 // source element is smaller clone it
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
887 clone_from = src_elem;
1477
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
888 cxIteratorNext(src_iter);
1480
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
889 } else if (d == 0) {
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
890 // both elements are equal, clone from the source, skip other
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
891 clone_from = src_elem;
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
892 cxIteratorNext(src_iter);
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
893 cxIteratorNext(other_iter);
1477
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
894 } else {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
895 // the other element is smaller, clone it
1480
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
896 clone_from = other_elem;
1477
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
897 cxIteratorNext(other_iter);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
898 }
1480
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
899 void **dst_mem = cxListEmplace(dst);
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
900 void *target = cxCollectionStoresPointers(dst) ? NULL : dst_mem;
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
901 void* dst_ptr = clone_func(target, clone_from, clone_allocator, data);
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
902 if (dst_ptr == NULL) {
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
903 cx_list_pop_uninitialized_elements(dst, 1);
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
904 return 1;
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
905 }
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
906 if (cxCollectionStoresPointers(dst)) {
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
907 *dst_mem = dst_ptr;
83146195a1db add tests for simple clone functions
Mike Becker <universe@uap-core.de>
parents: 1479
diff changeset
908 }
1477
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
909 }
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
910
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
911 // if dst was empty, it is now guaranteed to be sorted
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
912 dst->collection.sorted = dst_was_empty;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
913 } else {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
914 if (cxListClone(dst, src, clone_func, clone_allocator, data)) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
915 return 1;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
916 }
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
917 CxIterator other_iter = cxListIterator(other);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
918 cx_foreach(void *, elem, other_iter) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
919 if (cxListContains(src, elem)) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
920 continue;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
921 }
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
922 void **dst_mem = cxListEmplace(dst);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
923 void *target = cxCollectionStoresPointers(dst) ? NULL : dst_mem;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
924 void* dst_ptr = clone_func(target, elem, clone_allocator, data);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
925 if (dst_ptr == NULL) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
926 cx_list_pop_uninitialized_elements(dst, 1);
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
927 return 1;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
928 }
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
929 if (cxCollectionStoresPointers(dst)) {
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
930 *dst_mem = dst_ptr;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
931 }
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
932 }
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
933 }
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
934
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
935 return 0;
9170a7dff573 implement cxListUnion() - resolves #755
Mike Becker <universe@uap-core.de>
parents: 1469
diff changeset
936 }
1479
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
937
1604
68b75c091028 rename the "simple" cloning functions from Simple to Shallow
Mike Becker <universe@uap-core.de>
parents: 1497
diff changeset
938 int cxListCloneShallow(CxList *dst, const CxList *src) {
1616
bdc04a8e0dd3 update names of internal simple_clone funcs to shallow_clone funcs - relates to #780
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
939 return cxListClone(dst, src, use_shallow_clone_func(src));
1479
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
940 }
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
941
1604
68b75c091028 rename the "simple" cloning functions from Simple to Shallow
Mike Becker <universe@uap-core.de>
parents: 1497
diff changeset
942 int cxListDifferenceShallow(CxList *dst, const CxList *minuend, const CxList *subtrahend) {
1616
bdc04a8e0dd3 update names of internal simple_clone funcs to shallow_clone funcs - relates to #780
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
943 return cxListDifference(dst, minuend, subtrahend, use_shallow_clone_func(minuend));
1479
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
944 }
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
945
1604
68b75c091028 rename the "simple" cloning functions from Simple to Shallow
Mike Becker <universe@uap-core.de>
parents: 1497
diff changeset
946 int cxListIntersectionShallow(CxList *dst, const CxList *src, const CxList *other) {
1616
bdc04a8e0dd3 update names of internal simple_clone funcs to shallow_clone funcs - relates to #780
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
947 return cxListIntersection(dst, src, other, use_shallow_clone_func(src));
1479
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
948 }
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
949
1604
68b75c091028 rename the "simple" cloning functions from Simple to Shallow
Mike Becker <universe@uap-core.de>
parents: 1497
diff changeset
950 int cxListUnionShallow(CxList *dst, const CxList *src, const CxList *other) {
1616
bdc04a8e0dd3 update names of internal simple_clone funcs to shallow_clone funcs - relates to #780
Mike Becker <universe@uap-core.de>
parents: 1605
diff changeset
951 return cxListUnion(dst, src, other, use_shallow_clone_func(src));
1479
ac1baaed2fd7 implement simple versions of the clone functions
Mike Becker <universe@uap-core.de>
parents: 1477
diff changeset
952 }
1482
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
953
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
954 int cxListReserve(CxList *list, size_t capacity) {
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
955 if (list->cl->change_capacity == NULL) {
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
956 return 0;
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
957 }
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
958 if (capacity <= cxCollectionSize(list)) {
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
959 return 0;
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
960 }
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
961 return list->cl->change_capacity(list, capacity);
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
962 }
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
963
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
964 int cxListShrink(CxList *list) {
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
965 if (list->cl->change_capacity == NULL) {
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
966 return 0;
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
967 }
6769cb72521b implement a new allocation strategy for array lists and add cxListReserve() and cxListShrink()
Mike Becker <universe@uap-core.de>
parents: 1480
diff changeset
968 return list->cl->change_capacity(list, cxCollectionSize(list));
1487
0ff535033b78 fix missing newline at end of list.c (-Wnewline-eof complains about that)
Mike Becker <universe@uap-core.de>
parents: 1485
diff changeset
969 }

mercurial