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