src/array_list.c

Tue, 07 Feb 2023 21:55:37 +0100

author
Mike Becker <universe@uap-core.de>
date
Tue, 07 Feb 2023 21:55:37 +0100
changeset 653
e081643aae2a
parent 650
77021e06b1a8
child 654
c9d008861178
permissions
-rw-r--r--

rename test directory to avoid name clash with Makefile target

606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Copyright 2021 Mike Becker, Olaf Wintermann All rights reserved.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 *
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
25 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 */
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "cx/array_list.h"
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
30 #include <assert.h>
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
31 #include <string.h>
606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
32
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
33 // LOW LEVEL ARRAY LIST FUNCTIONS
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
34
612
820ee59121b4 fix typo in enum cx_array_copy_result
Mike Becker <universe@uap-core.de>
parents: 611
diff changeset
35 enum cx_array_copy_result cx_array_copy(
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
36 void **target,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
37 size_t *size,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
38 size_t *capacity,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
39 size_t index,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
40 void const *src,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
41 size_t elem_size,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
42 size_t elem_count,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
43 struct cx_array_reallocator_s *reallocator
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
44 ) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
45 // assert pointers
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
46 assert(target != NULL);
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
47 assert(size != NULL);
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
48 assert(src != NULL);
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
49
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
50 // determine capacity
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
51 size_t cap = capacity == NULL ? *size : *capacity;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
52
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
53 // check if resize is required
627
cc8cbabd27cd fix cx_array_copy() unintentionally shrinking the array
Mike Becker <universe@uap-core.de>
parents: 626
diff changeset
54 size_t minsize = index + elem_count;
cc8cbabd27cd fix cx_array_copy() unintentionally shrinking the array
Mike Becker <universe@uap-core.de>
parents: 626
diff changeset
55 size_t newsize = *size < minsize ? minsize : *size;
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
56 bool needrealloc = newsize > cap;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
57
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
58 // reallocate if possible
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
59 if (needrealloc) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
60 // a reallocator and a capacity variable must be available
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
61 if (reallocator == NULL || capacity == NULL) {
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
62 return CX_ARRAY_COPY_REALLOC_NOT_SUPPORTED;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
63 }
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
64
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
65 // check, if we need to repair the src pointer
611
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
66 uintptr_t targetaddr = (uintptr_t) *target;
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
67 uintptr_t srcaddr = (uintptr_t) src;
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
68 bool repairsrc = targetaddr <= srcaddr
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
69 && srcaddr < targetaddr + cap * elem_size;
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
70
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
71 // calculate new capacity (next number divisible by 16)
625
a4c4a50c067a fix calculation of new capacity in cx_array_copy()
Mike Becker <universe@uap-core.de>
parents: 624
diff changeset
72 cap = newsize - (newsize % 16) + 16;
a4c4a50c067a fix calculation of new capacity in cx_array_copy()
Mike Becker <universe@uap-core.de>
parents: 624
diff changeset
73 assert(cap > newsize);
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
74
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
75 // perform reallocation
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
76 void *newmem = reallocator->realloc(
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
77 *target, cap, elem_size, reallocator
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
78 );
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
79 if (newmem == NULL) {
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
80 return CX_ARRAY_COPY_REALLOC_FAILED;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
81 }
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
82
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
83 // repair src pointer, if necessary
611
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
84 if (repairsrc) {
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
85 src = ((char *) newmem) + (srcaddr - targetaddr);
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
86 }
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
87
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
88 // store new pointer and capacity
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
89 *target = newmem;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
90 *capacity = cap;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
91 }
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
92
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
93 // determine target pointer
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
94 char *start = *target;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
95 start += index * elem_size;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
96
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
97 // copy elements and set new size
611
77efa5163ae5 #219 array list: implement insert
Mike Becker <universe@uap-core.de>
parents: 610
diff changeset
98 memmove(start, src, elem_count * elem_size);
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
99 *size = newsize;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
100
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
101 // return successfully
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
102 return CX_ARRAY_COPY_SUCCESS;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
103 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
104
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 641
diff changeset
105 #ifndef CX_ARRAY_SWAP_SBO_SIZE
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
106 #define CX_ARRAY_SWAP_SBO_SIZE 512
643
5700ba9154ab #228 make buffer sizes adjustable at compile time
Mike Becker <universe@uap-core.de>
parents: 641
diff changeset
107 #endif
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
108
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
109 void cx_array_swap(
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
110 void *arr,
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
111 size_t elem_size,
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
112 size_t idx1,
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
113 size_t idx2
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
114 ) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
115 // short circuit
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
116 if (idx1 == idx2) return;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
117
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
118 char sbo_mem[CX_ARRAY_SWAP_SBO_SIZE];
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
119 void *tmp;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
120
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
121 // decide if we can use the local buffer
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
122 if (elem_size > CX_ARRAY_SWAP_SBO_SIZE) {
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
123 tmp = malloc(elem_size);
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
124 // we don't want to enforce error handling
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
125 if (tmp == NULL) abort();
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
126 } else {
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
127 tmp = sbo_mem;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
128 }
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
129
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
130 // calculate memory locations
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
131 char *left = arr, *right = arr;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
132 left += idx1 * elem_size;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
133 right += idx2 * elem_size;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
134
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
135 // three-way swap
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
136 memcpy(tmp, left, elem_size);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
137 memcpy(left, right, elem_size);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
138 memcpy(right, tmp, elem_size);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
139
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
140 // free dynamic memory, if it was needed
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
141 if (tmp != sbo_mem) {
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
142 free(tmp);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
143 }
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
144 }
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
145
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
146 // HIGH LEVEL ARRAY LIST FUNCTIONS
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
147
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
148 typedef struct {
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
149 struct cx_list_s base;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
150 void *data;
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
151 struct cx_array_reallocator_s reallocator;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
152 } cx_array_list;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
153
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
154 static void *cx_arl_realloc(
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
155 void *array,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
156 size_t capacity,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
157 size_t elem_size,
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
158 struct cx_array_reallocator_s *alloc
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
159 ) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
160 // retrieve the pointer to the list allocator
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
161 CxAllocator const *al = alloc->ptr1;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
162
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
163 // use the list allocator to reallocate the memory
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
164 return cxRealloc(al, array, capacity * elem_size);
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
165 }
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
166
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
167 static void cx_arl_destructor(struct cx_list_s *list) {
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
168 cx_array_list *arl = (cx_array_list *) list;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
169 cxFree(list->allocator, arl->data);
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
170 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
171
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
172 static size_t cx_arl_insert_array(
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
173 struct cx_list_s *list,
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
174 size_t index,
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
175 void const *array,
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
176 size_t n
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
177 ) {
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
178 // out of bounds and special case check
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
179 if (index > list->size || n == 0) return 0;
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
180
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
181 // get a correctly typed pointer to the list
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
182 cx_array_list *arl = (cx_array_list *) list;
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
183
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
184 // do we need to move some elements?
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
185 if (index < list->size) {
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
186 char const *first_to_move = (char const *) arl->data;
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
187 first_to_move += index * list->itemsize;
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
188 size_t elems_to_move = list->size - index;
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
189 size_t start_of_moved = index + n;
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
190
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
191 if (CX_ARRAY_COPY_SUCCESS != cx_array_copy(
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
192 &arl->data,
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
193 &list->size,
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
194 &list->capacity,
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
195 start_of_moved,
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
196 first_to_move,
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
197 list->itemsize,
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
198 elems_to_move,
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
199 &arl->reallocator
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
200 )) {
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
201 // if moving existing elems is unsuccessful, abort
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
202 return 0;
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
203 }
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
204 }
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
205
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
206 // note that if we had to move the elements, the following operation
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
207 // is guaranteed to succeed, because we have the memory already allocated
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
208 // therefore, it is impossible to leave this function with an invalid array
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
209
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
210 // place the new elements
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
211 if (CX_ARRAY_COPY_SUCCESS == cx_array_copy(
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
212 &arl->data,
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
213 &list->size,
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
214 &list->capacity,
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
215 index,
629
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
216 array,
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
217 list->itemsize,
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
218 n,
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
219 &arl->reallocator
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
220 )) {
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
221 return n;
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
222 } else {
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
223 // array list implementation is "all or nothing"
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
224 return 0;
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
225 }
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
226 }
6c81ee4f11ad #224 add cxListAddArray()
Mike Becker <universe@uap-core.de>
parents: 628
diff changeset
227
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
228 static int cx_arl_insert_element(
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
229 struct cx_list_s *list,
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
230 size_t index,
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
231 void const *element
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
232 ) {
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
233 return 1 != cx_arl_insert_array(list, index, element, 1);
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
234 }
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
235
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
236 static int cx_arl_insert_iter(
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
237 struct cx_mut_iterator_s *iter,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
238 void const *elem,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
239 int prepend
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
240 ) {
619
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
241 struct cx_list_s *list = iter->src_handle;
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
242 if (iter->index < list->size) {
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
243 int result = cx_arl_insert_element(
619
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
244 list,
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
245 iter->index + 1 - prepend,
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
246 elem
619
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
247 );
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
248 if (result == 0 && prepend != 0) {
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
249 iter->index++;
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
250 iter->elem_handle = ((char *) iter->elem_handle) + list->itemsize;
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
251 }
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
252 return result;
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
253 } else {
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
254 int result = cx_arl_insert_element(list, list->size, elem);
619
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
255 iter->index = list->size;
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
256 return result;
5e58187ac707 #219 array list: implement insert via iterator
Mike Becker <universe@uap-core.de>
parents: 616
diff changeset
257 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
258 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
259
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
260 static int cx_arl_remove(
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
261 struct cx_list_s *list,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
262 size_t index
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
263 ) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
264 // out-of-bounds check
613
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
265 if (index >= list->size) {
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
266 return 1;
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
267 }
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
268
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
269 // short-circuit removal of last element
624
b0bdff7d8203 #219: cx_arl_remove short-circuit for last element
Mike Becker <universe@uap-core.de>
parents: 623
diff changeset
270 if (index == list->size - 1) {
b0bdff7d8203 #219: cx_arl_remove short-circuit for last element
Mike Becker <universe@uap-core.de>
parents: 623
diff changeset
271 list->size--;
b0bdff7d8203 #219: cx_arl_remove short-circuit for last element
Mike Becker <universe@uap-core.de>
parents: 623
diff changeset
272 return 0;
b0bdff7d8203 #219: cx_arl_remove short-circuit for last element
Mike Becker <universe@uap-core.de>
parents: 623
diff changeset
273 }
613
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
274
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
275 // just move the elements starting at index to the left
624
b0bdff7d8203 #219: cx_arl_remove short-circuit for last element
Mike Becker <universe@uap-core.de>
parents: 623
diff changeset
276 cx_array_list *arl = (cx_array_list *) list;
613
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
277 int result = cx_array_copy(
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
278 &arl->data,
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
279 &list->size,
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
280 &list->capacity,
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
281 index,
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
282 ((char *) arl->data) + (index + 1) * list->itemsize,
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
283 list->itemsize,
626
254cc61c71a0 #219: fix off-by-one bug in cx_arl_remove()
Mike Becker <universe@uap-core.de>
parents: 625
diff changeset
284 list->size - index - 1,
613
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
285 &arl->reallocator
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
286 );
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
287 if (result == 0) {
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
288 // decrease the size
613
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
289 list->size--;
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
290 }
85c08391a090 #219 array list: implement remove
Mike Becker <universe@uap-core.de>
parents: 612
diff changeset
291 return result;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
292 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
293
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
294 static void *cx_arl_at(
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
295 struct cx_list_s const *list,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
296 size_t index
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
297 ) {
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
298 if (index < list->size) {
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
299 cx_array_list const *arl = (cx_array_list const *) list;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
300 char *space = arl->data;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
301 return space + index * list->itemsize;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
302 } else {
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
303 return NULL;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
304 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
305 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
306
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
307 static size_t cx_arl_find(
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
308 struct cx_list_s const *list,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
309 void const *elem
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
310 ) {
614
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
311 char *cur = ((cx_array_list const *) list)->data;
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
312
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
313 for (size_t i = 0; i < list->size; i++) {
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
314 if (0 == list->cmpfunc(elem, cur)) {
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
315 return i;
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
316 }
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
317 cur += list->itemsize;
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
318 }
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
319
7aaec630cf15 #219 array list: implement find
Mike Becker <universe@uap-core.de>
parents: 613
diff changeset
320 return list->size;
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
321 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
322
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
323 static void cx_arl_sort(struct cx_list_s *list) {
615
b52b66dcd44b #219 array list: implement sort
Mike Becker <universe@uap-core.de>
parents: 614
diff changeset
324 qsort(((cx_array_list *) list)->data,
b52b66dcd44b #219 array list: implement sort
Mike Becker <universe@uap-core.de>
parents: 614
diff changeset
325 list->size,
b52b66dcd44b #219 array list: implement sort
Mike Becker <universe@uap-core.de>
parents: 614
diff changeset
326 list->itemsize,
b52b66dcd44b #219 array list: implement sort
Mike Becker <universe@uap-core.de>
parents: 614
diff changeset
327 list->cmpfunc
b52b66dcd44b #219 array list: implement sort
Mike Becker <universe@uap-core.de>
parents: 614
diff changeset
328 );
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
329 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
330
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
331 static int cx_arl_compare(
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
332 struct cx_list_s const *list,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
333 struct cx_list_s const *other
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
334 ) {
622
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
335 if (list->size == other->size) {
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
336 char const *left = ((cx_array_list const *) list)->data;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
337 char const *right = ((cx_array_list const *) other)->data;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
338 for (size_t i = 0; i < list->size; i++) {
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
339 int d = list->cmpfunc(left, right);
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
340 if (d != 0) {
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
341 return d;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
342 }
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
343 left += list->itemsize;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
344 right += other->itemsize;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
345 }
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
346 return 0;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
347 } else {
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
348 return list->size < other->size ? -1 : 1;
3d93cd78aa20 #219 array list: implement compare member func
Mike Becker <universe@uap-core.de>
parents: 620
diff changeset
349 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
350 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
351
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
352 static void cx_arl_reverse(struct cx_list_s *list) {
623
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
353 if (list->size < 2) return;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
354 void *data = ((cx_array_list const *) list)->data;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
355 size_t half = list->size / 2;
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
356 for (size_t i = 0; i < half; i++) {
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
357 cx_array_swap(data, list->itemsize, i, list->size - 1 - i);
21082350a590 #219 array list: implement reverse
Mike Becker <universe@uap-core.de>
parents: 622
diff changeset
358 }
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
359 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
360
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
361 static bool cx_arl_iter_valid(void const *it) {
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
362 struct cx_iterator_s const *iter = it;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
363 struct cx_list_s const *list = iter->src_handle;
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
364 return iter->index < list->size;
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
365 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
366
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
367 static void *cx_arl_iter_current(void const *it) {
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
368 struct cx_iterator_s const *iter = it;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
369 return iter->elem_handle;
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
370 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
371
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
372 static void cx_arl_iter_next(void *it) {
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
373 struct cx_iterator_base_s *itbase = it;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
374 if (itbase->remove) {
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
375 struct cx_mut_iterator_s *iter = it;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
376 itbase->remove = false;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
377 cx_arl_remove(iter->src_handle, iter->index);
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
378 } else {
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
379 struct cx_iterator_s *iter = it;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
380 iter->index++;
620
f220695aded6 #219 improve cx_arl_iter_next
Mike Becker <universe@uap-core.de>
parents: 619
diff changeset
381 iter->elem_handle =
f220695aded6 #219 improve cx_arl_iter_next
Mike Becker <universe@uap-core.de>
parents: 619
diff changeset
382 ((char *) iter->elem_handle)
f220695aded6 #219 improve cx_arl_iter_next
Mike Becker <universe@uap-core.de>
parents: 619
diff changeset
383 + ((struct cx_list_s const *) iter->src_handle)->itemsize;
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
384 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
385 }
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
386
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
387 static bool cx_arl_iter_flag_rm(void *it) {
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
388 struct cx_iterator_base_s *iter = it;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
389 if (iter->mutating) {
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
390 iter->remove = true;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
391 return true;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
392 } else {
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
393 return false;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
394 }
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
395 }
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
396
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
397 static struct cx_iterator_s cx_arl_iterator(
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
398 struct cx_list_s const *list,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
399 size_t index
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
400 ) {
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
401 struct cx_iterator_s iter;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
402
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
403 iter.index = index;
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
404 iter.src_handle = list;
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
405 iter.elem_handle = cx_arl_at(list, index);
630
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
406 iter.base.valid = cx_arl_iter_valid;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
407 iter.base.current = cx_arl_iter_current;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
408 iter.base.next = cx_arl_iter_next;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
409 iter.base.flag_removal = cx_arl_iter_flag_rm;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
410 iter.base.remove = false;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
411 iter.base.mutating = false;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
412
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
413 return iter;
ac5e7f789048 separate iterators and mutating iterators
Mike Becker <universe@uap-core.de>
parents: 629
diff changeset
414 }
616
af7d8a29fbc5 #219 array list: add iterator
Mike Becker <universe@uap-core.de>
parents: 615
diff changeset
415
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
416 static cx_list_class cx_array_list_class = {
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
417 cx_arl_destructor,
641
d402fead3386 add new pointer list wrapper - resolves #234
Mike Becker <universe@uap-core.de>
parents: 640
diff changeset
418 cx_arl_insert_element,
638
eafb45eefc51 add cxListInsertArray() - fixes #224
Mike Becker <universe@uap-core.de>
parents: 630
diff changeset
419 cx_arl_insert_array,
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
420 cx_arl_insert_iter,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
421 cx_arl_remove,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
422 cx_arl_at,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
423 cx_arl_find,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
424 cx_arl_sort,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
425 cx_arl_compare,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
426 cx_arl_reverse,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
427 cx_arl_iterator,
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
428 };
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
429
606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
430 CxList *cxArrayListCreate(
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
431 CxAllocator const *allocator,
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
432 CxListComparator comparator,
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
433 size_t item_size,
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
434 size_t initial_capacity
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
435 ) {
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
436 cx_array_list *list = cxCalloc(allocator, 1, sizeof(cx_array_list));
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
437 if (list == NULL) return NULL;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
438
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
439 list->data = cxCalloc(allocator, initial_capacity, item_size);
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
440 if (list->data == NULL) {
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
441 cxFree(allocator, list);
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
442 return NULL;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
443 }
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
444
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
445 list->base.cl = &cx_array_list_class;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
446 list->base.allocator = allocator;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
447 list->base.cmpfunc = comparator;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
448 list->base.itemsize = item_size;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
449 list->base.capacity = initial_capacity;
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
450
628
1e2be40f0cb5 use //-style single line comments everywhere
Mike Becker <universe@uap-core.de>
parents: 627
diff changeset
451 // configure the reallocator
610
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
452 list->reallocator.realloc = cx_arl_realloc;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
453 list->reallocator.ptr1 = (void *) allocator;
de5d3ee6435f #219 array list: implement add and at
Mike Becker <universe@uap-core.de>
parents: 607
diff changeset
454
607
2d99e978dc34 implement array list ctor and dtor
Mike Becker <universe@uap-core.de>
parents: 606
diff changeset
455 return (CxList *) list;
606
314e9288af2f add array list tests
Mike Becker <universe@uap-core.de>
parents:
diff changeset
456 }

mercurial