rbtree3 0.6.0 → 0.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3234cdc1ff704f6a3d32707f6b0fb740c5a946d42012453b56f186a2231157fc
-  data.tar.gz: 97eeab5707ad178f92fd2261e0209fc37262e9e95f0d75b18f49da1963b2a49d
+  metadata.gz: e58d214b8c7a56e628ff7783e9f8ee40088fd78a3be0f719ee8f1125017d2d28
+  data.tar.gz: 29f619a21052915efd058701b2fb334f983066ac35b6c370b73208b6bdd8fe9a
 SHA512:
-  metadata.gz: '0863e5d7883566ea6dd6da51e743d3606bdbc9f1dbce105e0f38bb2f60815bc4244691065bf4093cdd474d7b545b996dc25a3171ce114c471fa6108b7b21d2d5'
-  data.tar.gz: 745622af2491d5bdbcded3112c98e2183b1f3716c5a46204274fc0392ff2e5e79b863c03b7ff6f727f4207f13486d0ed82f81b508fad22d00c6b9a74ebb0948f
+  metadata.gz: e203ace7dad74d26d9df1d8776cbce09d9db8c15ab8d1cdc4ef822314346c595d851d0341c1c5a34a630d386959da4bac54b5b62b3e7d9a2789be7e78cbfae38
+  data.tar.gz: 53dfea3812a02aa104aee2f07fa5dd1504d58e7427e4ee5e581903472362a7d1f0147b92ca753b625ee344a4ac7435d8a4dc2eba7ab9c50060317f82fedb599c

data/ChangeLog

@@ -1,3 +1,22 @@
+2023-04-20 Tsimnuj Hawj
+
+  * version 0.7.1 released.
+
+  * rbtree.c: (rbtree_cmp): compilation fixes for Apple M1 chips (and newer)
+
+2022-01-10 Kyrylo Silin
+
+* version 0.7.0 released.
+
+* started testing against Ruby 3.0, 3.1 and Ruby head
+
+* test.rb: fixed duplicate test names
+
+* rbtree.c: deleted deprecated rb_gc_force_recycle calls
+
+* rbtree.c: (Init_rbtree): MultiRBTree inherits from rb_cObject instead of
+  rb_cData, which fixed a compilation error on Ruby 3.1+
+
 2020-01-21  Brian Hawley
 
         * version 0.6.0 released.

data/rbtree.c

@@ -122,7 +122,7 @@ static int
 rbtree_cmp(const void* key1, const void* key2, void* context)
 {
     VALUE ret;
-    if (TYPE(key1) == T_STRING && TYPE(key2) == T_STRING)
+    if (TYPE((VALUE)key1) == T_STRING && TYPE((VALUE)key2) == T_STRING)
         return rb_str_cmp((VALUE)key1, (VALUE)key2);
     ret = rb_funcall((VALUE)key1, id_cmp, 1, (VALUE)key2);
     return cmpint(ret, (VALUE)key1, (VALUE)key2);
@@ -301,7 +301,7 @@ insert_node_ensure(VALUE arg_)
         dict->dict_freenode(node, dict->dict_context);
         break;
     case NODE_NOT_FOUND:
-        if (TYPE(arg->key) == T_STRING)
+        if (TYPE((VALUE)arg->key) == T_STRING)
             node->dict_key = TO_KEY(rb_str_new4(GET_KEY(node)));
         break;
     case NODE_FOUND:
@@ -377,7 +377,7 @@ rbtree_fetch(int argc, VALUE* argv, VALUE self)
         rbtree_argc_error();
     block_given = rb_block_given_p();
     if (block_given && argc == 2)
-	rb_warn("block supersedes default value argument");
+        rb_warn("block supersedes default value argument");
 
     node = dict_lookup(DICT(self), TO_KEY(argv[0]));
     if (node != NULL)
@@ -665,8 +665,6 @@ copy_dict(VALUE src, VALUE dest, dict_comp_t cmp,  void* context)
         DICT(temp) = DICT(dest);
         DICT(dest) = t;
     }
-    rbtree_free(RBTREE(temp));
-    rb_gc_force_recycle(temp);
 }
 
 /*
@@ -1575,7 +1573,6 @@ rbtree_dump(VALUE self, VALUE _limit)
 
     ret = rb_marshal_dump(ary, Qnil);
     rb_ary_clear(ary);
-    rb_gc_force_recycle(ary);
     return ret;
 }
 
@@ -1596,7 +1593,6 @@ rbtree_s_load(VALUE klass, VALUE str)
     IFNONE(rbtree) = ptr[len];
 
     rb_ary_clear(ary);
-    rb_gc_force_recycle(ary);
     return rbtree;
 }
 
@@ -1656,7 +1652,7 @@ rbtree_s_load(VALUE klass, VALUE str)
  */
 void Init_rbtree()
 {
-    MultiRBTree = rb_define_class("MultiRBTree", rb_cData);
+    MultiRBTree = rb_define_class("MultiRBTree", rb_cObject);
     RBTree = rb_define_class("RBTree", MultiRBTree);
 
     rb_include_module(MultiRBTree, rb_mEnumerable);

data/test.rb

@@ -701,7 +701,7 @@ class RBTreeTest < Test::Unit::TestCase
     end
   end
 
-  def test_marshal
+  def test_marshal_dump
     assert_equal(@rbtree, Marshal.load(Marshal.dump(@rbtree)))
 
     @rbtree.default = "e"
@@ -890,7 +890,7 @@ class MultiRBTreeTest < Test::Unit::TestCase
     assert_equal(%w(c C b B b C b D a A), @rbtree.to_a.flatten)
   end
 
-  def test_marshal
+  def test_marshal_dump_load
     assert_equal(@rbtree, Marshal.load(Marshal.dump(@rbtree)))
   end
 

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: rbtree3
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.1
 platform: ruby
 authors:
 - Kyrylo Silin
 - OZAWA Takuma
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-01-21 00:00:00.000000000 Z
+date: 2023-04-20 00:00:00.000000000 Z
 dependencies: []
 description: |-
   A RBTree is a sorted associative collection that is implemented with a Red-Black Tree. It maps keys to values like a Hash, but maintains its elements in ascending key order. The interface is the almost identical to that of Hash.
@@ -39,7 +39,7 @@ metadata:
   homepage_uri: https://github.com/kyrylo/rbtree3
   source_code_uri: https://github.com/kyrylo/rbtree3
   changelog_uri: https://github.com/kyrylo/rbtree3/blob/master/ChangeLog
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - "./"
@@ -54,9 +54,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
-signing_key: 
+rubygems_version: 3.4.1
+signing_key:
 specification_version: 4
 summary: A RBTree is a sorted associative collection that is implemented with a Red-Black
   Tree.