projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'
[gnulib.git]
/
lib
/
gl_rbtree_list.c
diff --git
a/lib/gl_rbtree_list.c
b/lib/gl_rbtree_list.c
index
5064515
..
ba1c271
100644
(file)
--- a/
lib/gl_rbtree_list.c
+++ b/
lib/gl_rbtree_list.c
@@
-1,11
+1,11
@@
/* Sequential list data type implemented by a binary tree.
/* Sequential list data type implemented by a binary tree.
- Copyright (C) 2006 Free Software Foundation, Inc.
+ Copyright (C) 2006
, 2008-2014
Free Software Foundation, Inc.
Written by Bruno Haible <bruno@clisp.org>, 2006.
Written by Bruno Haible <bruno@clisp.org>, 2006.
- This program is free software
;
you can redistribute it and/or modify
+ This program is free software
:
you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version
2, or (at your option)
- any later version.
+ the Free Software Foundation; either version
3 of the License, or
+
(at your option)
any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
@@
-13,28
+13,27
@@
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software Foundation,
- Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */
+ along with this program. If not, see <http://www.gnu.org/licenses/>. */
-#ifdef HAVE_CONFIG_H
-# include <config.h>
-#endif
+#include <config.h>
/* Specification. */
#include "gl_rbtree_list.h"
#include <stdlib.h>
/* Specification. */
#include "gl_rbtree_list.h"
#include <stdlib.h>
-#include "xalloc.h"
-
/* -------------------------- gl_list_t Data Type -------------------------- */
/* Generic red-black tree code. */
#include "gl_anyrbtree_list1.h"
/* -------------------------- gl_list_t Data Type -------------------------- */
/* Generic red-black tree code. */
#include "gl_anyrbtree_list1.h"
-#include "gl_anyrbtree_list2.h"
/* Generic binary tree code. */
#include "gl_anytree_list1.h"
/* Generic binary tree code. */
#include "gl_anytree_list1.h"
+
+/* Generic red-black tree code. */
+#include "gl_anyrbtree_list2.h"
+
+/* Generic binary tree code. */
#include "gl_anytree_list2.h"
/* For debugging. */
#include "gl_anytree_list2.h"
/* For debugging. */
@@
-49,8
+48,8
@@
check_invariants (gl_list_node_t node, gl_list_node_t parent)
if (!(node->parent == parent))
abort ();
if (!(node->branch_size
if (!(node->parent == parent))
abort ();
if (!(node->branch_size
- == (node->left != NULL ? node->left->branch_size : 0)
- + 1 + (node->right != NULL ? node->right->branch_size : 0)))
+
== (node->left != NULL ? node->left->branch_size : 0)
+
+ 1 + (node->right != NULL ? node->right->branch_size : 0)))
abort ();
if (!(node->color == BLACK || node->color == RED))
abort ();
abort ();
if (!(node->color == BLACK || node->color == RED))
abort ();
@@
-70,21
+69,22
@@
gl_rbtree_list_check_invariants (gl_list_t list)
const struct gl_list_implementation gl_rbtree_list_implementation =
{
const struct gl_list_implementation gl_rbtree_list_implementation =
{
- gl_tree_create_empty,
- gl_tree_create,
+ gl_tree_
nx_
create_empty,
+ gl_tree_
nx_
create,
gl_tree_size,
gl_tree_node_value,
gl_tree_size,
gl_tree_node_value,
+ gl_tree_node_nx_set_value,
gl_tree_next_node,
gl_tree_previous_node,
gl_tree_get_at,
gl_tree_next_node,
gl_tree_previous_node,
gl_tree_get_at,
- gl_tree_set_at,
- gl_tree_search,
- gl_tree_indexof,
- gl_tree_add_first,
- gl_tree_add_last,
- gl_tree_add_before,
- gl_tree_add_after,
- gl_tree_add_at,
+ gl_tree_
nx_
set_at,
+ gl_tree_search
_from_to
,
+ gl_tree_indexof
_from_to
,
+ gl_tree_
nx_
add_first,
+ gl_tree_
nx_
add_last,
+ gl_tree_
nx_
add_before,
+ gl_tree_
nx_
add_after,
+ gl_tree_
nx_
add_at,
gl_tree_remove_node,
gl_tree_remove_at,
gl_tree_remove,
gl_tree_remove_node,
gl_tree_remove_at,
gl_tree_remove,
@@
-94,7
+94,9
@@
const struct gl_list_implementation gl_rbtree_list_implementation =
gl_tree_iterator_next,
gl_tree_iterator_free,
gl_tree_sortedlist_search,
gl_tree_iterator_next,
gl_tree_iterator_free,
gl_tree_sortedlist_search,
+ gl_tree_sortedlist_search_from_to,
gl_tree_sortedlist_indexof,
gl_tree_sortedlist_indexof,
- gl_tree_sortedlist_add,
+ gl_tree_sortedlist_indexof_from_to,
+ gl_tree_sortedlist_nx_add,
gl_tree_sortedlist_remove
};
gl_tree_sortedlist_remove
};