llrbtree 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bae0d7ff3b65a774b9704fd18a99e21ad22d119ca4dc95dde840babce0a0789c
-  data.tar.gz: 84ead89aa999c9d0c8c018effb32a2ed65a948d234f950d339f2807720fc893e
+  metadata.gz: bdee6c0716e1d67f570bb2928822ed44d873493f9e4e26c0f8bf65dc567b8ffd
+  data.tar.gz: 2d651626e2d45ca02d46efe8d58a8408c5d5edcf96e53ef88b50fce5fb7d0ca3
 SHA512:
-  metadata.gz: 5584aaf495b76f0839c4dfe5a8bd40be5d1721b6df550267ed70e335cb6e77b47841837bb458437d19ae9f0a549e42eb055c3255e5a1d7dfcfabad804629e16e
-  data.tar.gz: 85c349b4aa229d0478c5b0fef72612866b1be433d65e98684d6d57a19ed405ad42bf4cf9527eeb2a2fa4ad1c11e3a1cbc61b2b32352884aff3393e72929bf59c
+  metadata.gz: a012cf09bc4406e780ac4520421dad74d217820ced888e126d1150f3a36f48d9ec71f197dc9cbee2a93b9ef30a9623a427e426c9585b4df739caafb9c503df9d
+  data.tar.gz: a1c76e5f67f0277be99914f8bbd07dfc06473da0aeb82cf576ed8da47918e037c1c5bf6eb9d8ee5253d85e6e5d918723aca613d72f6aa214e9640d254ee9c8b1

data/ext/llrbtree/llrbtree.c

@@ -837,16 +837,14 @@ VALUE
 llrbtree_delete(VALUE self, VALUE key)
 {
     tree_t* tree = TREE(self);
-    node_t* node;
-    VALUE value;
+    void* deleted_data = NULL;
 
     llrbtree_modify(self);
-    node = tree_lookup(tree, TO_KEY(key));
-    if (node == NULL)
+    deleted_data = tree_delete(tree, TO_KEY(key));
+    if (deleted_data == NULL)
         return rb_block_given_p() ? rb_yield(key) : Qnil;
-    value = GET_VAL(node);
-    tree_delete(tree, TO_KEY(key));
-    return value;
+
+    return (VALUE)deleted_data;
 }
 
 /*********************************************************************/

data/ext/llrbtree/tree.c

@@ -332,7 +332,7 @@ tree_insert(tree_t *tree, node_t *node, const void *key)
 }
 
 static node_t*
-recursive_delete(tree_t *tree, node_t *node, const void *key)
+recursive_delete(tree_t *tree, node_t *node, const void *key, void *deleted_data)
 {
     node_t *min_node;
 
@@ -342,42 +342,49 @@ recursive_delete(tree_t *tree, node_t *node, const void *key)
         if (is_black(node->left) && (node->left->left == NULL || is_black(node->left->left))) {
             node = move_red_left(node);
         }
-        node->left = recursive_delete(tree, node->left, key);
+        node->left = recursive_delete(tree, node->left, key, deleted_data);
     } else {
         if (is_red(node->left)) {
             node = rotate_right(node);
         }
 
+        if (tree->compare(key, node->key, tree->context) == 0 && node->right == NULL) {
+            *(void **)deleted_data = node->data;
+            tree->free_node(node, tree->context);
+            return NULL;
+        }
+
         if (is_black(node->right) && (node->right->left == NULL || is_black(node->right->left))) {
             node = move_red_right(node);
         }
 
         if (tree->compare(key, node->key, tree->context) == 0) {
-            if (node->right == NULL) {
-                tree->free_node(node, tree->context);
-                return NULL;
-            }
 
             min_node = min(node->right);
             node->key = min_node->key;
+            *(void **)deleted_data = node->data;
             node->data = min_node->data;
             node->right = delete_min(tree, node->right);
         } else {
-            node->right = recursive_delete(tree, node->right, key);
+            node->right = recursive_delete(tree, node->right, key, deleted_data);
         }
     }
 
     return fix_up(node);
 }
 
-void
+void*
 tree_delete(tree_t *tree, const void *key)
 {
-  tree->root_node = recursive_delete(tree, tree->root_node, key);
+  void* deleted_data = NULL;
+  tree->root_node = recursive_delete(tree, tree->root_node, key, &deleted_data);
   if (tree->root_node != NULL) {
     tree->root_node->color = node_black;
   }
-  tree->node_count--;
+  if (deleted_data != NULL) {
+    tree->node_count--;
+  }
+  return deleted_data;
 }
 
 node_t*

data/ext/llrbtree/tree.h

@@ -47,7 +47,7 @@ extern node_t *tree_lookup(tree_t *, const void *);
 extern node_t *tree_lower_bound(tree_t *, const void *);
 extern node_t *tree_upper_bound(tree_t *, const void *);
 extern int tree_insert(tree_t *, node_t *, const void *);
-extern void tree_delete(tree_t *, const void *);
+extern void *tree_delete(tree_t *, const void *);
 extern node_t *tree_first(tree_t *);
 extern node_t *tree_last(tree_t *);
 extern node_t *tree_next(tree_t *, node_t *);

data/lib/llrbtree/version.rb

@@ -1,3 +1,3 @@
 class LLRBTree
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/llrbtree.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = 'llrbtree'
-  spec.version       = '0.0.2'
+  spec.version       = '0.0.3'
   spec.authors       = ['kyuden']
   spec.email         = ['msmsms.um@gmail.com']
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: llrbtree
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - kyuden
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-31 00:00:00.000000000 Z
+date: 2019-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler