ruby-changes:14124
From: yugui <ko1@a...>
Date: Fri, 27 Nov 2009 11:54:03 +0900 (JST)
Subject: [ruby-changes:14124] Ruby:r25938 (ruby_1_9_1): merges r22308 from trunk into ruby_1_9_1.
yugui 2009-11-27 11:53:45 +0900 (Fri, 27 Nov 2009) New Revision: 25938 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=25938 Log: merges r22308 from trunk into ruby_1_9_1. -- * hash.c (rb_hash): always return a fixnum value because a return value of rb_hash may be used as a hash value itself and bignums have no unique VALUE. * test/ruby/test_hash.rb: add a test for above. Modified files: branches/ruby_1_9_1/ChangeLog branches/ruby_1_9_1/hash.c branches/ruby_1_9_1/test/ruby/test_hash.rb branches/ruby_1_9_1/version.h Index: ruby_1_9_1/ChangeLog =================================================================== --- ruby_1_9_1/ChangeLog (revision 25937) +++ ruby_1_9_1/ChangeLog (revision 25938) @@ -1,3 +1,11 @@ +Sun Feb 15 03:50:21 2009 Yusuke Endoh <mame@t...> + + * hash.c (rb_hash): always return a fixnum value because a return + value of rb_hash may be used as a hash value itself and bignums have + no unique VALUE. + + * test/ruby/test_hash.rb: add a test for above. + Tue Nov 17 16:04:13 2009 Yuki Sonoda (Yugui) <yugui@y...> * regparse.c (parse_char_class): fixes a wrong merge r25531. Index: ruby_1_9_1/hash.c =================================================================== --- ruby_1_9_1/hash.c (revision 25937) +++ ruby_1_9_1/hash.c (revision 25938) @@ -57,7 +57,19 @@ VALUE rb_hash(VALUE obj) { - return rb_funcall(obj, id_hash, 0); + VALUE hval = rb_funcall(obj, id_hash, 0); + retry: + switch (TYPE(hval)) { + case T_FIXNUM: + return hval; + + case T_BIGNUM: + return LONG2FIX(((long*)(RBIGNUM_DIGITS(hval)))[0]); + + default: + hval = rb_to_int(hval); + goto retry; + } } static int @@ -77,10 +89,7 @@ break; default: - hval = rb_funcall(a, id_hash, 0); - if (!FIXNUM_P(hval)) { - hval = rb_funcall(hval, '%', 1, INT2FIX(536870923)); - } + hval = rb_hash(a); hnum = (int)FIX2LONG(hval); } hnum <<= 1; Index: ruby_1_9_1/version.h =================================================================== --- ruby_1_9_1/version.h (revision 25937) +++ ruby_1_9_1/version.h (revision 25938) @@ -1,13 +1,13 @@ #define RUBY_VERSION "1.9.1" -#define RUBY_PATCHLEVEL 339 +#define RUBY_PATCHLEVEL 340 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 9 #define RUBY_VERSION_TEENY 1 #define RUBY_RELEASE_YEAR 2009 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 17 -#define RUBY_RELEASE_DATE "2009-11-17" +#define RUBY_RELEASE_DAY 27 +#define RUBY_RELEASE_DATE "2009-11-27" #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; Index: ruby_1_9_1/test/ruby/test_hash.rb =================================================================== --- ruby_1_9_1/test/ruby/test_hash.rb (revision 25937) +++ ruby_1_9_1/test/ruby/test_hash.rb (revision 25938) @@ -851,4 +851,15 @@ def test_hash_hash assert_equal({0=>2,11=>1}.hash, {11=>1,0=>2}.hash) end + + def test_hash_bignum_hash + x = 2<<(32-3)-1 + assert_equal({x=>1}.hash, {x=>1}.hash) + x = 2<<(64-3)-1 + assert_equal({x=>1}.hash, {x=>1}.hash) + + o = Object.new + def o.hash; 2<<100; end + assert_equal({x=>1}.hash, {x=>1}.hash) + end end -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/