src/tree.c

Wed, 31 Dec 2025 14:58:52 +0100

author
Mike Becker <universe@uap-core.de>
date
Wed, 31 Dec 2025 14:58:52 +0100
changeset 1691
5e608d0e5bd1
parent 1690
7d41291b3095
permissions
-rw-r--r--

merge logo change

816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
1 /*
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
2 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
3 *
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
4 * Copyright 2024 Mike Becker, Olaf Wintermann All rights reserved.
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
5 *
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
6 * Redistribution and use in source and binary forms, with or without
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
7 * modification, are permitted provided that the following conditions are met:
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
8 *
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
9 * 1. Redistributions of source code must retain the above copyright
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
10 * notice, this list of conditions and the following disclaimer.
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
11 *
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
12 * 2. Redistributions in binary form must reproduce the above copyright
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
13 * notice, this list of conditions and the following disclaimer in the
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
14 * documentation and/or other materials provided with the distribution.
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
15 *
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
16 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
17 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
18 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
19 * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
20 * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
21 * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
22 * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
23 * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
24 * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
425234b05dff add first basic low level tree functions
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
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
26 * POSSIBILITY OF SUCH DAMAGE.
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
27 */
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
28
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
29 #include "cx/tree.h"
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
30
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
31 #include <assert.h>
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
32 #include <string.h>
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
33
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
34 #define CX_TREE_PTR(cur, off) (*(void**)(((char*)(cur))+(off)))
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
35 #define tree_parent(node) CX_TREE_PTR(node, loc_parent)
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
36 #define tree_children(node) CX_TREE_PTR(node, loc_children)
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
37 #define tree_last_child(node) CX_TREE_PTR(node, loc_last_child)
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
38 #define tree_prev(node) CX_TREE_PTR(node, loc_prev)
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
39 #define tree_next(node) CX_TREE_PTR(node, loc_next)
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
40
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
41 #define tree_layout(tree) \
1108
c3bde8ff1c0b refine docs for tree.h - issue #548
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
42 (tree)->loc_parent,\
c3bde8ff1c0b refine docs for tree.h - issue #548
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
43 (tree)->loc_children,\
c3bde8ff1c0b refine docs for tree.h - issue #548
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
44 (tree)->loc_last_child,\
c3bde8ff1c0b refine docs for tree.h - issue #548
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
45 (tree)->loc_prev, \
c3bde8ff1c0b refine docs for tree.h - issue #548
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
46 (tree)->loc_next
c3bde8ff1c0b refine docs for tree.h - issue #548
Mike Becker <universe@uap-core.de>
parents: 1040
diff changeset
47
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
48 void cx_tree_add(
988
15b3ca7ee33f make ucx C++ compatible again (and add tests for it) - fixes #486
Mike Becker <universe@uap-core.de>
parents: 930
diff changeset
49 void *parent,
15b3ca7ee33f make ucx C++ compatible again (and add tests for it) - fixes #486
Mike Becker <universe@uap-core.de>
parents: 930
diff changeset
50 void *node,
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
51 ptrdiff_t loc_parent,
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
52 ptrdiff_t loc_children,
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
53 ptrdiff_t loc_last_child,
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
54 ptrdiff_t loc_prev,
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
55 ptrdiff_t loc_next
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
56 ) {
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
57 assert(loc_parent >= 0);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
58 assert(loc_children >= 0);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
59 assert(loc_next >= 0);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
60
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
61 void *current_parent = tree_parent(node);
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
62 if (current_parent == parent) return;
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
63 if (current_parent != NULL) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
64 cx_tree_remove(node, loc_parent, loc_children,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
65 loc_last_child, loc_prev, loc_next);
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
66 }
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
67
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
68 if (tree_children(parent) == NULL) {
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
69 tree_children(parent) = node;
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
70 if (loc_last_child >= 0) {
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
71 tree_last_child(parent) = node;
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
72 }
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
73 } else {
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
74 void *child;
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
75 if (loc_last_child >= 0) {
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
76 child = tree_last_child(parent);
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
77 tree_last_child(parent) = node;
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
78 } else {
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
79 child = tree_children(parent);
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
80 void *next;
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
81 while ((next = tree_next(child)) != NULL) {
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
82 child = next;
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
83 }
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
84 }
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
85 if (loc_prev >= 0) {
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
86 tree_prev(node) = child;
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
87 }
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
88 tree_next(child) = node;
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
89 }
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
90 tree_parent(node) = parent;
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
91 }
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
92
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
93 static void *cx_tree_node_prev(
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
94 ptrdiff_t loc_parent,
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
95 ptrdiff_t loc_children,
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
96 ptrdiff_t loc_next,
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
97 const void *node
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
98 ) {
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
99 void *parent = tree_parent(node);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
100 void *begin = tree_children(parent);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
101 if (begin == node) return NULL;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
102 const void *cur = begin;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
103 const void *next;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
104 while (1) {
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
105 next = tree_next(cur);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
106 if (next == node) return (void *) cur;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
107 cur = next;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
108 }
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
109 }
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
110
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
111 void cx_tree_remove(
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
112 void *node,
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
113 ptrdiff_t loc_parent,
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
114 ptrdiff_t loc_children,
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
115 ptrdiff_t loc_last_child,
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
116 ptrdiff_t loc_prev,
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
117 ptrdiff_t loc_next
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
118 ) {
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
119 if (tree_parent(node) == NULL) return;
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
120
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
121 assert(loc_children >= 0);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
122 assert(loc_next >= 0);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
123 assert(loc_parent >= 0);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
124 void *left;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
125 if (loc_prev >= 0) {
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
126 left = tree_prev(node);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
127 } else {
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
128 left = cx_tree_node_prev(loc_parent, loc_children, loc_next, node);
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
129 }
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
130 void *right = tree_next(node);
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
131 void *parent = tree_parent(node);
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
132 assert(left == NULL || tree_children(parent) != node);
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
133 assert(right == NULL || loc_last_child < 0 ||
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
134 tree_last_child(parent) != node);
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
135
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
136 if (left == NULL) {
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
137 tree_children(parent) = right;
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
138 } else {
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
139 tree_next(left) = right;
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
140 }
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
141 if (right == NULL) {
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
142 if (loc_last_child >= 0) {
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
143 tree_last_child(parent) = left;
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
144 }
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
145 } else {
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
146 if (loc_prev >= 0) {
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
147 tree_prev(right) = left;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
148 }
862
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
149 }
387414a7afd8 change cx_tree_link() from prepending to appending children - fixes #391
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
150
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
151 tree_parent(node) = NULL;
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
152 tree_next(node) = NULL;
921
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
153 if (loc_prev >= 0) {
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
154 tree_prev(node) = NULL;
5a7aa9cf9c3a make loc_prev in trees optional - fixes #433
Mike Becker <universe@uap-core.de>
parents: 918
diff changeset
155 }
816
425234b05dff add first basic low level tree functions
Mike Becker <universe@uap-core.de>
parents:
diff changeset
156 }
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
157
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
158 int cx_tree_search(const void *root, size_t max_depth,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
159 const void *data, cx_tree_search_func sfunc, void **result,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
160 ptrdiff_t loc_children, ptrdiff_t loc_next) {
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
161 // help avoiding bugs due to uninitialized memory
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
162 assert(result != NULL);
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
163 *result = NULL;
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
164
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
165 // NULL root? exit!
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
166 if (root == NULL) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
167 return -1;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
168 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
169
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
170 // remember return value for best match
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
171 int ret = sfunc(root, data);
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
172 if (ret < 0) {
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
173 // not contained, exit
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
174 return -1;
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
175 }
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
176 *result = (void*) root;
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
177 // if root is already exact match, exit
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
178 if (ret == 0) {
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
179 return 0;
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
180 }
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
181
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
182 // when depth is one, we are already done
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
183 if (max_depth == 1) {
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
184 return ret;
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
185 }
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
186
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
187 // special case: indefinite depth
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
188 if (max_depth == 0) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
189 max_depth = SIZE_MAX;
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
190 }
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
191
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
192 // create an iterator
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
193 CxTreeIterator iter = cx_tree_iterator(
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
194 (void*) root, false, loc_children, loc_next
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
195 );
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
196
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
197 // skip root, we already handled it
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
198 cxIteratorNext(iter);
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
199
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
200 // loop through the remaining tree
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
201 cx_foreach(void *, elem, iter) {
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
202 // investigate the current node
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
203 int ret_elem = sfunc(elem, data);
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
204 if (ret_elem == 0) {
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
205 // if found, exit the search
1286
5492e8ef05f4 fixes that cx_tree_search() did not investigate subtrees with equally good distance
Mike Becker <universe@uap-core.de>
parents: 1214
diff changeset
206 *result = elem;
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
207 ret = 0;
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
208 break;
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
209 } else if (ret_elem > 0 && ret_elem < ret) {
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
210 // new distance is better
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
211 *result = elem;
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
212 ret = ret_elem;
1286
5492e8ef05f4 fixes that cx_tree_search() did not investigate subtrees with equally good distance
Mike Becker <universe@uap-core.de>
parents: 1214
diff changeset
213 } else if (ret_elem < 0 || ret_elem > ret) {
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
214 // not contained or distance is worse, skip entire subtree
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
215 cxTreeIteratorContinue(iter);
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
216 }
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
217
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
218 // when we reached the max depth, skip the subtree
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
219 if (iter.depth == max_depth) {
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
220 cxTreeIteratorContinue(iter);
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
221 }
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
222 }
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
223
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
224 // dispose of the iterator as we might have exited the loop early
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
225 cxTreeIteratorDispose(&iter);
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
226
930
6540096c17b7 add max depth for tree search - closes #459
Mike Becker <universe@uap-core.de>
parents: 921
diff changeset
227 assert(ret < 0 || *result != NULL);
826
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
228 return ret;
21840975d541 add cx_tree_search() - relates to #165
Mike Becker <universe@uap-core.de>
parents: 816
diff changeset
229 }
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
230
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 871
diff changeset
231 static bool cx_tree_iter_valid(const void *it) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
232 const CxTreeIterator *iter = it;
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
233 return iter->node != NULL;
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
234 }
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
235
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 871
diff changeset
236 static void *cx_tree_iter_current(const void *it) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
237 const CxTreeIterator *iter = it;
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
238 return iter->node;
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
239 }
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
240
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
241 static void cx_tree_iter_next(void *it) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
242 CxTreeIterator *iter = it;
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
243 ptrdiff_t const loc_next = iter->loc_next;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
244 ptrdiff_t const loc_children = iter->loc_children;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
245 // protect us from misuse
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
246 if (!iter->base.valid(iter)) return;
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
247
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
248 void *children;
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
249
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
250 // check if we are currently exiting or entering nodes
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
251 if (iter->exiting) {
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
252 children = NULL;
848
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
253 // skipping on exit is pointless, just clear the flag
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
254 iter->skip = false;
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
255 } else {
848
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
256 if (iter->skip) {
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
257 // skip flag is set, pretend that there are no children
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
258 iter->skip = false;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
259 children = NULL;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
260 } else {
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
261 // try to enter the children (if any)
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
262 children = tree_children(iter->node);
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
263 }
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
264 }
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
265
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
266 if (children == NULL) {
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
267 // search for the next node
1314
25108c15e2d4 critical: fixes uninitialized memory in tree iterator
Mike Becker <universe@uap-core.de>
parents: 1309
diff changeset
268 void *next = NULL;
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
269 cx_tree_iter_search_next:
1309
b240b73d2a10 fix that iteration continued with siblings for a subtree-root - fixes #656
Mike Becker <universe@uap-core.de>
parents: 1286
diff changeset
270 // check if there is a sibling, but only if we are not a (subtree-)root
840
4f02995ce44e allow freeing tree nodes on exit - fixes #377
Mike Becker <universe@uap-core.de>
parents: 838
diff changeset
271 if (iter->exiting) {
853
d4baf4dd55c3 simplify iterator structures
Mike Becker <universe@uap-core.de>
parents: 848
diff changeset
272 next = iter->node_next;
1309
b240b73d2a10 fix that iteration continued with siblings for a subtree-root - fixes #656
Mike Becker <universe@uap-core.de>
parents: 1286
diff changeset
273 } else if (iter->depth > 1) {
840
4f02995ce44e allow freeing tree nodes on exit - fixes #377
Mike Becker <universe@uap-core.de>
parents: 838
diff changeset
274 next = tree_next(iter->node);
853
d4baf4dd55c3 simplify iterator structures
Mike Becker <universe@uap-core.de>
parents: 848
diff changeset
275 iter->node_next = next;
840
4f02995ce44e allow freeing tree nodes on exit - fixes #377
Mike Becker <universe@uap-core.de>
parents: 838
diff changeset
276 }
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
277 if (next == NULL) {
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
278 // no sibling, we are done with this node and exit
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
279 if (iter->visit_on_exit && !iter->exiting) {
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
280 // iter is supposed to visit the node again
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
281 iter->exiting = true;
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
282 } else {
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
283 iter->exiting = false;
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
284 if (iter->depth == 1) {
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
285 // there is no parent - we have iterated the entire tree
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
286 // invalidate the iterator and free the node stack
853
d4baf4dd55c3 simplify iterator structures
Mike Becker <universe@uap-core.de>
parents: 848
diff changeset
287 iter->node = iter->node_next = NULL;
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
288 iter->stack_capacity = iter->depth = 0;
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
289 cxFreeDefault(iter->stack);
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
290 iter->stack = NULL;
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
291 } else {
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
292 // the parent node can be obtained from the top of stack
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
293 // this way we can avoid the loc_parent in the iterator
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
294 iter->depth--;
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
295 iter->node = iter->stack[iter->depth - 1];
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
296 // retry with the parent node to find a sibling
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
297 goto cx_tree_iter_search_next;
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
298 }
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
299 }
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
300 } else {
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
301 if (iter->visit_on_exit && !iter->exiting) {
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
302 // iter is supposed to visit the node again
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
303 iter->exiting = true;
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
304 } else {
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
305 iter->exiting = false;
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
306 // move to the sibling
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
307 iter->counter++;
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
308 iter->node = next;
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
309 // new top of stack is the sibling
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
310 iter->stack[iter->depth - 1] = next;
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
311 }
838
1ce90ab4fab9 add visit_on_exit to iterator implementation
Mike Becker <universe@uap-core.de>
parents: 836
diff changeset
312 }
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
313 } else {
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
314 // node has children, push the first child onto the stack and enter it
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
315 if (iter->depth >= iter->stack_capacity) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1549
diff changeset
316 const size_t newcap = iter->stack_capacity + 8;
1690
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
317 if (cxReallocateArrayDefault(&iter->stack, newcap, sizeof(void*))) {
1607
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1549
diff changeset
318 // we cannot return an error in this function
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1549
diff changeset
319 abort(); // LCOV_EXCL_LINE
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1549
diff changeset
320 }
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1549
diff changeset
321 iter->stack_capacity = newcap;
0ecb13118cac next step of simplifying the array API - relates to #619
Mike Becker <universe@uap-core.de>
parents: 1549
diff changeset
322 }
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
323 iter->stack[iter->depth] = children;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
324 iter->depth++;
836
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
325 iter->node = children;
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
326 iter->counter++;
2672a2f79484 implement basic (enter only) tree iterator
Mike Becker <universe@uap-core.de>
parents: 834
diff changeset
327 }
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
328 }
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
329
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
330 CxTreeIterator cx_tree_iterator(
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
331 void *root,
833
5c926801f052 vastly simplify tree iterators and add test for creating them
Mike Becker <universe@uap-core.de>
parents: 830
diff changeset
332 bool visit_on_exit,
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
333 ptrdiff_t loc_children,
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
334 ptrdiff_t loc_next
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
335 ) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
336 CxTreeIterator ret;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
337 ret.use_dfs = true;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
338 ret.loc_children = loc_children;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
339 ret.loc_next = loc_next;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
340 ret.visit_on_exit = visit_on_exit;
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
341
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
342 // initialize members
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
343 ret.node_next = NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
344 ret.exiting = false;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
345 ret.skip = false;
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
346
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
347 // assign base iterator functions
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
348 ret.base.allow_remove = false;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
349 ret.base.remove = false;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
350 ret.base.current_impl = NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
351 ret.base.valid = cx_tree_iter_valid;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
352 ret.base.next = cx_tree_iter_next;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
353 ret.base.current = cx_tree_iter_current;
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
354
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
355 // visit the root node
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
356 ret.node = root;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
357 if (root != NULL) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
358 ret.stack_capacity = 16;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
359 ret.stack = cxMallocDefault(sizeof(void *) * 16);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
360 ret.stack[0] = root;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
361 ret.counter = 1;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
362 ret.depth = 1;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
363 } else {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
364 ret.stack_capacity = 0;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
365 ret.stack = NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
366 ret.counter = 0;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
367 ret.depth = 0;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
368 }
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
369
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
370 return ret;
830
c4dae6fe6d5b commit complicated stuff before simplifying it
Mike Becker <universe@uap-core.de>
parents: 826
diff changeset
371 }
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
372
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 871
diff changeset
373 static bool cx_tree_visitor_valid(const void *it) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
374 const CxTreeIterator *iter = it;
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
375 return iter->node != NULL;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
376 }
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
377
890
54565fd74e74 move all const keywords to the west - fixes #426
Mike Becker <universe@uap-core.de>
parents: 871
diff changeset
378 static void *cx_tree_visitor_current(const void *it) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
379 const CxTreeIterator *iter = it;
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
380 return iter->node;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
381 }
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
382
1675
36c0fb2b60b2 overhaul all attributes
Mike Becker <universe@uap-core.de>
parents: 1607
diff changeset
383 CX_NONNULL
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
384 static void cx_tree_visitor_enqueue_siblings(
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
385 CxTreeIterator *iter, void *node, ptrdiff_t loc_next) {
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
386 node = tree_next(node);
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
387 while (node != NULL) {
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
388 struct cx_tree_visitor_queue_s *q;
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
389 q = cxMallocDefault(sizeof(struct cx_tree_visitor_queue_s));
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
390 q->depth = iter->queue_last->depth;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
391 q->node = node;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
392 iter->queue_last->next = q;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
393 iter->queue_last = q;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
394 node = tree_next(node);
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
395 }
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
396 iter->queue_last->next = NULL;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
397 }
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
398
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
399 static void cx_tree_visitor_next(void *it) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
400 CxTreeIterator *iter = it;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
401 // protect us from misuse
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
402 if (!iter->base.valid(iter)) return;
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
403
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
404 ptrdiff_t const loc_next = iter->loc_next;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
405 ptrdiff_t const loc_children = iter->loc_children;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
406
848
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
407 // add the children of the current node to the queue
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
408 // unless the skip flag is set
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
409 void *children;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
410 if (iter->skip) {
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
411 iter->skip = false;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
412 children = NULL;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
413 } else {
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
414 children = tree_children(iter->node);
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
415 }
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
416 if (children != NULL) {
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
417 struct cx_tree_visitor_queue_s *q;
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
418 q = cxMallocDefault(sizeof(struct cx_tree_visitor_queue_s));
848
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
419 q->depth = iter->depth + 1;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
420 q->node = children;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
421 if (iter->queue_last == NULL) {
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
422 assert(iter->queue_next == NULL);
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
423 iter->queue_next = q;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
424 } else {
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
425 iter->queue_last->next = q;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
426 }
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
427 iter->queue_last = q;
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
428 cx_tree_visitor_enqueue_siblings(iter, children, loc_next);
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
429 }
6456036bbb37 implement tree continue - fixes #376
Mike Becker <universe@uap-core.de>
parents: 845
diff changeset
430
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
431 // check if there is a next node
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
432 if (iter->queue_next == NULL) {
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
433 iter->node = NULL;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
434 return;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
435 }
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
436
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
437 // dequeue the next node
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
438 iter->node = iter->queue_next->node;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
439 iter->depth = iter->queue_next->depth;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
440 {
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
441 struct cx_tree_visitor_queue_s *q = iter->queue_next;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
442 iter->queue_next = q->next;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
443 if (iter->queue_next == NULL) {
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
444 assert(iter->queue_last == q);
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
445 iter->queue_last = NULL;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
446 }
1319
aa1f580f8f59 add convenience macros for using the default allocator - relates to #669
Mike Becker <universe@uap-core.de>
parents: 1318
diff changeset
447 cxFreeDefault(q);
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
448 }
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
449
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
450 // increment the node counter
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
451 iter->counter++;
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
452 }
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
453
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
454 CxTreeIterator cx_tree_visitor(
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
455 void *root,
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
456 ptrdiff_t loc_children,
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
457 ptrdiff_t loc_next
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
458 ) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
459 CxTreeIterator ret;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
460 ret.visit_on_exit = false;
1689
a5b7cf49dea7 fix tree node destruction + reactivate all tests
Mike Becker <universe@uap-core.de>
parents: 1681
diff changeset
461 ret.exiting = false;
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
462 ret.use_dfs = false;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
463 ret.loc_children = loc_children;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
464 ret.loc_next = loc_next;
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
465
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
466 // initialize members
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
467 ret.skip = false;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
468 ret.queue_next = NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
469 ret.queue_last = NULL;
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
470
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
471 // assign base iterator functions
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
472 ret.base.allow_remove = false;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
473 ret.base.remove = false;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
474 ret.base.current_impl = NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
475 ret.base.valid = cx_tree_visitor_valid;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
476 ret.base.next = cx_tree_visitor_next;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
477 ret.base.current = cx_tree_visitor_current;
845
2615317311b7 add cx_tree_visitor()
Mike Becker <universe@uap-core.de>
parents: 840
diff changeset
478
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
479 // visit the root node
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
480 ret.node = root;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
481 if (root != NULL) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
482 ret.counter = 1;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
483 ret.depth = 1;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
484 } else {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
485 ret.counter = 0;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
486 ret.depth = 0;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
487 }
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
488
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
489 return ret;
860
558ed4c6abd0 add prototypes for cx_tree_add() family of functions
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
490 }
558ed4c6abd0 add prototypes for cx_tree_add() family of functions
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
491
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
492 size_t cx_tree_size(void *root, ptrdiff_t loc_children, ptrdiff_t loc_next) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
493 CxTreeIterator iter = cx_tree_iterator(root, false, loc_children, loc_next);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
494 while (cxIteratorValid(iter)) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
495 cxIteratorNext(iter);
866
1f636de4a63f complete cx_tree_add() implementations
Mike Becker <universe@uap-core.de>
parents: 864
diff changeset
496 }
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
497 return iter.counter;
860
558ed4c6abd0 add prototypes for cx_tree_add() family of functions
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
498 }
558ed4c6abd0 add prototypes for cx_tree_add() family of functions
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
499
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
500 size_t cx_tree_depth(void *root, ptrdiff_t loc_children, ptrdiff_t loc_next) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
501 CxTreeIterator iter = cx_tree_iterator(root, false, loc_children, loc_next);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
502 size_t depth = 0;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
503 while (cxIteratorValid(iter)) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
504 if (iter.depth > depth) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
505 depth = iter.depth;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
506 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
507 cxIteratorNext(iter);
860
558ed4c6abd0 add prototypes for cx_tree_add() family of functions
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
508 }
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
509 return depth;
860
558ed4c6abd0 add prototypes for cx_tree_add() family of functions
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
510 }
558ed4c6abd0 add prototypes for cx_tree_add() family of functions
Mike Becker <universe@uap-core.de>
parents: 854
diff changeset
511
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
512 CxTree *cxTreeCreate(const CxAllocator *allocator,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
513 size_t node_size, size_t elem_size, void *root, ptrdiff_t loc_data,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
514 ptrdiff_t loc_parent, ptrdiff_t loc_children, ptrdiff_t loc_last_child,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
515 ptrdiff_t loc_prev, ptrdiff_t loc_next) {
904
cdc49211d87f implement cxTreeInsert family of functions
Mike Becker <universe@uap-core.de>
parents: 903
diff changeset
516
989
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 988
diff changeset
517 if (allocator == NULL) {
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 988
diff changeset
518 allocator = cxDefaultAllocator;
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 988
diff changeset
519 }
8aa57a7fecc4 improve consistency for allocator arguments - fixes #485
Mike Becker <universe@uap-core.de>
parents: 988
diff changeset
520
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
521 CxTree *tree = cxZalloc(allocator, sizeof(CxTree));
1505
ce23605058d9 fix that cxTreeVisitorDispose() does not set the queue pointers to NULL
Mike Becker <universe@uap-core.de>
parents: 1429
diff changeset
522 if (tree == NULL) return NULL; // LCOV_EXCL_LINE
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
523 tree->collection.allocator = allocator;
902
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
524
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
525 if (elem_size == CX_STORE_POINTERS) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
526 tree->collection.store_pointer = true;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
527 tree->collection.elem_size = sizeof(void*);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
528 } else {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
529 tree->collection.elem_size = elem_size;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
530 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
531
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
532 tree->root = root;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
533 tree->node_size = node_size;
902
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
534 tree->loc_parent = loc_parent;
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
535 tree->loc_children = loc_children;
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
536 tree->loc_last_child = loc_last_child;
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
537 tree->loc_prev = loc_prev;
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
538 tree->loc_next = loc_next;
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
539 tree->loc_data = loc_data;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
540
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
541 if (root == NULL) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
542 cxSetAdvancedDestructor(tree, cxFree, (void*)allocator);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
543 } else {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
544 tree->collection.size = cx_tree_size(root, loc_children, loc_next);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
545 }
902
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
546
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
547 return tree;
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
548 }
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
549
1109
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1108
diff changeset
550 void cxTreeFree(CxTree *tree) {
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1108
diff changeset
551 if (tree == NULL) return;
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1108
diff changeset
552 if (tree->root != NULL) {
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1108
diff changeset
553 cxTreeClear(tree);
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1108
diff changeset
554 }
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
555 cxFree(tree->collection.allocator, tree);
1109
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1108
diff changeset
556 }
89ec23988b88 free functions should not be inline in release mode - relates to #541
Mike Becker <universe@uap-core.de>
parents: 1108
diff changeset
557
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
558 void cxTreeSetParent(CxTree *tree, void *parent, void *child) {
918
ec1f2015ec79 add cxTreeSetParent()
Mike Becker <universe@uap-core.de>
parents: 914
diff changeset
559 size_t loc_parent = tree->loc_parent;
ec1f2015ec79 add cxTreeSetParent()
Mike Becker <universe@uap-core.de>
parents: 914
diff changeset
560 if (tree_parent(child) == NULL) {
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
561 tree->collection.size++;
918
ec1f2015ec79 add cxTreeSetParent()
Mike Becker <universe@uap-core.de>
parents: 914
diff changeset
562 }
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
563 cx_tree_add(parent, child, tree_layout(tree));
918
ec1f2015ec79 add cxTreeSetParent()
Mike Becker <universe@uap-core.de>
parents: 914
diff changeset
564 }
ec1f2015ec79 add cxTreeSetParent()
Mike Becker <universe@uap-core.de>
parents: 914
diff changeset
565
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
566 void cxTreeAddNode(CxTree *tree, void *parent, void *child) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
567 cx_tree_add(parent, child, tree_layout(tree));
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
568 tree->collection.size++;
918
ec1f2015ec79 add cxTreeSetParent()
Mike Becker <universe@uap-core.de>
parents: 914
diff changeset
569 }
ec1f2015ec79 add cxTreeSetParent()
Mike Becker <universe@uap-core.de>
parents: 914
diff changeset
570
1690
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
571 void *cxTreeCreateNode(CxTree *tree, void *parent) {
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
572 void *node = cxZalloc(tree->collection.allocator, tree->node_size);
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
573 if (node == NULL) return NULL; // LCOV_EXCL_LINE
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
574 cx_tree_add(parent, node, tree_layout(tree));
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
575 tree->collection.size++;
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
576 return node;
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
577 }
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
578
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
579 void *cxTreeAddData(CxTree *tree, void *parent, const void *data) {
1689
a5b7cf49dea7 fix tree node destruction + reactivate all tests
Mike Becker <universe@uap-core.de>
parents: 1681
diff changeset
580 if (tree->loc_data < 0) return NULL;
a5b7cf49dea7 fix tree node destruction + reactivate all tests
Mike Becker <universe@uap-core.de>
parents: 1681
diff changeset
581
1690
7d41291b3095 complete tree.c testing
Mike Becker <universe@uap-core.de>
parents: 1689
diff changeset
582 void *node = cxTreeCreateNode(tree, parent);
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
583 if (node == NULL) return NULL; // LCOV_EXCL_LINE
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
584
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
585 char *dst = node;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
586 dst += tree->loc_data;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
587 const void *src = cxCollectionStoresPointers(tree) ? (const void*)&data : data;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
588 memcpy(dst, src, tree->collection.elem_size);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
589
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
590 return node;
901
109567325fe7 add functions to link/unlink nodes manually
Mike Becker <universe@uap-core.de>
parents: 893
diff changeset
591 }
902
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
592
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
593 void *cxTreeCreateRoot(CxTree *tree) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
594 if (tree->root != NULL) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
595 return tree->root;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
596 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
597
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
598 void *node = cxZalloc(tree->collection.allocator, tree->node_size);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
599 if (node == NULL) return NULL; // LCOV_EXCL_LINE
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
600 tree->root = node;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
601 tree->collection.size = 1;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
602 return node;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
603 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
604
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
605 void *cxTreeCreateRootData(CxTree *tree, const void *data) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
606 if (tree->loc_data < 0) return NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
607
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
608 void *node = cxTreeCreateRoot(tree);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
609 if (node == NULL) return NULL; // LCOV_EXCL_LINE
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
610
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
611 char *dst = node;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
612 dst += tree->loc_data;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
613 const void *src = cxCollectionStoresPointers(tree) ? (const void*)&data : data;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
614 memcpy(dst, src, tree->collection.elem_size);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
615
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
616 return node;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
617 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
618
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
619 void *cxTreeSetRoot(CxTree *tree, void *new_root) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
620 void *old_root = tree->root;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
621 tree->root = new_root;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
622 return old_root;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
623 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
624
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
625 void *cxTreeFindInSubtree(CxTree *tree, const void *data,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
626 void *subtree_root, size_t max_depth, bool use_dfs) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
627 if (tree->loc_data < 0 || subtree_root == NULL) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
628 return NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
629 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
630
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
631 CxTreeIterator iter = use_dfs
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
632 ? cx_tree_iterator(subtree_root, false, tree->loc_children, tree->loc_next)
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
633 : cx_tree_visitor(subtree_root, tree->loc_children, tree->loc_next);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
634
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
635 cx_foreach(char*, node, iter) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
636 char *node_data = node + tree->loc_data;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
637 if (cxCollectionStoresPointers(tree)) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
638 node_data = *(void**)node_data;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
639 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
640 if (cx_invoke_compare_func(tree, node_data, data) == 0) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
641 cxTreeIteratorDispose(&iter);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
642 return node;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
643 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
644 if (iter.depth == max_depth) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
645 cxTreeIteratorContinue(iter);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
646 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
647 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
648 return NULL;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
649 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
650
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
651 void *cxTreeFindFastInSubtree(CxTree *tree, const void *data,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
652 cx_tree_search_func sfunc, void *root, size_t max_depth) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
653 void *result;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
654 int ret = cx_tree_search(root, max_depth, data, sfunc, &result,
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
655 tree->loc_children, tree->loc_next);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
656 if (ret == 0) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
657 return result;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
658 } else {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
659 return NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
660 }
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
661 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
662
902
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
663 size_t cxTreeSubtreeSize(CxTree *tree, void *subtree_root) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
664 if (subtree_root == tree->root) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
665 return tree->collection.size;
902
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
666 }
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
667 return cx_tree_size(subtree_root, tree->loc_children, tree->loc_next);
902
5ed7f634f046 implement cxTreeCreate family of functions
Mike Becker <universe@uap-core.de>
parents: 901
diff changeset
668 }
903
a018f5916d3b add cxTreeSubtreeDepth()
Mike Becker <universe@uap-core.de>
parents: 902
diff changeset
669
a018f5916d3b add cxTreeSubtreeDepth()
Mike Becker <universe@uap-core.de>
parents: 902
diff changeset
670 size_t cxTreeSubtreeDepth(CxTree *tree, void *subtree_root) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
671 return cx_tree_depth(subtree_root, tree->loc_children, tree->loc_next);
903
a018f5916d3b add cxTreeSubtreeDepth()
Mike Becker <universe@uap-core.de>
parents: 902
diff changeset
672 }
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
673
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
674 size_t cxTreeSize(CxTree *tree) {
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
675 return tree->collection.size;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
676 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
677
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
678 size_t cxTreeDepth(CxTree *tree) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
679 return cx_tree_depth(tree->root, tree->loc_children, tree->loc_next);
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
680 }
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
681
913
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
682 int cxTreeRemoveNode(
909
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
683 CxTree *tree,
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
684 void *node,
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
685 cx_tree_relink_func relink_func
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
686 ) {
908
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
687 if (node == tree->root) return 1;
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
688
909
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
689 // determine the new parent
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
690 ptrdiff_t loc_parent = tree->loc_parent;
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
691 void *new_parent = tree_parent(node);
908
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
692
909
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
693 // first, unlink from the parent
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
694 cx_tree_remove(node, tree_layout(tree));
909
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
695
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
696 // then relink each child
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
697 ptrdiff_t loc_children = tree->loc_children;
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
698 ptrdiff_t loc_next = tree->loc_next;
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
699 void *child = tree_children(node);
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
700 while (child != NULL) {
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
701 // forcibly set the parent to NULL - we do not use the unlink function
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
702 // because that would unnecessarily modify the children linked list
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
703 tree_parent(child) = NULL;
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
704
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
705 // update contents, if required
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
706 if (relink_func != NULL) {
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
707 relink_func(child, node, new_parent);
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
708 }
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
709
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
710 // link to new parent
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
711 cx_tree_add(new_parent, child, tree_layout(tree));
909
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
712
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
713 // proceed to next child
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
714 child = tree_next(child);
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
715 }
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
716
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
717 // clear the linked list of the removed node
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
718 tree_children(node) = NULL;
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
719 ptrdiff_t loc_last_child = tree->loc_last_child;
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
720 if (loc_last_child >= 0) tree_last_child(node) = NULL;
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
721
f4e00bb3f3b2 implement cxTreeRemove() with re-link function
Mike Becker <universe@uap-core.de>
parents: 908
diff changeset
722 // the tree now has one member less
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
723 tree->collection.size--;
908
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
724
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
725 return 0;
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
726 }
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
727
f49f8a7060aa rename cxTreeRemove() to cxTreeRemoveSubtree()
Mike Becker <universe@uap-core.de>
parents: 907
diff changeset
728 void cxTreeRemoveSubtree(CxTree *tree, void *node) {
907
1f72fb9af87e fix bug when removing the root node of a tree
Mike Becker <universe@uap-core.de>
parents: 905
diff changeset
729 if (node == tree->root) {
1f72fb9af87e fix bug when removing the root node of a tree
Mike Becker <universe@uap-core.de>
parents: 905
diff changeset
730 tree->root = NULL;
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
731 tree->collection.size = 0;
907
1f72fb9af87e fix bug when removing the root node of a tree
Mike Becker <universe@uap-core.de>
parents: 905
diff changeset
732 return;
1f72fb9af87e fix bug when removing the root node of a tree
Mike Becker <universe@uap-core.de>
parents: 905
diff changeset
733 }
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
734 size_t subtree_size = cxTreeSubtreeSize(tree, node);
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
735 cx_tree_remove(node, tree_layout(tree));
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
736 tree->collection.size -= subtree_size;
905
39aa4f106a71 complete implementation of remaining high level tree functions
Mike Becker <universe@uap-core.de>
parents: 904
diff changeset
737 }
913
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
738
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
739 int cxTreeDestroyNode(
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
740 CxTree *tree,
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
741 void *node,
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
742 cx_tree_relink_func relink_func
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
743 ) {
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
744 int result = cxTreeRemoveNode(tree, node, relink_func);
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
745 if (result == 0) {
1689
a5b7cf49dea7 fix tree node destruction + reactivate all tests
Mike Becker <universe@uap-core.de>
parents: 1681
diff changeset
746 cx_invoke_destructor_raw(tree, node);
913
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
747 return 0;
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
748 } else {
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
749 return result;
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
750 }
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
751 }
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
752
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
753 void cxTreeDestroySubtree(CxTree *tree, void *node) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
754 cx_tree_remove(node, tree_layout(tree));
913
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
755 CxTreeIterator iter = cx_tree_iterator(
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
756 node, true,
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
757 tree->loc_children, tree->loc_next
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
758 );
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
759 cx_foreach(void *, child, iter) {
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
760 if (iter.exiting) {
1689
a5b7cf49dea7 fix tree node destruction + reactivate all tests
Mike Becker <universe@uap-core.de>
parents: 1681
diff changeset
761 // always call the destructors with the node!
a5b7cf49dea7 fix tree node destruction + reactivate all tests
Mike Becker <universe@uap-core.de>
parents: 1681
diff changeset
762 cx_invoke_destructor_raw(tree, child);
913
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
763 }
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
764 }
1549
72ad8a78378a changes CxTree structure so that it now inherits CX_COLLECTION_BASE - resolves #629
Mike Becker <universe@uap-core.de>
parents: 1505
diff changeset
765 tree->collection.size -= iter.counter;
913
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
766 if (node == tree->root) {
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
767 tree->root = NULL;
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
768 }
72db8e42b95e implement cxTreeDestroyNode and cxTreeDestroySubtree - resolves #438
Mike Becker <universe@uap-core.de>
parents: 910
diff changeset
769 }
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
770
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
771 void cxTreeIteratorDispose(CxTreeIterator *iter) {
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
772 if (iter->use_dfs) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
773 cxFreeDefault(iter->stack);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
774 iter->stack = NULL;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
775 } else {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
776 struct cx_tree_visitor_queue_s *q = iter->queue_next;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
777 while (q != NULL) {
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
778 struct cx_tree_visitor_queue_s *next = q->next;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
779 cxFreeDefault(q);
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
780 q = next;
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
781 }
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
782 iter->queue_next = iter->queue_last = NULL;
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
783 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
784 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff 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: 1319
diff changeset
786 CxTreeIterator cxTreeIterateSubtree(CxTree *tree, void *node, bool visit_on_exit) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
787 return cx_tree_iterator(
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
788 node, visit_on_exit,
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
789 tree->loc_children, tree->loc_next
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff 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: 1319
diff changeset
791 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
792
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
793 CxTreeIterator cxTreeVisitSubtree(CxTree *tree, void *node) {
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
794 return cx_tree_visitor(
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
795 node, tree->loc_children, tree->loc_next
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff 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: 1319
diff changeset
797 }
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
798
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
799 CxTreeIterator cxTreeIterate(CxTree *tree, bool visit_on_exit) {
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
800 return cxTreeIterateSubtree(tree, tree->root, visit_on_exit);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff 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: 1319
diff changeset
802
1681
56e76fbac167 rework of the entire tree API - resolves #772
Mike Becker <universe@uap-core.de>
parents: 1675
diff changeset
803 CxTreeIterator cxTreeVisit(CxTree *tree) {
1426
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
804 return cxTreeVisitSubtree(tree, tree->root);
3a89b31f0724 clean up header files and adds support for comparing arbitrary strings with string.h functions
Mike Becker <universe@uap-core.de>
parents: 1319
diff changeset
805 }

mercurial