kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* hash.c (rb_hash): always return a fixnum value because a return

Browse source 
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.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22308 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2009-02-14 18:53:40 +00:00
parent 766df600db
commit a48f90b05b
3 changed files with 33 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Sun Feb 15 03:50:21 2009 Yusuke Endoh <mame@tsg.ne.jp>
* 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.
Sun Feb 15 00:45:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org> Sun Feb 15 00:45:41 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* array.c (rb_ary_uniq_bang, rb_ary_uniq): unique by the result of * array.c (rb_ary_uniq_bang, rb_ary_uniq): unique by the result of

19
hash.c
View file

@ -57,7 +57,19 @@ rb_any_cmp(VALUE a, VALUE b)
VALUE VALUE
rb_hash(VALUE obj) 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 static int
@ -80,10 +92,7 @@ rb_any_hash(VALUE a)
break; break;
default: default:
hval = rb_funcall(a, id_hash, 0); hval = rb_hash(a);
if (!FIXNUM_P(hval)) {
hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
}
hnum = (int)FIX2LONG(hval); hnum = (int)FIX2LONG(hval);
} }
hnum <<= 1; hnum <<= 1;

11
test/ruby/test_hash.rb
View file

@ -849,4 +849,15 @@ class TestHash < Test::Unit::TestCase
def test_hash_hash def test_hash_hash
assert_equal({0=>2,11=>1}.hash, {11=>1,0=>2}.hash) assert_equal({0=>2,11=>1}.hash, {11=>1,0=>2}.hash)
end 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 end