aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-18 01:22:38 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-18 01:22:38 +0000
commitf8e79c84a90bfa32d4dd00f7d5db756239b084b7 (patch)
tree7d3856ad02f2dbf6bbafe51e1b412ccb22424e92
parent1ba62fa93a200f92a8bd612a14f36a298ac4b3d1 (diff)
downloadruby-f8e79c84a90bfa32d4dd00f7d5db756239b084b7.tar.gz
* bignum.c (rb_big_hash): make it public function to be available in
other source files, and remove documentation comment for Bignum#hash. * bignum.c (Bignum#hash): remove its definition because it is unified with Object#hash. * include/ruby/intern.h (rb_big_hash): add a prototype declaration. * hash.c (any_hash): treat Bignum values directly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54168 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog12
-rw-r--r--bignum.c12
-rw-r--r--hash.c4
-rw-r--r--include/ruby/intern.h1
4 files changed, 18 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f27277892..288da06382 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+Fri Mar 18 10:17:00 2016 Kenta Murata <mrkn@mrkn.jp>
+
+ * bignum.c (rb_big_hash): make it public function to be available in
+ other source files, and remove documentation comment for Bignum#hash.
+
+ * bignum.c (Bignum#hash): remove its definition because it is unified
+ with Object#hash.
+
+ * include/ruby/intern.h (rb_big_hash): add a prototype declaration.
+
+ * hash.c (any_hash): treat Bignum values directly.
+
Fri Mar 18 02:35:12 2016 Naotoshi Seo <sonots@gmail.com>
* lib/time.rb (parse, strptime): Fix Time.parse/strptime does not
diff --git a/bignum.c b/bignum.c
index 5da5813703..45be0b9cb4 100644
--- a/bignum.c
+++ b/bignum.c
@@ -6837,16 +6837,7 @@ rb_big_aref(VALUE x, VALUE y)
return (xds[s1] & bit) ? INT2FIX(1) : INT2FIX(0);
}
-/*
- * call-seq:
- * big.hash -> fixnum
- *
- * Compute a hash based on the value of _big_.
- *
- * See also Object#hash.
- */
-
-static VALUE
+VALUE
rb_big_hash(VALUE x)
{
st_index_t hash;
@@ -7085,7 +7076,6 @@ Init_Bignum(void)
rb_define_method(rb_cBignum, "<=", big_le, 1);
rb_define_method(rb_cBignum, "===", rb_big_eq, 1);
rb_define_method(rb_cBignum, "eql?", rb_big_eql, 1);
- rb_define_method(rb_cBignum, "hash", rb_big_hash, 0);
rb_define_method(rb_cBignum, "to_f", rb_big_to_f, 0);
rb_define_method(rb_cBignum, "abs", rb_big_abs, 0);
rb_define_method(rb_cBignum, "magnitude", rb_big_abs, 0);
diff --git a/hash.c b/hash.c
index 5eebc285af..fa323a1f4e 100644
--- a/hash.c
+++ b/hash.c
@@ -169,6 +169,10 @@ any_hash(VALUE a, st_index_t (*other_func)(VALUE))
else if (BUILTIN_TYPE(a) == T_SYMBOL) {
hnum = RSYMBOL(a)->hashval;
}
+ else if (BUILTIN_TYPE(a) == T_BIGNUM) {
+ hval = rb_big_hash(a);
+ hnum = FIX2LONG(hval);
+ }
else if (BUILTIN_TYPE(a) == T_FLOAT) {
flt:
hval = rb_dbl_hash(rb_float_value(a));
diff --git a/include/ruby/intern.h b/include/ruby/intern.h
index a53cfcb691..643762c3cd 100644
--- a/include/ruby/intern.h
+++ b/include/ruby/intern.h
@@ -133,6 +133,7 @@ VALUE rb_big_lshift(VALUE, VALUE);
VALUE rb_big_rshift(VALUE, VALUE);
VALUE rb_big_odd_p(VALUE);
VALUE rb_big_even_p(VALUE);
+VALUE rb_big_hash(VALUE);
/* For rb_integer_pack and rb_integer_unpack: */
/* "MS" in MSWORD and MSBYTE means "most significant" */