rbtree3 0.7.0 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6593e6073d49e075b44d1b1f3be4b244d58fc91b4f2c0705bdec7b5c4a9e11e
-  data.tar.gz: 128e6b9623e23694b48cafea9ff6012fe9a7d2473a24272f221ce7ec104b47ac
+  metadata.gz: 8d27d1e7a32ef3f88ddf0e3a4e6feed5d2fc8df02fd39d1d353c51a91d4f6ad2
+  data.tar.gz: 548f44e98a342c617f37ce6775a7686915fbd66a4e76e5bca401969910f16311
 SHA512:
-  metadata.gz: 6c2dc0315779d6a7bdaf9ca7c591ea88c4161c46fac1c56bcba51673258c6c80c77113c7222444ea8567ce1cdcae3406cf8eeb0865c0f9e224203fd484a7606b
-  data.tar.gz: eb53a14756e78a30701c01c8ed0f8b5354e6ed499a790164cd30eb5018d942acd939ddc5008dfce33eca1c695438815f136f8ee093c1b0f5f5eec23ecb5cfc80
+  metadata.gz: 485f44e9c906d98c69f8fa197b7cdf59250d697ad2b7a844fd76d3aeb6128eb868b6b1bf38116136e2ad28cfc2b91d92d07d5b8c308ea988155b1a0f9cf650c4
+  data.tar.gz: a757b1c167d12842f8ed3d609d791004fe534c15789ddd3d1b769984885c6400baf86bdd07bf7c4eb0771e209fe113c14eb34e6dc6095b2c31249d6cfa6b7885

data/ChangeLog

@@ -1,3 +1,15 @@
+2026-03-24 Hiroshi SHIBATA, Kyrylo Silin
+
+	* version 1.0.0 released.
+
+	* added support for Ruby 4.1
+
+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.

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)
@@ -1487,13 +1487,6 @@ typedef struct {
     VALUE pp;
 } pp_arg_t;
 
-static VALUE
-pp_object_group(VALUE arg_)
-{
-    pp_arg_t* arg = (pp_arg_t*)arg_;
-    return rb_funcall(arg->pp, id_object_group, 1, arg->rbtree);
-}
-
 static VALUE
 pp_block(RB_BLOCK_CALL_FUNC_ARGLIST(nil, arg_))
 {
@@ -1524,8 +1517,11 @@ rbtree_pretty_print(VALUE self, VALUE pp)
     pp_arg.rbtree = self;
     pp_arg.pp = pp;
 
-    return rb_iterate(pp_object_group, (VALUE)&pp_arg,
-                      pp_block, (VALUE)&pp_arg);
+    {
+        VALUE argv = pp_arg.rbtree;
+        return rb_block_call(pp_arg.pp, id_object_group, 1, &argv,
+                             pp_block, (VALUE)&pp_arg);
+    }
 }
 
 /*

data/test.rb

@@ -722,27 +722,30 @@ class RBTreeTest < Test::Unit::TestCase
 
     def test_pp
       assert_equal(%(#<RBTree: {}, default=nil, cmp_proc=nil>\n),
-                   PP.pp(RBTree[], ""))
-      assert_equal(%(#<RBTree: {"a"=>"A", "b"=>"B"}, default=nil, cmp_proc=nil>\n),
+                    PP.pp(RBTree[], ""))
+
+      arrow = RUBY_VERSION >= "3.4" ? " => " : "=>"
+
+      assert_equal(%(#<RBTree: {"a"#{arrow}"A", "b"#{arrow}"B"}, default=nil, cmp_proc=nil>\n),
                    PP.pp(RBTree[*%w(a A b B)], ""))
 
       rbtree = RBTree[*("a".."z").to_a]
       rbtree.default = "a"
       rbtree.readjust {|a, b| a <=> b }
       expected = <<EOS
-#<RBTree: {"a"=>"b",
-  "c"=>"d",
-  "e"=>"f",
-  "g"=>"h",
-  "i"=>"j",
-  "k"=>"l",
-  "m"=>"n",
-  "o"=>"p",
-  "q"=>"r",
-  "s"=>"t",
-  "u"=>"v",
-  "w"=>"x",
-  "y"=>"z"},
+#<RBTree: {"a"#{arrow}"b",
+  "c"#{arrow}"d",
+  "e"#{arrow}"f",
+  "g"#{arrow}"h",
+  "i"#{arrow}"j",
+  "k"#{arrow}"l",
+  "m"#{arrow}"n",
+  "o"#{arrow}"p",
+  "q"#{arrow}"r",
+  "s"#{arrow}"t",
+  "u"#{arrow}"v",
+  "w"#{arrow}"x",
+  "y"#{arrow}"z"},
  default="a",
  cmp_proc=#{rbtree.cmp_proc}>
 EOS
@@ -752,7 +755,7 @@ EOS
       rbtree[rbtree] = rbtree
       rbtree.default = rbtree
       expected = <<EOS
-#<RBTree: {"#<RBTree: ...>"=>"#<RBTree: ...>"},
+#<RBTree: {"#<RBTree: ...>"#{arrow}"#<RBTree: ...>"},
  default="#<RBTree: ...>",
  cmp_proc=nil>
 EOS

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbtree3
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 1.0.0
 platform: ruby
 authors:
 - Kyrylo Silin
 - OZAWA Takuma
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-01-10 00:00:00.000000000 Z
+date: 1980-01-02 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 +38,6 @@ 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:
 rdoc_options: []
 require_paths:
 - "./"
@@ -54,8 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
-signing_key:
+rubygems_version: 4.0.3
 specification_version: 4
 summary: A RBTree is a sorted associative collection that is implemented with a Red-Black
   Tree.