From e722ad99d5b0e6a9bb0249ff3d9c8cce28d3204e Mon Sep 17 00:00:00 2001 From: mame Date: Sat, 14 Feb 2009 19:55:34 +0000 Subject: * string.c (rb_hash_uint32, rb_hash_uint, rb_hash_start, rb_hash_end), include/ruby/intern.h: add Murmurhash API. [ruby-dev:37784] * complex.c (nucomp_hash), array.c (rb_ary_hash), time.c (time_hash), string.c (rb_str_hsah), object.c (rb_obj_hash), range.c (range_hash), struct.c (rb_struct_hash), hash.c (rb_any_hash), rational.c (nurat_hash): use Murmurhash. [ruby-dev:37784] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@22317 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- range.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'range.c') diff --git a/range.c b/range.c index 74f9e569f5..4c9fa869f7 100644 --- a/range.c +++ b/range.c @@ -213,14 +213,16 @@ range_eql(VALUE range, VALUE obj) static VALUE range_hash(VALUE range) { - long hash = EXCL(range); + unsigned hash = EXCL(range); VALUE v; + hash = rb_hash_start(hash); v = rb_hash(RANGE_BEG(range)); - hash ^= v << 1; + hash = rb_hash_uint(hash, NUM2LONG(v)); v = rb_hash(RANGE_END(range)); - hash ^= v << 9; - hash ^= EXCL(range) << 24; + hash = rb_hash_uint(hash, NUM2LONG(v)); + hash = rb_hash_uint(hash, EXCL(range) << 24); + hash = rb_hash_end(hash); return LONG2FIX(hash); } -- cgit v1.2.3