diff options
author | Bruno Haible <bruno@clisp.org> | 2009-12-10 20:28:30 +0100 |
---|---|---|
committer | Bruno Haible <bruno@clisp.org> | 2009-12-10 20:28:30 +0100 |
commit | 441aa3044f43e5572f58c354f01e6bc070acd5c7 (patch) | |
tree | bef236e8058dd3469da28ffcd5a6a287222a4c50 /lib/gl_anytree_oset.h | |
parent | 039ae97b8ae35a2446c5d62d72b21689c97da7e2 (diff) | |
download | gnulib-441aa3044f43e5572f58c354f01e6bc070acd5c7.tar.gz |
Use spaces for indentation, not tabs.
Diffstat (limited to 'lib/gl_anytree_oset.h')
-rw-r--r-- | lib/gl_anytree_oset.h | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/lib/gl_anytree_oset.h b/lib/gl_anytree_oset.h index 95f2124064..bbcd7a40e5 100644 --- a/lib/gl_anytree_oset.h +++ b/lib/gl_anytree_oset.h @@ -29,8 +29,8 @@ typedef iterstack_item_t iterstack_t[MAXHEIGHT]; static gl_oset_t gl_tree_create_empty (gl_oset_implementation_t implementation, - gl_setelement_compar_fn compar_fn, - gl_setelement_dispose_fn dispose_fn) + gl_setelement_compar_fn compar_fn, + gl_setelement_dispose_fn dispose_fn) { struct gl_oset_impl *set = XMALLOC (struct gl_oset_impl); @@ -58,52 +58,52 @@ gl_tree_search (gl_oset_t set, const void *elt) for (node = set->root; node != NULL; ) { int cmp = (compar != NULL - ? compar (node->value, elt) - : (node->value > elt ? 1 : - node->value < elt ? -1 : 0)); + ? compar (node->value, elt) + : (node->value > elt ? 1 : + node->value < elt ? -1 : 0)); if (cmp < 0) - node = node->right; + node = node->right; else if (cmp > 0) - node = node->left; + node = node->left; else /* cmp == 0 */ - /* We have an element equal to ELT. */ - return true; + /* We have an element equal to ELT. */ + return true; } return false; } static bool gl_tree_search_atleast (gl_oset_t set, - gl_setelement_threshold_fn threshold_fn, - const void *threshold, - const void **eltp) + gl_setelement_threshold_fn threshold_fn, + const void *threshold, + const void **eltp) { gl_oset_node_t node; for (node = set->root; node != NULL; ) { if (! threshold_fn (node->value, threshold)) - node = node->right; + node = node->right; else - { - /* We have an element >= VALUE. But we need the leftmost such - element. */ - gl_oset_node_t found = node; - node = node->left; - for (; node != NULL; ) - { - if (! threshold_fn (node->value, threshold)) - node = node->right; - else - { - found = node; - node = node->left; - } - } - *eltp = found->value; - return true; - } + { + /* We have an element >= VALUE. But we need the leftmost such + element. */ + gl_oset_node_t found = node; + node = node->left; + for (; node != NULL; ) + { + if (! threshold_fn (node->value, threshold)) + node = node->right; + else + { + found = node; + node = node->left; + } + } + *eltp = found->value; + return true; + } } return false; } @@ -117,17 +117,17 @@ gl_tree_search_node (gl_oset_t set, const void *elt) for (node = set->root; node != NULL; ) { int cmp = (compar != NULL - ? compar (node->value, elt) - : (node->value > elt ? 1 : - node->value < elt ? -1 : 0)); + ? compar (node->value, elt) + : (node->value > elt ? 1 : + node->value < elt ? -1 : 0)); if (cmp < 0) - node = node->right; + node = node->right; else if (cmp > 0) - node = node->left; + node = node->left; else /* cmp == 0 */ - /* We have an element equal to ELT. */ - return node; + /* We have an element equal to ELT. */ + return node; } return NULL; } @@ -149,30 +149,30 @@ gl_tree_add (gl_oset_t set, const void *elt) for (;;) { int cmp = (compar != NULL - ? compar (node->value, elt) - : (node->value > elt ? 1 : - node->value < elt ? -1 : 0)); + ? compar (node->value, elt) + : (node->value > elt ? 1 : + node->value < elt ? -1 : 0)); if (cmp < 0) - { - if (node->right == NULL) - { - gl_tree_add_after (set, node, elt); - return true; - } - node = node->right; - } + { + if (node->right == NULL) + { + gl_tree_add_after (set, node, elt); + return true; + } + node = node->right; + } else if (cmp > 0) - { - if (node->left == NULL) - { - gl_tree_add_before (set, node, elt); - return true; - } - node = node->left; - } + { + if (node->left == NULL) + { + gl_tree_add_before (set, node, elt); + return true; + } + node = node->left; + } else /* cmp == 0 */ - return false; + return false; } } @@ -199,28 +199,28 @@ gl_tree_oset_free (gl_oset_t set) { /* Descend on left branch. */ for (;;) - { - if (node == NULL) - break; - stack_ptr->node = node; - stack_ptr->rightp = false; - node = node->left; - stack_ptr++; - } + { + if (node == NULL) + break; + stack_ptr->node = node; + stack_ptr->rightp = false; + node = node->left; + stack_ptr++; + } /* Climb up again. */ for (;;) - { - if (stack_ptr == &stack[0]) - goto done_iterate; - stack_ptr--; - node = stack_ptr->node; - if (!stack_ptr->rightp) - break; - /* Free the current node. */ - if (set->base.dispose_fn != NULL) - set->base.dispose_fn (node->value); - free (node); - } + { + if (stack_ptr == &stack[0]) + goto done_iterate; + stack_ptr--; + node = stack_ptr->node; + if (!stack_ptr->rightp) + break; + /* Free the current node. */ + if (set->base.dispose_fn != NULL) + set->base.dispose_fn (node->value); + free (node); + } /* Descend on right branch. */ stack_ptr->rightp = true; node = node->right; @@ -266,17 +266,17 @@ gl_tree_iterator_next (gl_oset_iterator_t *iterator, const void **eltp) *eltp = node->value; /* Advance to the next node. */ if (node->right != NULL) - { - node = node->right; - while (node->left != NULL) - node = node->left; - } + { + node = node->right; + while (node->left != NULL) + node = node->left; + } else - { - while (node->parent != NULL && node->parent->right == node) - node = node->parent; - node = node->parent; - } + { + while (node->parent != NULL && node->parent->right == node) + node = node->parent; + node = node->parent; + } iterator->p = node; return true; } |