From 038314368968b7955d9a9b82b95cf51b983e2ccc Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 28 Sep 2011 19:57:19 +0000 Subject: More glib like interface for ZixTree. Move ZixTree debug stuff to tree_debug.h. Support reverse iteration over ZixTree. git-svn-id: http://svn.drobilla.net/zix/trunk@40 df6676b4-ccc9-40e5-b5d6-7c4628a128e3 --- zix/tree.h | 53 ++++++++++++++++++++++++++++++++++++----------------- 1 file changed, 36 insertions(+), 17 deletions(-) (limited to 'zix/tree.h') diff --git a/zix/tree.h b/zix/tree.h index ccaf06e..cdcec10 100644 --- a/zix/tree.h +++ b/zix/tree.h @@ -37,15 +37,10 @@ extern "C" { */ typedef struct ZixTreeImpl ZixTree; -/** - A node in a @ref ZixTree. -*/ -typedef struct ZixTreeNodeImpl ZixTreeNode; - /** An iterator over a @ref ZixTree. */ -typedef ZixTreeNode* ZixTreeIter; +typedef struct ZixTreeNodeImpl ZixTreeIter; /** Create a new (empty) tree. @@ -63,50 +58,74 @@ zix_tree_free(ZixTree* t); Insert the element @a e into @a t and point @a ti at the new element. */ ZixStatus -zix_tree_insert(ZixTree* t, const void* e, ZixTreeIter* ti); +zix_tree_insert(ZixTree* t, void* e, ZixTreeIter** ti); /** Remove the item pointed at by @a ti from @a t. */ ZixStatus -zix_tree_remove(ZixTree* t, ZixTreeIter ti); +zix_tree_remove(ZixTree* t, ZixTreeIter* ti); /** - Set @a ti to be the largest element <= @a e in @a t. + Set @a ti to an element equal to @a e in @a t. If no such item exists, @a ti is set to NULL. */ ZixStatus -zix_tree_find(const ZixTree* t, const void* e, ZixTreeIter* ti); +zix_tree_find(const ZixTree* t, const void* e, ZixTreeIter** ti); /** Return the data associated with the given tree item. */ -const void* -zix_tree_get_data(ZixTreeIter ti); +void* +zix_tree_get(ZixTreeIter* ti); /** Return an iterator to the first (smallest) element in @a t. */ -ZixTreeIter +ZixTreeIter* zix_tree_begin(ZixTree* t); /** Return an iterator the the element one past the last element in @a t. */ -ZixTreeIter +ZixTreeIter* zix_tree_end(ZixTree* t); /** Return true iff @a i is an iterator to the end of its tree. */ bool -zix_tree_iter_is_end(ZixTreeIter i); +zix_tree_iter_is_end(ZixTreeIter* i); + +/** + Return an iterator to the last (largest) element in @a t. +*/ +ZixTreeIter* +zix_tree_rbegin(ZixTree* t); + +/** + Return an iterator the the element one before the first element in @a t. +*/ +ZixTreeIter* +zix_tree_rend(ZixTree* t); + +/** + Return true iff @a i is an iterator to the reverse end of its tree. +*/ +bool +zix_tree_iter_is_rend(ZixTreeIter* i); /** Return an iterator that points to the element one past @a i. */ -ZixTreeIter -zix_tree_iter_next(ZixTreeIter i); +ZixTreeIter* +zix_tree_iter_next(ZixTreeIter* i); + +/** + Return an iterator that points to the element one before @a i. +*/ +ZixTreeIter* +zix_tree_iter_prev(ZixTreeIter* i); /** @} -- cgit v1.2.1