rbtree 0.2.1 → 0.3.0

data/ChangeLog

@@ -1,3 +1,25 @@
+2009-11-14  OZAWA Takuma
+
+	* version 0.3.0 released.
+
+2009-11-10  OZAWA Takuma
+
+	* rbtree.c: applied patches for Ruby 1.9 by Florian Gilcher and
+	Nobu Nakada. Thanks.
+	http://redmine.ruby-lang.org/issues/show/2348
+	
+	* test.rb: ditto.
+	
+	* extconf.rb: ditto.
+	
+	* extconf.rb: remove options for only gcc.
+
+	* test.rb (test_inspect): correct recursion tests.
+
+	* rbtree.c (rbtree_to_s_recursive): should return if recursive.
+
+	* test.rb (test_to_s): add recursion tests.
+	
 2009-01-27  OZAWA Takuma
 
 	* version 0.2.1 released.

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2002-2004, 2007, 2009 OZAWA Takuma
+Copyright (c) 2002-2004, 2007, 2009-2010 OZAWA Takuma
 
 Permission is hereby granted, free of charge, to any person
 obtaining a copy of this software and associated documentation

data/README

@@ -55,7 +55,7 @@ duplications of keys but MultiRBTree does.
 
 == Requirement
 
-  * Ruby 1.8.x
+  * Ruby 1.8.x, 1.9.1
 
 == Install
 
@@ -63,7 +63,7 @@ duplications of keys but MultiRBTree does.
 
 or download a tarball from the link below
 
-  * ((<"Ruby/RBTree 0.2.1"|URL:rbtree-0.2.1.tar.gz>))
+  * ((<"Ruby/RBTree 0.3.0"|URL:rbtree-0.3.0.tar.gz>))
 
 and then
 
@@ -85,7 +85,7 @@ or online documents at ((<URL:http://rbtree.rubyforge.org/>)).
 
 == License
 
-MIT License. Copyright (c) 2002-2004, 2007, 2009 OZAWA Takuma.
+MIT License. Copyright (c) 2002-2004, 2007, 2009-2010 OZAWA Takuma.
 
 dict.c and dict.h are modified copies that are originally in Kazlib
 written by Kaz Kylheku. Copyright is held by Kaz Kylheku, see dict.c

data/extconf.rb

@@ -1,11 +1,6 @@
 require 'mkmf'
 
-if $DEBUG
-  $CFLAGS << ' -std=c89 -pedantic -Wall -Wno-long-long'
-  $defs << ' -Dinline=__inline'
-else
-  $defs << '-DNDEBUG'
-end
-
-have_func('rb_enumeratorize')
+$defs << '-DNDEBUG'
+have_header('ruby/st.h')
+have_func('rb_exec_recursive', 'ruby.h')
 create_makefile('rbtree')

data/rbtree.c

@@ -1,20 +1,30 @@
 /*
  * MIT License
- * Copyright (c) 2002-2004, 2007, 2009 OZAWA Takuma
+ * Copyright (c) 2002-2004, 2007, 2009-2010 OZAWA Takuma
  */
 #include <ruby.h>
-#include <version.h>
+#ifdef HAVE_RUBY_ST_H
+#include <ruby/st.h>
+#else
 #include <st.h>
+#endif
 #include <stdarg.h>
 #include "dict.h"
 
 #define RBTREE_PROC_DEFAULT FL_USER2
 #define HASH_PROC_DEFAULT   FL_USER2
 
-#ifndef HAVE_RB_ENUMERATORIZE
+#ifndef RETURN_ENUMERATOR
 #define RETURN_ENUMERATOR(obj, argc, argv) ((void)0)
 #endif
 
+#ifndef RHASH_TBL
+#define RHASH_TBL(h) RHASH(h)->tbl
+#endif
+#ifndef RHASH_IFNONE
+#define RHASH_IFNONE(h) RHASH(h)->ifnone
+#endif
+
 VALUE RBTree;
 VALUE MultiRBTree;
 
@@ -184,24 +194,24 @@ rbtree_s_create(int argc, VALUE* argv, VALUE klass)
         tmp = rb_check_convert_type(argv[0], T_HASH, "Hash", "to_hash");
         if (!NIL_P(tmp)) {
             rbtree = rbtree_alloc(klass);
-            st_foreach(RHASH(tmp)->tbl, hash_to_rbtree_i, rbtree);
+            st_foreach(RHASH_TBL(tmp), hash_to_rbtree_i, rbtree);
             return rbtree;
         }
         
         tmp = rb_check_array_type(argv[0]);
         if (!NIL_P(tmp)) {
             rbtree = rbtree_alloc(klass);
-            for (i = 0; i < RARRAY(tmp)->len; i++) {
-                VALUE v = rb_check_array_type(RARRAY(tmp)->ptr[i]);
+            for (i = 0; i < RARRAY_LEN(tmp); i++) {
+                VALUE v = rb_check_array_type(RARRAY_PTR(tmp)[i]);
                 if (NIL_P(v)) {
                     continue;
                 }
-                switch(RARRAY(v)->len) {
+                switch(RARRAY_LEN(v)) {
                 case 1:
-                    rbtree_aset(rbtree, RARRAY(v)->ptr[0], Qnil);
+                    rbtree_aset(rbtree, RARRAY_PTR(v)[0], Qnil);
                     break;
                 case 2:
-                    rbtree_aset(rbtree, RARRAY(v)->ptr[0], RARRAY(v)->ptr[1]);
+                    rbtree_aset(rbtree, RARRAY_PTR(v)[0], RARRAY_PTR(v)[1]);
                     break;
                 default:
                     continue;
@@ -351,7 +361,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)
@@ -427,7 +437,7 @@ rbtree_default_proc(VALUE self)
 static int
 value_eq(const void* key1, const void* key2)
 {
-    return rb_equal((VALUE)key1, (VALUE)key2);
+    return rb_equal((VALUE)key1, (VALUE)key2) != 0;
 }
 
 /*
@@ -1059,7 +1069,7 @@ rbtree_to_a(VALUE self)
 static each_return_t
 to_hash_i(dnode_t* node, void* hash)
 {
-    st_insert(RHASH(hash)->tbl, GET_KEY(node), GET_VAL(node));
+    st_insert(RHASH_TBL((VALUE)hash), GET_KEY(node), GET_VAL(node));
     return EACH_NEXT;
 }
 
@@ -1076,7 +1086,7 @@ rbtree_to_hash(VALUE self)
     
     hash = rb_hash_new();
     rbtree_for_each(self, to_hash_i, (void*)hash);
-    RHASH(hash)->ifnone = IFNONE(self);
+    RHASH_IFNONE(hash) = IFNONE(self);
     if (FL_TEST(self, RBTREE_PROC_DEFAULT))
         FL_SET(hash, HASH_PROC_DEFAULT);
     OBJ_INFECT(hash, self);
@@ -1096,9 +1106,8 @@ static VALUE
 rbtree_begin_inspect(VALUE self)
 {
     const char* c = rb_class2name(CLASS_OF(self));
-    VALUE str = rb_str_new(0, strlen(c) + 5);
-    const size_t len = sprintf(RSTRING(str)->ptr, "#<%s: ", c);
-    RSTRING(str)->len = len;
+    VALUE str = rb_str_new(0, strlen(c) + 4);
+    sprintf(RSTRING_PTR(str), "#<%s: ", c);
     return str;
 }
 
@@ -1108,15 +1117,29 @@ to_s_rbtree(VALUE self, VALUE nil)
     return rb_ary_to_s(rbtree_to_a(self));
 }
 
+#ifdef HAVE_RB_EXEC_RECURSIVE
+static VALUE
+rbtree_to_s_recursive(VALUE self, VALUE arg, int recursive)
+{
+    if (recursive)
+        return rb_str_cat2(rbtree_begin_inspect(self), "...>");
+    return to_s_rbtree(self, Qnil);
+}
+#endif
+
 /*
  *
  */
 VALUE
 rbtree_to_s(VALUE self)
 {
+#ifdef HAVE_RB_EXEC_RECURSIVE
+    return rb_exec_recursive(rbtree_to_s_recursive, self, Qnil);
+#else
     if (rb_inspecting_p(self))
         return rb_str_cat2(rbtree_begin_inspect(self), "...>");
     return rb_protect_inspect(to_s_rbtree, self, Qnil);
+#endif
 }
 
 static each_return_t
@@ -1125,8 +1148,8 @@ inspect_i(dnode_t* node, void* ret_)
     VALUE ret = (VALUE)ret_;
     VALUE str;
 
-    if (RSTRING(ret)->ptr[0] == '-')
-        RSTRING(ret)->ptr[0] = '#';
+    if (RSTRING_PTR(ret)[0] == '-')
+        RSTRING_PTR(ret)[0] = '#';
     else
         rb_str_cat2(ret, ", ");
 
@@ -1149,9 +1172,9 @@ inspect_rbtree(VALUE self, VALUE ret)
     VALUE str;
     
     rb_str_cat2(ret, "{");
-    RSTRING(ret)->ptr[0] = '-';
+    RSTRING_PTR(ret)[0] = '-';
     rbtree_for_each(self, inspect_i, (void*)ret);
-    RSTRING(ret)->ptr[0] = '#';
+    RSTRING_PTR(ret)[0] = '#';
     rb_str_cat2(ret, "}");
 
     str = rb_inspect(IFNONE(self));
@@ -1169,16 +1192,29 @@ inspect_rbtree(VALUE self, VALUE ret)
     return ret;
 }
 
+static VALUE
+rbtree_inspect_recursive(VALUE self, VALUE arg, int recursive)
+{
+    VALUE str = rbtree_begin_inspect(self);
+    if (recursive)
+        return rb_str_cat2(str, "...>");
+    return inspect_rbtree(self, str);
+}
+
 /*
  *
  */
 VALUE
 rbtree_inspect(VALUE self)
 {
+#ifdef HAVE_RB_EXEC_RECURSIVE
+    return rb_exec_recursive(rbtree_inspect_recursive, self, Qnil);
+#else
     VALUE str = rbtree_begin_inspect(self);
     if (rb_inspecting_p(self))
         return rb_str_cat2(str, "...>");
     return rb_protect_inspect(inspect_rbtree, self, str);
+#endif
 }
 
 /*
@@ -1463,7 +1499,7 @@ rbtree_pretty_print(VALUE self, VALUE pp)
 VALUE
 rbtree_pretty_print_cycle(VALUE self, VALUE pp)
 {
-    return rb_funcall(pp, id_pp, 1, rbtree_inspect(self));
+    return rb_funcall(pp, id_pp, 1, rbtree_inspect_recursive(self, Qnil, 1));
 }
 
 /*********************************************************************/
@@ -1510,8 +1546,8 @@ rbtree_s_load(VALUE klass, VALUE str)
 {
     VALUE rbtree = rbtree_alloc(klass);
     VALUE ary = rb_marshal_load(str);
-    VALUE* ptr = RARRAY(ary)->ptr;
-    long len = RARRAY(ary)->len - 1;
+    VALUE* ptr = RARRAY_PTR(ary);
+    long len = RARRAY_LEN(ary) - 1;
     long i;
     
     for (i = 0; i < len; i += 2)

data/test.rb

@@ -1,4 +1,4 @@
-require "rbtree"
+require "./rbtree"
 require "test/unit.rb"
 
 class RBTreeTest < Test::Unit::TestCase
@@ -135,7 +135,7 @@ class RBTreeTest < Test::Unit::TestCase
     assert_equal("e", rbtree.default("f"))
     assert_raises(ArgumentError) { rbtree.default("e", "f") }
     
-    rbtree = RBTree.new {|rbtree, key| @rbtree[key || "c"] }
+    rbtree = RBTree.new {|tree, key| @rbtree[key || "c"] }
     assert_equal("C", rbtree.default(nil))
     assert_equal("B", rbtree.default("b"))
   end
@@ -181,7 +181,7 @@ class RBTreeTest < Test::Unit::TestCase
     
     a = RBTree.new
     b = RBTree.new
-    a.readjust {|a, b| a <=> b }
+    a.readjust {|x, y| x <=> y }
     assert_not_equal(a, b)
     b.readjust(a.cmp_proc)
     assert_equal(a, b)
@@ -197,7 +197,17 @@ class RBTreeTest < Test::Unit::TestCase
     
     assert_equal("E", @rbtree.fetch("e", "E"))
     assert_equal("E", @rbtree.fetch("e") { "E" })
-    assert_equal("E", @rbtree.fetch("e", "F") { "E" })
+    
+    class << (stderr = "")
+      alias write <<
+    end
+    $stderr, stderr, $VERBOSE, verbose = stderr, $stderr, false, $VERBOSE
+    begin
+      assert_equal("E", @rbtree.fetch("e", "F") { "E" })
+    ensure
+      $stderr, stderr, $VERBOSE, verbose = stderr, $stderr, false, $VERBOSE
+    end
+    assert_match(/warning: block supersedes default value argument/, stderr)
     
     assert_raises(ArgumentError) { @rbtree.fetch }
     assert_raises(ArgumentError) { @rbtree.fetch("e", "E", "E") }
@@ -497,7 +507,18 @@ class RBTreeTest < Test::Unit::TestCase
   end
 
   def test_to_s
-    assert_equal("aAbBcCdD", @rbtree.to_s)
+    if RUBY_VERSION < "1.9"
+      assert_equal("aAbBcCdD", @rbtree.to_s)
+    else
+      expected = "[[\"a\", \"A\"], [\"b\", \"B\"], [\"c\", \"C\"], [\"d\", \"D\"]]"
+      assert_equal(expected, @rbtree.to_s)
+      
+      rbtree = RBTree.new
+      rbtree[rbtree] = rbtree
+      rbtree.default = rbtree
+      expected = "[[#<RBTree: {#<RBTree: ...>=>#<RBTree: ...>}, default=#<RBTree: ...>, cmp_proc=nil>, #<RBTree: {#<RBTree: ...>=>#<RBTree: ...>}, default=#<RBTree: ...>, cmp_proc=nil>]]"
+      assert_equal(expected, rbtree.to_s)
+    end
   end
   
   def test_to_hash
@@ -529,7 +550,7 @@ class RBTreeTest < Test::Unit::TestCase
     tree, default, cmp_proc = match.to_a[1..-1]
     assert_equal(%({"a"=>"A", "b"=>"B", "c"=>"C", "d"=>"D"}), tree)
     assert_equal(%("e"), default)
-    assert_match(/#<Proc:\w+(@test.rb:\d+)?>/, cmp_proc)
+    assert_match(/#<Proc:\w+(@#{__FILE__}:\d+)?>/o, cmp_proc)
     
     rbtree = RBTree.new
     assert_match(re, rbtree.inspect)
@@ -540,10 +561,13 @@ class RBTreeTest < Test::Unit::TestCase
     assert_equal("nil", cmp_proc)
     
     rbtree = RBTree.new
-    rbtree["e"] = rbtree
-    assert_match(re, rbtree.inspect)
+    rbtree[rbtree] = rbtree
+    rbtree.default = rbtree
     match = re.match(rbtree.inspect)
-    assert_equal(%({"e"=>#<RBTree: ...>}), match[1])
+    tree, default, cmp_proc =  match.to_a[1..-1]
+    assert_equal("{#<RBTree: ...>=>#<RBTree: ...>}", tree)
+    assert_equal("#<RBTree: ...>", default)
+    assert_equal("nil", cmp_proc)
   end
   
   def test_lower_bound
@@ -702,7 +726,7 @@ class RBTreeTest < Test::Unit::TestCase
     
     def test_pp
       assert_equal(%(#<RBTree: {}, default=nil, cmp_proc=nil>\n),
-                   PP.pp(RBTree[], ""))
+                   PP.pp(RBTree.new, ""))
       assert_equal(%(#<RBTree: {"a"=>"A", "b"=>"B"}, default=nil, cmp_proc=nil>\n),
                    PP.pp(RBTree[*%w(a A b B)], ""))
       
@@ -728,7 +752,7 @@ class RBTreeTest < Test::Unit::TestCase
 EOS
       assert_equal(expected, PP.pp(rbtree, ""))
 
-      rbtree = RBTree[]
+      rbtree = RBTree.new
       rbtree[rbtree] = rbtree
       rbtree.default = rbtree
       expected = <<EOS
@@ -778,7 +802,12 @@ class MultiRBTreeTest < Test::Unit::TestCase
   end
 
   def test_to_s
-    assert_equal("aAbBbCbDcC", @rbtree.to_s)
+    if RUBY_VERSION < "1.9"
+      assert_equal("aAbBbCbDcC", @rbtree.to_s)
+    else
+      expected = "[[\"a\", \"A\"], [\"b\", \"B\"], [\"b\", \"C\"], \[\"b\", \"D\"], [\"c\", \"C\"]]"
+      assert_equal(expected, @rbtree.to_s)
+    end
   end
   
   def test_to_hash

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rbtree
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - OZAWA Takuma
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-27 00:00:00 +09:00
+date: 2009-11-14 00:00:00 +09:00
 default_executable: 
 dependencies: []