Sat, 11 Oct 2025 15:42:48 +0200
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
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> |
55cc3b373c5e
simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents:
630
diff
changeset
|
32 | |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
33 | // <editor-fold desc="Store Pointers Functionality"> |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
34 | |
677
b09aae58bba4
refactoring of collections to make use of destructors in map implementations
Mike Becker <universe@uap-core.de>
parents:
666
diff
changeset
|
35 | static _Thread_local cx_compare_func cx_pl_cmpfunc_impl; |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
36 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
37 | static int cx_pl_cmpfunc( |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
38 | const void *l, |
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
39 | const void *r |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
40 | ) { |
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
|
41 | // l and r are guaranteed to be non-NULL pointing to the list's memory |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
42 | void *const *lptr = l; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
43 | void *const *rptr = 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
|
44 | const void *left = *lptr; |
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
|
45 | const void *right = *rptr; |
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
|
46 | if (left == NULL) { |
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
|
47 | // NULL is smaller than any value except NULL |
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
|
48 | return right == NULL ? 0 : -1; |
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
|
49 | } else if (right == NULL) { |
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
|
50 | // any value is larger than NULL |
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
|
51 | return 1; |
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 | } |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
53 | return cx_pl_cmpfunc_impl(left, right); |
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 | |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
56 | static void cx_pl_hack_cmpfunc(const struct cx_list_s *list) { |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
57 | // cast away const - this is the hacky thing |
856
6bbbf219251d
fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents:
855
diff
changeset
|
58 | struct cx_collection_s *l = (struct cx_collection_s*) &list->collection; |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
59 | cx_pl_cmpfunc_impl = l->cmpfunc; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
60 | l->cmpfunc = cx_pl_cmpfunc; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
61 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
62 | |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
63 | static void cx_pl_unhack_cmpfunc(const struct cx_list_s *list) { |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
64 | // cast away const - this is the hacky thing |
856
6bbbf219251d
fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents:
855
diff
changeset
|
65 | struct cx_collection_s *l = (struct cx_collection_s*) &list->collection; |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
66 | l->cmpfunc = cx_pl_cmpfunc_impl; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
67 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
68 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
69 | static void cx_pl_destructor(struct cx_list_s *list) { |
993
b642eca4b956
make names of destroy and free functions consistent - fixes #484
Mike Becker <universe@uap-core.de>
parents:
985
diff
changeset
|
70 | list->climpl->deallocate(list); |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
71 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
72 | |
1316
c41538edfcef
add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents:
1287
diff
changeset
|
73 | static void *cx_pl_insert_element( |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
74 | struct cx_list_s *list, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
75 | size_t index, |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
76 | const void *element |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
77 | ) { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
78 | return list->climpl->insert_element(list, index, &element); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
79 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
80 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
81 | static size_t cx_pl_insert_array( |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
82 | struct cx_list_s *list, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
83 | size_t index, |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
84 | const void *array, |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
85 | size_t n |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
86 | ) { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
87 | return list->climpl->insert_array(list, index, array, n); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
88 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
89 | |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
90 | static size_t cx_pl_insert_sorted( |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
91 | 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
|
92 | const void *array, |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
93 | size_t n |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
94 | ) { |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
95 | cx_pl_hack_cmpfunc(list); |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
96 | size_t result = list->climpl->insert_sorted(list, array, n); |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
97 | cx_pl_unhack_cmpfunc(list); |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
98 | return result; |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
99 | } |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
100 | |
1419
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
101 | static size_t cx_pl_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
|
102 | 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
|
103 | const void *array, |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
104 | 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
|
105 | ) { |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
106 | cx_pl_hack_cmpfunc(list); |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
107 | size_t result = list->climpl->insert_unique(list, array, n); |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
108 | cx_pl_unhack_cmpfunc(list); |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
109 | return result; |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
110 | } |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
111 | |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
112 | static int cx_pl_insert_iter( |
853
d4baf4dd55c3
simplify iterator structures
Mike Becker <universe@uap-core.de>
parents:
802
diff
changeset
|
113 | struct cx_iterator_s *iter, |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
114 | const void *elem, |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
115 | int prepend |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
116 | ) { |
853
d4baf4dd55c3
simplify iterator structures
Mike Becker <universe@uap-core.de>
parents:
802
diff
changeset
|
117 | struct cx_list_s *list = iter->src_handle.m; |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
118 | return list->climpl->insert_iter(iter, &elem, prepend); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
119 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
120 | |
919
75da57d4634e
add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents:
890
diff
changeset
|
121 | static size_t cx_pl_remove( |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
122 | struct cx_list_s *list, |
919
75da57d4634e
add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents:
890
diff
changeset
|
123 | size_t index, |
75da57d4634e
add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents:
890
diff
changeset
|
124 | size_t num, |
75da57d4634e
add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents:
890
diff
changeset
|
125 | void *targetbuf |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
126 | ) { |
919
75da57d4634e
add possibility to remove arrays of data and retrieve removed data
Mike Becker <universe@uap-core.de>
parents:
890
diff
changeset
|
127 | return list->climpl->remove(list, index, num, targetbuf); |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
128 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
129 | |
664
af5bf4603a5d
add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents:
655
diff
changeset
|
130 | static void cx_pl_clear(struct cx_list_s *list) { |
af5bf4603a5d
add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents:
655
diff
changeset
|
131 | list->climpl->clear(list); |
af5bf4603a5d
add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents:
655
diff
changeset
|
132 | } |
af5bf4603a5d
add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents:
655
diff
changeset
|
133 | |
647
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
134 | static int cx_pl_swap( |
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
135 | struct cx_list_s *list, |
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
136 | size_t i, |
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
137 | size_t j |
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
138 | ) { |
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
139 | return list->climpl->swap(list, i, j); |
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
140 | } |
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
141 | |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
142 | static void *cx_pl_at( |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
143 | const struct cx_list_s *list, |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
144 | size_t index |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
145 | ) { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
146 | void **ptr = list->climpl->at(list, index); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
147 | return ptr == NULL ? NULL : *ptr; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
148 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
149 | |
1162
e3bb67b72d33
remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents:
1111
diff
changeset
|
150 | static size_t cx_pl_find_remove( |
764
ccbdbd088455
add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents:
708
diff
changeset
|
151 | 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
|
152 | const void *elem, |
764
ccbdbd088455
add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents:
708
diff
changeset
|
153 | bool remove |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
154 | ) { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
155 | cx_pl_hack_cmpfunc(list); |
1162
e3bb67b72d33
remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents:
1111
diff
changeset
|
156 | size_t ret = list->climpl->find_remove(list, &elem, remove); |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
157 | cx_pl_unhack_cmpfunc(list); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
158 | return ret; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
159 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
160 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
161 | static void cx_pl_sort(struct cx_list_s *list) { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
162 | cx_pl_hack_cmpfunc(list); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
163 | list->climpl->sort(list); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
164 | cx_pl_unhack_cmpfunc(list); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
165 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
166 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
167 | static int cx_pl_compare( |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
168 | const struct cx_list_s *list, |
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
169 | const struct cx_list_s *other |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
170 | ) { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
171 | cx_pl_hack_cmpfunc(list); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
172 | int ret = list->climpl->compare(list, other); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
173 | cx_pl_unhack_cmpfunc(list); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
174 | return ret; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
175 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
176 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
177 | static void cx_pl_reverse(struct cx_list_s *list) { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
178 | list->climpl->reverse(list); |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
179 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
180 | |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
181 | static void *cx_pl_iter_current(const void *it) { |
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
182 | const struct cx_iterator_s *iter = it; |
854
fe0d69d72bcd
fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents:
853
diff
changeset
|
183 | void **ptr = iter->base.current_impl(it); |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
184 | return ptr == NULL ? NULL : *ptr; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
185 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
186 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
187 | static struct cx_iterator_s cx_pl_iterator( |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
188 | const struct cx_list_s *list, |
655
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
189 | size_t index, |
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
190 | bool backwards |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
191 | ) { |
655
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
192 | struct cx_iterator_s iter = list->climpl->iterator(list, index, backwards); |
854
fe0d69d72bcd
fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents:
853
diff
changeset
|
193 | iter.base.current_impl = iter.base.current; |
fe0d69d72bcd
fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents:
853
diff
changeset
|
194 | iter.base.current = cx_pl_iter_current; |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
195 | return iter; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
196 | } |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
197 | |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
198 | static cx_list_class cx_pointer_list_class = { |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
199 | cx_pl_destructor, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
200 | cx_pl_insert_element, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
201 | cx_pl_insert_array, |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
202 | cx_pl_insert_sorted, |
1419
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
203 | cx_pl_insert_unique, |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
204 | cx_pl_insert_iter, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
205 | cx_pl_remove, |
664
af5bf4603a5d
add cxListClear and fix missing destructor invocations - #241 #246
Mike Becker <universe@uap-core.de>
parents:
655
diff
changeset
|
206 | cx_pl_clear, |
647
2e6e9d9f2159
implement swap function for list elements - fixes #218
Mike Becker <universe@uap-core.de>
parents:
641
diff
changeset
|
207 | cx_pl_swap, |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
208 | cx_pl_at, |
764
ccbdbd088455
add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents:
708
diff
changeset
|
209 | cx_pl_find_remove, |
641
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
210 | cx_pl_sort, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
211 | cx_pl_compare, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
212 | cx_pl_reverse, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
213 | cx_pl_iterator, |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
214 | }; |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
215 | // </editor-fold> |
d402fead3386
add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents:
640
diff
changeset
|
216 | |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
217 | // <editor-fold desc="empty list implementation"> |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
218 | |
985
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
219 | 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
|
220 | // 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
|
221 | } |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
222 | |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
223 | static void *cx_emptyl_at( |
985
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
224 | cx_attr_unused const struct cx_list_s *list, |
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
225 | cx_attr_unused size_t index |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
226 | ) { |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
227 | return NULL; |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
228 | } |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
229 | |
1162
e3bb67b72d33
remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents:
1111
diff
changeset
|
230 | static size_t cx_emptyl_find_remove( |
985
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
231 | cx_attr_unused struct cx_list_s *list, |
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
232 | cx_attr_unused const void *elem, |
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
233 | cx_attr_unused bool remove |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
234 | ) { |
1162
e3bb67b72d33
remove dependency to ssize_t - fixes #552
Mike Becker <universe@uap-core.de>
parents:
1111
diff
changeset
|
235 | return 0; |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
236 | } |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
237 | |
985
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
238 | 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
|
239 | return false; |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
240 | } |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
241 | |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
242 | 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
|
243 | const struct cx_list_s *list, |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
244 | size_t index, |
985
68754c7de906
major refactoring of attributes
Mike Becker <universe@uap-core.de>
parents:
919
diff
changeset
|
245 | cx_attr_unused bool backwards |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
246 | ) { |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
247 | CxIterator iter = {0}; |
853
d4baf4dd55c3
simplify iterator structures
Mike Becker <universe@uap-core.de>
parents:
802
diff
changeset
|
248 | iter.src_handle.c = list; |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
249 | 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
|
250 | 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
|
251 | return iter; |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
252 | } |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
253 | |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
254 | 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
|
255 | cx_emptyl_noop, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
256 | NULL, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
257 | NULL, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
258 | NULL, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
259 | NULL, |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
260 | 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
|
261 | NULL, |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
262 | cx_emptyl_noop, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
263 | NULL, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
264 | cx_emptyl_at, |
764
ccbdbd088455
add cxListFindRemove and cx_linked_list_find_node
Mike Becker <universe@uap-core.de>
parents:
708
diff
changeset
|
265 | cx_emptyl_find_remove, |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
266 | cx_emptyl_noop, |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
267 | NULL, |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
268 | cx_emptyl_noop, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
269 | cx_emptyl_iterator, |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
270 | }; |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
271 | |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
272 | 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
|
273 | { |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
274 | NULL, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
275 | NULL, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
276 | 0, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
277 | 0, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
278 | NULL, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
279 | NULL, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
280 | NULL, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
281 | false, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
282 | true, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
283 | }, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
284 | &cx_empty_list_class, |
68ff0839bc6a
optimize cx_arl_find_remove for sorted arrays - fixes #547
Mike Becker <universe@uap-core.de>
parents:
1162
diff
changeset
|
285 | NULL |
704
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
286 | }; |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
287 | |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
288 | CxList *const cxEmptyList = &cx_empty_list; |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
289 | |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
290 | // </editor-fold> |
35f06c5eeb0e
add empty list implementation - fixes #258
Mike Becker <universe@uap-core.de>
parents:
699
diff
changeset
|
291 | |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
292 | #define invoke_list_func(name, list, ...) \ |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
293 | ((list)->climpl == NULL ? (list)->cl->name : (list)->climpl->name) \ |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
294 | (list, __VA_ARGS__) |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
295 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
296 | 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
|
297 | struct cx_list_s *list, |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
298 | size_t index, |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
299 | const void *data, |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
300 | size_t n |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
301 | ) { |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
302 | 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
|
303 | const char *src = data; |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
304 | size_t i = 0; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
305 | for (; i < n; i++) { |
1316
c41538edfcef
add cxListEmplace() and cxListEmplaceAt() plus some improvements to the array list implementation
Mike Becker <universe@uap-core.de>
parents:
1287
diff
changeset
|
306 | if (NULL == invoke_list_func( |
1065
6eb7b54975ee
improve coverage metrics
Mike Becker <universe@uap-core.de>
parents:
993
diff
changeset
|
307 | insert_element, list, index + i, |
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
|
308 | src + i * elem_size) |
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
|
309 | ) { |
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
|
310 | 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
|
311 | } |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
312 | } |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
313 | return i; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
314 | } |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
315 | |
1419
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
316 | 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
|
317 | 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
|
318 | 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
|
319 | 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
|
320 | bool allow_duplicates |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
321 | ) { |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
322 | // corner case |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
323 | if (n == 0) return 0; |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
324 | |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
325 | size_t elem_size = list->collection.elem_size; |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
326 | cx_compare_func cmp = list->collection.cmpfunc; |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
327 | 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
|
328 | |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
329 | // 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
|
330 | 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
|
331 | |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
332 | // 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
|
333 | while (di < list->collection.size) { |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
334 | const void *list_elm = invoke_list_func(at, list, di); |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
335 | |
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
|
336 | // 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
|
337 | // 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
|
338 | // 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
|
339 | { |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
340 | int d = cmp(list_elm, src); |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
341 | 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
|
342 | 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
|
343 | 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
|
344 | 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
|
345 | processed++; // we also count duplicates for the return value |
1419
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
346 | while (si < n && cmp(list_elm, src) == 0) { |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
347 | 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
|
348 | 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
|
349 | 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
|
350 | } |
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
|
351 | 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
|
352 | 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
|
353 | } |
1419
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
354 | } |
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
|
355 | 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
|
356 | continue; |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
357 | } |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
358 | } |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
359 | |
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
|
360 | // 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
|
361 | 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
|
362 | const char *next = src; |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
363 | 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
|
364 | 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
|
365 | // skip duplicates within the source |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
366 | if (cmp(next, next + elem_size) == 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
|
367 | 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
|
368 | 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
|
369 | 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
|
370 | } 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
|
371 | 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
|
372 | // 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
|
373 | 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
|
374 | 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
|
375 | } |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
376 | } |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
377 | } |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
378 | next += elem_size; |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
379 | // once we become larger than the list elem, break |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
380 | if (cmp(list_elm, next) <= 0) { |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
381 | break; |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
382 | } |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
383 | // otherwise, we can insert one more |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
384 | ins++; |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
385 | } |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
386 | |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
387 | // insert the elements at location si |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
388 | if (ins == 1) { |
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
|
389 | if (NULL == invoke_list_func(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
|
390 | 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
|
391 | } |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
392 | } else { |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
393 | size_t r = invoke_list_func(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
|
394 | 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
|
395 | 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
|
396 | } |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
397 | } |
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
|
398 | processed += ins + skip; |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
399 | di += ins; |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
400 | |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
401 | // 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
|
402 | 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
|
403 | 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
|
404 | } |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
405 | src = next; |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
406 | } |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
407 | |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
408 | // insert remaining items |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
409 | 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
|
410 | 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
|
411 | processed += invoke_list_func(insert_array, list, di, src, 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
|
412 | } 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
|
413 | const void *last = di == 0 ? NULL : invoke_list_func(at, list, di - 1); |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
414 | 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
|
415 | // skip duplicates within the source |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
416 | if (last == NULL || cmp(last, src) != 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
|
417 | if (NULL == invoke_list_func(insert_element, list, di, 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
|
418 | 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
|
419 | } |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
420 | 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
|
421 | 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
|
422 | } |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
423 | 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
|
424 | 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
|
425 | } |
9a72258446cd
fixes various bugs related to skipping duplicates in insert_unique - relates to #557
Mike Becker <universe@uap-core.de>
parents:
1422
diff
changeset
|
426 | } |
877
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
427 | } |
608b14deea18
optimize default insert_sorted implementation
Mike Becker <universe@uap-core.de>
parents:
876
diff
changeset
|
428 | |
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
|
429 | return processed; |
876
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
430 | } |
f4ce7df9cff0
add stupid default implementation for high level insertion sort
Mike Becker <universe@uap-core.de>
parents:
875
diff
changeset
|
431 | |
1419
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
432 | 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
|
433 | 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
|
434 | 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
|
435 | 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
|
436 | ) { |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
437 | 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
|
438 | } |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
439 | |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
440 | 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
|
441 | 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
|
442 | 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
|
443 | 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
|
444 | ) { |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
445 | 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
|
446 | } |
e46406fd1b3c
add functions to insert elements into lists/arrays without duplicates - resolves #557
Mike Becker <universe@uap-core.de>
parents:
1345
diff
changeset
|
447 | |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
448 | 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
|
449 | 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
|
450 | 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
|
451 | 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
|
452 | 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
|
453 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
454 | // copy elements from source array |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
455 | char *loc = tmp; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
456 | for (size_t i = 0; i < list_size; i++) { |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
457 | void *src = invoke_list_func(at, list, i); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
458 | memcpy(loc, src, elem_size); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
459 | loc += elem_size; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
460 | } |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
461 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
462 | // qsort |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
463 | qsort(tmp, list_size, elem_size, |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
464 | list->collection.cmpfunc); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
465 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
466 | // copy elements back |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
467 | loc = tmp; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
468 | for (size_t i = 0; i < list_size; i++) { |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
469 | void *dest = invoke_list_func(at, list, i); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
470 | memcpy(dest, loc, elem_size); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
471 | loc += elem_size; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
472 | } |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
473 | |
1319
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents:
1318
diff
changeset
|
474 | cxFreeDefault(tmp); |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
475 | } |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
476 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
477 | 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
|
478 | if (i == j) return 0; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
479 | 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
|
480 | 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
|
481 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
482 | 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
|
483 | |
1319
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents:
1318
diff
changeset
|
484 | 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
|
485 | 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
|
486 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
487 | void *ip = invoke_list_func(at, list, i); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
488 | void *jp = invoke_list_func(at, list, j); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
489 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
490 | memcpy(tmp, ip, elem_size); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
491 | memcpy(ip, jp, elem_size); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
492 | memcpy(jp, tmp, elem_size); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
493 | |
1319
aa1f580f8f59
add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents:
1318
diff
changeset
|
494 | cxFreeDefault(tmp); |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
495 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
496 | return 0; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
497 | } |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
498 | |
1111
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
499 | 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
|
500 | 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
|
501 | 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
|
502 | 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
|
503 | cx_compare_func comparator, |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
504 | 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
|
505 | ) { |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
506 | 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
|
507 | list->collection.allocator = allocator; |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
508 | list->collection.cmpfunc = comparator; |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
509 | 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
|
510 | list->collection.elem_size = elem_size; |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
511 | } else { |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
512 | list->collection.elem_size = sizeof(void *); |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
513 | if (list->collection.cmpfunc == NULL) { |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
514 | list->collection.cmpfunc = cx_cmp_ptr; |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
515 | } |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
516 | 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
|
517 | list->climpl = list->cl; |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
518 | list->cl = &cx_pointer_list_class; |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
519 | } |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
520 | } |
78eeeb950883
remove API for changing the store_pointer property after list creation
Mike Becker <universe@uap-core.de>
parents:
1109
diff
changeset
|
521 | |
618
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
522 | int cxListCompare( |
890
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
523 | const CxList *list, |
54565fd74e74
move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents:
877
diff
changeset
|
524 | const CxList *other |
618
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
525 | ) { |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
526 | bool cannot_optimize = false; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
527 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
528 | // 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
|
529 | 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
|
530 | |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
531 | // if one class is wrapped but the other is not |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
532 | cannot_optimize |= (list->climpl == NULL) ^ (other->climpl == NULL); |
705
0d5447230044
fix cxListCompare if-condition
Mike Becker <universe@uap-core.de>
parents:
704
diff
changeset
|
533 | |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
534 | // if the compare functions do not match or both are NULL |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
535 | if (!cannot_optimize) { |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
536 | cx_compare_func list_cmp = (cx_compare_func) (list->climpl != NULL ? |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
537 | list->climpl->compare : list->cl->compare); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
538 | cx_compare_func other_cmp = (cx_compare_func) (other->climpl != NULL ? |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
539 | other->climpl->compare : other->cl->compare); |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
540 | cannot_optimize |= list_cmp != other_cmp; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
541 | cannot_optimize |= list_cmp == NULL; |
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
542 | } |
705
0d5447230044
fix cxListCompare if-condition
Mike Becker <universe@uap-core.de>
parents:
704
diff
changeset
|
543 | |
875
ee84ac776cbc
add default impl for some list member functions
Mike Becker <universe@uap-core.de>
parents:
856
diff
changeset
|
544 | if (cannot_optimize) { |
680
19379743e5a0
fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents:
677
diff
changeset
|
545 | // 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
|
546 | if (list->collection.size == other->collection.size) { |
776
874cc78cdffd
fix accidental generation of cxListIterator() symbol
Mike Becker <universe@uap-core.de>
parents:
764
diff
changeset
|
547 | CxIterator left = list->cl->iterator(list, 0, false); |
802
30473af255b4
fix #356 : broken cxListCompare
Mike Becker <universe@uap-core.de>
parents:
776
diff
changeset
|
548 | CxIterator right = other->cl->iterator(other, 0, false); |
856
6bbbf219251d
fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents:
855
diff
changeset
|
549 | 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
|
550 | void *leftValue = cxIteratorCurrent(left); |
ac5e7f789048
separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents:
628
diff
changeset
|
551 | void *rightValue = cxIteratorCurrent(right); |
856
6bbbf219251d
fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents:
855
diff
changeset
|
552 | int d = list->collection.cmpfunc(leftValue, rightValue); |
618
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
553 | if (d != 0) { |
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
554 | return d; |
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
555 | } |
630
ac5e7f789048
separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents:
628
diff
changeset
|
556 | cxIteratorNext(left); |
ac5e7f789048
separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents:
628
diff
changeset
|
557 | cxIteratorNext(right); |
618
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
558 | } |
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
559 | return 0; |
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
560 | } else { |
856
6bbbf219251d
fix name of collection base member (to avoid base.base)
Mike Becker <universe@uap-core.de>
parents:
855
diff
changeset
|
561 | 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
|
562 | } |
680
19379743e5a0
fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents:
677
diff
changeset
|
563 | } else { |
19379743e5a0
fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents:
677
diff
changeset
|
564 | // lists are compatible |
19379743e5a0
fix wrong operator precedence in destructor macros
Mike Becker <universe@uap-core.de>
parents:
677
diff
changeset
|
565 | return list->cl->compare(list, other); |
618
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
566 | } |
1f5a8f6f3015
#219 array list: implement compare
Mike Becker <universe@uap-core.de>
parents:
528
diff
changeset
|
567 | } |
640
55cc3b373c5e
simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents:
630
diff
changeset
|
568 | |
853
d4baf4dd55c3
simplify iterator structures
Mike Becker <universe@uap-core.de>
parents:
802
diff
changeset
|
569 | CxIterator cxListMutIteratorAt( |
640
55cc3b373c5e
simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents:
630
diff
changeset
|
570 | CxList *list, |
55cc3b373c5e
simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents:
630
diff
changeset
|
571 | size_t index |
55cc3b373c5e
simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents:
630
diff
changeset
|
572 | ) { |
1345
79a865252b16
fix that the support for NULL when creating mutating iterators was broken
Mike Becker <universe@uap-core.de>
parents:
1319
diff
changeset
|
573 | if (list == NULL) list = cxEmptyList; |
655
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
574 | CxIterator it = list->cl->iterator(list, index, false); |
854
fe0d69d72bcd
fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents:
853
diff
changeset
|
575 | it.base.mutating = true; |
853
d4baf4dd55c3
simplify iterator structures
Mike Becker <universe@uap-core.de>
parents:
802
diff
changeset
|
576 | return it; |
640
55cc3b373c5e
simplify list class - fixes #236
Mike Becker <universe@uap-core.de>
parents:
630
diff
changeset
|
577 | } |
655
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
578 | |
853
d4baf4dd55c3
simplify iterator structures
Mike Becker <universe@uap-core.de>
parents:
802
diff
changeset
|
579 | CxIterator cxListMutBackwardsIteratorAt( |
655
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
580 | CxList *list, |
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
581 | size_t index |
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
582 | ) { |
1345
79a865252b16
fix that the support for NULL when creating mutating iterators was broken
Mike Becker <universe@uap-core.de>
parents:
1319
diff
changeset
|
583 | if (list == NULL) list = cxEmptyList; |
655
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
584 | CxIterator it = list->cl->iterator(list, index, true); |
854
fe0d69d72bcd
fix members inherited by macro or include are not documented
Mike Becker <universe@uap-core.de>
parents:
853
diff
changeset
|
585 | it.base.mutating = true; |
853
d4baf4dd55c3
simplify iterator structures
Mike Becker <universe@uap-core.de>
parents:
802
diff
changeset
|
586 | return it; |
655
7340c4255f1f
implement backwards iterator - fixes #238
Mike Becker <universe@uap-core.de>
parents:
647
diff
changeset
|
587 | } |
1109
89ec23988b88
free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
588 | |
89ec23988b88
free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
589 | void cxListFree(CxList *list) { |
89ec23988b88
free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
590 | if (list == NULL) return; |
89ec23988b88
free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
591 | list->cl->deallocate(list); |
89ec23988b88
free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents:
1065
diff
changeset
|
592 | } |
1287
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
593 | |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
594 | int cxListSet( |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
595 | CxList *list, |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
596 | size_t index, |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
597 | const void *elem |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
598 | ) { |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
599 | if (index >= list->collection.size) { |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
600 | return 1; |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
601 | } |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
602 | |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
603 | if (list->collection.store_pointer) { |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
604 | // For pointer collections, always use climpl |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
605 | void **target = list->climpl->at(list, index); |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
606 | *target = (void *)elem; |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
607 | } else { |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
608 | void *target = list->cl->at(list, index); |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
609 | memcpy(target, elem, list->collection.elem_size); |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
610 | } |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
611 | |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
612 | return 0; |
3a3ffc27813f
adds cxListSet() - resolves #642
Mike Becker <universe@uap-core.de>
parents:
1163
diff
changeset
|
613 | } |