Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Red Black Tree: Provide extra function to override compare(cmp) function #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 8, 2020
Merged

Red Black Tree: Provide extra function to override compare(cmp) function #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b11c21d
provide helper macro to pack key and its length
recp Dec 5, 2020
1c3cc76
override rb_find by adding compare func
recp Dec 5, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions include/ds/common.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,4 +25,8 @@
#define DS_ITOP(I) ((void *)(uintptr_t)I)
#define DS_PTOI(I, T) ((T)(uintptr_t)I)

/* pack key (e.g non-null terminated string) and its length */
#define DS_KEYnLEN(KEY, LEN) \
((void *[]){(void *)KEY, (void *)(uintptr_t)LEN})

#endif /* common_h */
39 changes: 35 additions & 4 deletions include/ds/rb.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,7 @@ rb_remove(RBTree *tree,
*/
DS_EXPORT
void*
rb_find(RBTree *tree,
void *key);
rb_find(RBTree * __restrict tree, void * __restrict key);

/*!
* @brief find node by key. It returns RBnode you can get value from node
Expand All @@ -152,8 +151,40 @@ rb_find(RBTree *tree,
*/
DS_EXPORT
RBNode*
rb_find_node(RBTree *tree,
void *key);
rb_find_node(RBTree * __restrict tree, void * __restrict key);

/*!
* @brief find value by key with cmp
*
* for instance you can compare null-terminated string key with non-null
* terminated string by providing cmp func for find
*
* @param[in] tree rbtree
* @param[in] key key
*
* @return found value or NULL
*/
DS_EXPORT
void*
rb_find_by(RBTree * __restrict tree, void * __restrict key, const DsCmpFn cmp);

/*!
* @brief find node by key with cmp.
* It returns RBnode you can get value from node
*
* for instance you can compare null-terminated string key with non-null
* terminated string by providing cmp func for find
*
* @param[in] tree rbtree
* @param[in] key key
*
* @return found RBNode or NULL
*/
DS_EXPORT
RBNode*
rb_find_node_by(RBTree * __restrict tree,
void * __restrict key,
const DsCmpFn cmp);

/*!
* @brief get parent node of found node (of key). This will lookup for node
Expand Down
38 changes: 30 additions & 8 deletions src/rb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -541,9 +541,9 @@ rb_remove(RBTree *tree, void *key) {

DS_EXPORT
void*
rb_find(RBTree *tree, void *key) {
rb_find(RBTree * __restrict tree, void * __restrict key) {
RBNode *found;
found = rb_find_node(tree, key);
found = rb_find_node_by(tree, key, tree->cmp);
if (found == NULL)
return NULL;

Expand All @@ -552,23 +552,45 @@ rb_find(RBTree *tree, void *key) {

DS_EXPORT
RBNode*
rb_find_node(RBTree *tree, void *key) {
RBNode *iter;
rb_find_node(RBTree * __restrict tree, void * __restrict key) {
return rb_find_node_by(tree, key, tree->cmp);
}

iter = tree->root->chld[RB_RIGHT];
DS_EXPORT
void*
rb_find_by(RBTree * __restrict tree,
void * __restrict key,
const DsCmpFn cmp) {
RBNode *found;
found = rb_find_node_by(tree, key, cmp);
if (found == NULL)
return NULL;

while (iter != tree->nullNode) {
return found->val;
}

DS_EXPORT
RBNode*
rb_find_node_by(RBTree * __restrict tree,
void * __restrict key,
const DsCmpFn cmp) {
RBNode *iter, *nullNode;

iter = tree->root->chld[RB_RIGHT];
nullNode = tree->nullNode;

while (iter != nullNode) {
int cmpRet;

cmpRet = tree->cmp(iter->key, key);
cmpRet = cmp(iter->key, key);

if (cmpRet == 0)
break;

iter = iter->chld[cmpRet < 0];
}

if (!iter || iter == tree->nullNode)
if (!iter || iter == nullNode)
return NULL;

return iter;
Expand Down