rbtree3 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bccde8bd8bdf793347171a34025c53c0585d97d1f53a90fb9bc07bdfcdf887f6
-  data.tar.gz: 2ae74f796225110f385d27cb9f52b01e1489e20e456808e099b9b20db798088c
+  metadata.gz: 5d3f4274c0291ddcf922cb0fafca0ae73f1119d0a495cce7202cded086c27711
+  data.tar.gz: 77e57d3d8e6e279b22ed762fa3b863da230b106f04d5da3886a1a2d1bfd8915d
 SHA512:
-  metadata.gz: deb597de927d29f3390917854bbc00835089e2ca531b895d561d4eff6936df2d7a14877a52ca95c57e399239b1c8a550d76788b2fd0ecab006f6915c5f844120
-  data.tar.gz: 85f78aca4fcd719daf6d7a51e606842a65fd6ccef6945197672f3f744917bb775161111a1dc1222b6b9b02fd27b2425ff4dac72904bea2c6bc877ccb1d131f27
+  metadata.gz: c2e579e0ddd8191211574a5091d05ab478610dad72cd09408d2d7a18e6846d788bda96861a34de0c4f97ca755818ee814851e76348d680dbb24cd26e22e3db69
+  data.tar.gz: 885d413f93472b5f5dea023e0b690fa639b971a99b601c9a33abceb6ca85291165fda646622a713e85db56c0dd791b94fa29c6d7d8b76c9e04300676a10540d5

data/ChangeLog

@@ -1,3 +1,7 @@
+2026-06-03
+
+	* Use typed data APIs for Ruby 4.1+
+
 2026-03-24 Kyrylo Silin
 
 	* bump required Ruby version to 1.9+

data/rbtree.c

@@ -50,7 +50,11 @@ typedef struct {
     int iter_lev;
 } rbtree_t;
 
+#ifdef TypedData_Make_Struct
+#define RBTREE(rbtree) rbtree_get(rbtree)
+#else
 #define RBTREE(rbtree) ((rbtree_t*)DATA_PTR(rbtree))
+#endif
 #define DICT(rbtree) RBTREE(rbtree)->dict
 #define IFNONE(rbtree) RBTREE(rbtree)->ifnone
 #define ITER_LEV(rbtree) RBTREE(rbtree)->iter_lev
@@ -72,16 +76,18 @@ cmpint(VALUE i, VALUE a, VALUE b)
 }
 
 static void
-rbtree_free(rbtree_t* rbtree)
+rbtree_free(void* arg)
 {
+    rbtree_t* rbtree = arg;
     dict_free_nodes(rbtree->dict);
     dict_destroy(rbtree->dict);
     xfree(rbtree);
 }
 
 static void
-rbtree_mark(rbtree_t* rbtree)
+rbtree_mark(void* arg)
 {
+    rbtree_t* rbtree = arg;
     if (rbtree == NULL) return;
 
     if (rbtree->dict != NULL) {
@@ -99,6 +105,30 @@ rbtree_mark(rbtree_t* rbtree)
     rb_gc_mark(rbtree->ifnone);
 }
 
+#ifdef TypedData_Make_Struct
+static size_t
+rbtree_memsize(const void* arg)
+{
+    return arg ? sizeof(rbtree_t) : 0;
+}
+
+static const rb_data_type_t rbtree_type = {
+    "RBTree",
+    {
+        rbtree_mark, rbtree_free, rbtree_memsize,
+    },
+    NULL, NULL, 0,
+};
+
+static rbtree_t*
+rbtree_get(VALUE rbtree)
+{
+    rbtree_t* ptr;
+    TypedData_Get_Struct(rbtree, rbtree_t, &rbtree_type, ptr);
+    return ptr;
+}
+#endif
+
 static dnode_t*
 rbtree_alloc_node(void* context)
 {
@@ -154,8 +184,13 @@ rbtree_alloc(VALUE klass)
 {
     dict_t* dict;
     rbtree_t* rbtree_ptr;
+#ifdef TypedData_Make_Struct
+    VALUE rbtree = TypedData_Make_Struct(klass, rbtree_t, &rbtree_type,
+                                         rbtree_ptr);
+#else
     VALUE rbtree = Data_Make_Struct(klass, rbtree_t, rbtree_mark, rbtree_free,
                                     rbtree_ptr);
+#endif
 
     dict = dict_create(rbtree_cmp);
     dict_set_allocator(dict, rbtree_alloc_node, rbtree_free_node,

data/test.rb

@@ -720,14 +720,18 @@ class RBTreeTest < Test::Unit::TestCase
   begin
     require "pp"
 
+    def pp(rbtree=RBTree.new)
+      PP.pp(rbtree, String.new, 80)
+    end
+
     def test_pp
       assert_equal(%(#<RBTree: {}, default=nil, cmp_proc=nil>\n),
-                    PP.pp(RBTree[], ""))
+                    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)], ""))
+                   pp(RBTree[*%w(a A b B)]))
 
       rbtree = RBTree[*("a".."z").to_a]
       rbtree.default = "a"
@@ -749,7 +753,7 @@ class RBTreeTest < Test::Unit::TestCase
  default="a",
  cmp_proc=#{rbtree.cmp_proc}>
 EOS
-      assert_equal(expected, PP.pp(rbtree, ""))
+      assert_equal(expected, pp(rbtree))
 
       rbtree = RBTree[]
       rbtree[rbtree] = rbtree
@@ -759,7 +763,7 @@ EOS
  default="#<RBTree: ...>",
  cmp_proc=nil>
 EOS
-      assert_equal(expected, PP.pp(rbtree, ""))
+      assert_equal(expected, pp(rbtree))
     end
   rescue LoadError
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbtree3
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Kyrylo Silin
@@ -52,7 +52,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.3
+rubygems_version: 4.0.10
 specification_version: 4
 summary: A RBTree is a sorted associative collection that is implemented with a Red-Black
   Tree.