* hash.c (rb_any_hash): shrinks all results in Fixnum range.

  [ruby-core:15713]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@15672 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

3 files changed, 14 insertions, 6 deletions

diff --git a/ChangeLog b/ChangeLog
index 7e2c5ffe8..afb57284c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Mar  3 16:14:24 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* hash.c (rb_any_hash): shrinks all results in Fixnum range.
+	  [ruby-core:15713]
+
 Sun Mar  2 23:03:59 2008  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* io.c (rb_io_ungetc): reduce redundant call.
diff --git a/hash.c b/hash.c
index 578e4cd39..eca3e5c6a 100644
--- a/hash.c
+++ b/hash.c
@@ -75,15 +75,16 @@ static int
 rb_any_hash(VALUE a)
 {
     VALUE hval;
+    int hnum;
 
     switch (TYPE(a)) {
       case T_FIXNUM:
       case T_SYMBOL:
-	return (int)a;
+	hnum = (int)a;
 	break;
 
       case T_STRING:
-	return rb_str_hash(a);
+	hnum = rb_str_hash(a);
 	break;
 
       default:
@@ -91,8 +92,10 @@ rb_any_hash(VALUE a)
 	if (!FIXNUM_P(hval)) {
 	    hval = rb_funcall(hval, '%', 1, INT2FIX(536870923));
 	}
-	return (int)FIX2LONG(hval);
+	hnum = (int)FIX2LONG(hval);
     }
+    hnum <<= 1;
+    return RSHIFT(hnum, 1);
 }
 
 static const struct st_hash_type objhash = {
diff --git a/version.h b/version.h
index 4ca001832..c4d006b45 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
 #define RUBY_VERSION "1.9.0"
-#define RUBY_RELEASE_DATE "2008-03-02"
+#define RUBY_RELEASE_DATE "2008-03-03"
 #define RUBY_VERSION_CODE 190
-#define RUBY_RELEASE_CODE 20080302
+#define RUBY_RELEASE_CODE 20080303
 #define RUBY_PATCHLEVEL 0
 
 #define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
 #define RUBY_VERSION_TEENY 0
 #define RUBY_RELEASE_YEAR 2008
 #define RUBY_RELEASE_MONTH 3
-#define RUBY_RELEASE_DAY 2
+#define RUBY_RELEASE_DAY 3
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];