1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merge revision(s) 54168: [Backport #12391]

* 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/branches/ruby_2_3@55633 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2016-07-11 13:50:32 +00:00
parent 840a4573af
commit 7dafaea0ef
5 changed files with 21 additions and 4 deletions

View file

@ -1,3 +1,15 @@
Mon Jul 11 22:35: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.
Sat Jul 2 04:00:50 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* string.c (tr_trans): consider terminator length and fix heap

View file

@ -6804,7 +6804,7 @@ rb_big_aref(VALUE x, VALUE y)
* See also Object#hash.
*/
static VALUE
VALUE
rb_big_hash(VALUE x)
{
st_index_t hash;

4
hash.c
View file

@ -153,6 +153,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));

View file

@ -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" */

View file

@ -1,10 +1,10 @@
#define RUBY_VERSION "2.3.2"
#define RUBY_RELEASE_DATE "2016-07-02"
#define RUBY_PATCHLEVEL 137
#define RUBY_RELEASE_DATE "2016-07-11"
#define RUBY_PATCHLEVEL 138
#define RUBY_RELEASE_YEAR 2016
#define RUBY_RELEASE_MONTH 7
#define RUBY_RELEASE_DAY 2
#define RUBY_RELEASE_DAY 11
#include "ruby/version.h"