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

* hash.c (hash_equal): should call rb_eql when argument eql is set.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@13474 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2007-09-20 17:03:41 +00:00
parent bf6575ef62
commit f4d9d3d39b
3 changed files with 11 additions and 4 deletions

View file

@ -1,3 +1,7 @@
Fri Sep 21 02:02:34 2007 Yukihiro Matsumoto <matz@ruby-lang.org>
* hash.c (hash_equal): should call rb_eql when argument eql is set.
Thu Sep 20 17:28:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> Thu Sep 20 17:28:00 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* io.c (popen_exec), process.c (rb_spawn): stop other threads before * io.c (popen_exec), process.c (rb_spawn): stop other threads before

5
hash.c
View file

@ -1398,7 +1398,10 @@ hash_equal(VALUE hash1, VALUE hash2, int eql)
if (!rb_respond_to(hash2, rb_intern("to_hash"))) { if (!rb_respond_to(hash2, rb_intern("to_hash"))) {
return Qfalse; return Qfalse;
} }
return rb_equal(hash2, hash1); if (eql)
return rb_eql(hash2, hash1);
else
return rb_equal(hash2, hash1);
} }
if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2)) if (RHASH_SIZE(hash1) != RHASH_SIZE(hash2))
return Qfalse; return Qfalse;

View file

@ -1,7 +1,7 @@
#define RUBY_VERSION "1.9.0" #define RUBY_VERSION "1.9.0"
#define RUBY_RELEASE_DATE "2007-09-20" #define RUBY_RELEASE_DATE "2007-09-21"
#define RUBY_VERSION_CODE 190 #define RUBY_VERSION_CODE 190
#define RUBY_RELEASE_CODE 20070920 #define RUBY_RELEASE_CODE 20070921
#define RUBY_PATCHLEVEL 0 #define RUBY_PATCHLEVEL 0
#define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MAJOR 1
@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 0 #define RUBY_VERSION_TEENY 0
#define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_YEAR 2007
#define RUBY_RELEASE_MONTH 9 #define RUBY_RELEASE_MONTH 9
#define RUBY_RELEASE_DAY 20 #define RUBY_RELEASE_DAY 21
#ifdef RUBY_EXTERN #ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_version[];