1.1 --- a/src/tree.c Thu May 23 18:21:36 2024 +0200
1.2 +++ b/src/tree.c Thu May 23 19:29:14 2024 +0200
1.3 @@ -205,10 +205,10 @@
1.4 cx_tree_iter_search_next:
1.5 // check if there is a sibling
1.6 if (iter->exiting) {
1.7 - next = iter->next;
1.8 + next = iter->node_next;
1.9 } else {
1.10 next = tree_next(iter->node);
1.11 - iter->next = next;
1.12 + iter->node_next = next;
1.13 }
1.14 if (next == NULL) {
1.15 // no sibling, we are done with this node and exit
1.16 @@ -220,7 +220,7 @@
1.17 if (iter->depth == 1) {
1.18 // there is no parent - we have iterated the entire tree
1.19 // invalidate the iterator and free the node stack
1.20 - iter->node = iter->next = NULL;
1.21 + iter->node = iter->node_next = NULL;
1.22 iter->stack_capacity = iter->depth = 0;
1.23 free(iter->stack);
1.24 iter->stack = NULL;
1.25 @@ -272,7 +272,7 @@
1.26
1.27 // visit the root node
1.28 iter.node = root;
1.29 - iter.next = NULL;
1.30 + iter.node_next = NULL;
1.31 iter.counter = 1;
1.32 iter.depth = 1;
1.33 iter.stack[0] = root;
1.34 @@ -280,12 +280,12 @@
1.35 iter.skip = false;
1.36
1.37 // assign base iterator functions
1.38 - iter.base.mutating = false;
1.39 - iter.base.remove = false;
1.40 - iter.base.current_impl = NULL;
1.41 - iter.base.valid = cx_tree_iter_valid;
1.42 - iter.base.next = cx_tree_iter_next;
1.43 - iter.base.current = cx_tree_iter_current;
1.44 + iter.mutating = false;
1.45 + iter.remove = false;
1.46 + iter.current_impl = NULL;
1.47 + iter.valid = cx_tree_iter_valid;
1.48 + iter.next = cx_tree_iter_next;
1.49 + iter.current = cx_tree_iter_current;
1.50
1.51 return iter;
1.52 }
1.53 @@ -389,12 +389,12 @@
1.54 iter.queue_last = NULL;
1.55
1.56 // assign base iterator functions
1.57 - iter.base.mutating = false;
1.58 - iter.base.remove = false;
1.59 - iter.base.current_impl = NULL;
1.60 - iter.base.valid = cx_tree_visitor_valid;
1.61 - iter.base.next = cx_tree_visitor_next;
1.62 - iter.base.current = cx_tree_visitor_current;
1.63 + iter.mutating = false;
1.64 + iter.remove = false;
1.65 + iter.current_impl = NULL;
1.66 + iter.valid = cx_tree_visitor_valid;
1.67 + iter.next = cx_tree_visitor_next;
1.68 + iter.current = cx_tree_visitor_current;
1.69
1.70 return iter;
1.71 }
