diff options
| -rw-r--r-- | ChangeLog | 12 | ||||
| -rw-r--r-- | bignum.c | 12 | ||||
| -rw-r--r-- | hash.c | 4 | ||||
| -rw-r--r-- | include/ruby/intern.h | 1 | ||||
| -rw-r--r-- | version.h | 8 |
5 files changed, 22 insertions, 15 deletions
@@ -1,3 +1,15 @@ +Wed Jul 6 23:02:03 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 Jun 10 17:48:51 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * lib/optparse.rb (OptionParser::Completion.candidate): get rid of @@ -6780,16 +6780,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; @@ -7028,7 +7019,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); @@ -153,6 +153,10 @@ rb_any_hash(VALUE a) else if (BUILTIN_TYPE(a) == T_SYMBOL) { return 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 00474a739b..3af7ecad89 100644 --- a/include/ruby/intern.h +++ b/include/ruby/intern.h @@ -131,6 +131,7 @@ VALUE rb_big_or(VALUE, VALUE); VALUE rb_big_xor(VALUE, VALUE); VALUE rb_big_lshift(VALUE, VALUE); VALUE rb_big_rshift(VALUE, VALUE); +VALUE rb_big_hash(VALUE); /* For rb_integer_pack and rb_integer_unpack: */ /* "MS" in MSWORD and MSBYTE means "most significant" */ @@ -1,10 +1,10 @@ #define RUBY_VERSION "2.2.6" -#define RUBY_RELEASE_DATE "2016-06-10" -#define RUBY_PATCHLEVEL 340 +#define RUBY_RELEASE_DATE "2016-07-06" +#define RUBY_PATCHLEVEL 341 #define RUBY_RELEASE_YEAR 2016 -#define RUBY_RELEASE_MONTH 6 -#define RUBY_RELEASE_DAY 10 +#define RUBY_RELEASE_MONTH 7 +#define RUBY_RELEASE_DAY 6 #include "ruby/version.h" |