From 8b5894cb39fdd90adec4f43c2be7ccb135fdda95 Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 21 Sep 2006 22:52:38 +0000
Subject: * bignum.c (rb_big_hash): use rb_memhash().

* numeric.c (flo_hash): simplified.  klass need not to affect
  resulting hash value.


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10992 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog |  7 +++++++
 bignum.c  | 10 +++-------
 numeric.c |  4 +---
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index f0ae8cef7..23defd152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Fri Sep 22 06:53:22 2006  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* bignum.c (rb_big_hash): use rb_memhash().
+
+	* numeric.c (flo_hash): simplified.  klass need not to affect
+	  resulting hash value.
+
 Fri Sep 22 02:06:26 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* .cvsignore: ignore timestamp files and installed list file.
diff --git a/bignum.c b/bignum.c
index e3e8d80d9..ecf2872f0 100644
--- a/bignum.c
+++ b/bignum.c
@@ -1887,14 +1887,10 @@ rb_big_aref(VALUE x, VALUE y)
 static VALUE
 rb_big_hash(VALUE x)
 {
-    long i, len, key;
-    BDIGIT *digits;
+    int hash;
 
-    key = 0; digits = BDIGITS(x); len = RBIGNUM(x)->len;
-    for (i=0; i<len; i++) {
-	key ^= *digits++;
-    }
-    return LONG2FIX(key);
+    hash = rb_memhash(BDIGITS(x), BITSPERDIG*RBIGNUM(x)->len) ^ RBIGNUM(x)->sign;
+    return INT2FIX(hash);
 }
 
 /*
diff --git a/numeric.c b/numeric.c
index 5a7e1dcff..e812389c3 100644
--- a/numeric.c
+++ b/numeric.c
@@ -839,9 +839,7 @@ flo_hash(VALUE num)
     int hash;
 
     d = RFLOAT(num)->value;
-    if (d == 0) d = fabs(d);
-    hash = rb_memhash(&d, sizeof(d)) ^ RBASIC(num)->klass;
-    if (hash < 0) hash = -hash;
+    hash = rb_memhash(&d, sizeof(d));
     return INT2FIX(hash);
 }
 
-- 
cgit