diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:06:35 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-20 09:06:35 +0000 |
commit | 0ddc8305736610337d6c26b3cec2c767cc5a054c (patch) | |
tree | e3a9880f73be06acc8e852899f6caa3ac8575c5f /array.c | |
parent | 7340277cfb06305590a62a505c49e63a491be20c (diff) |
merges r23557 and r23563 from trunk into ruby_1_9_1.
--
* thread.c (rb_exec_recursive_paired): new function for proper
handling of recursive arrays. [EXPERIMENTAL] [ruby-core:23402]
* array.c (rb_ary_equal, rb_ary_eql, rb_ary_cmp): use above.
* hash.c (hash_equal): ditto.
--
* test/ruby/test_hash.rb (TestHash::test_equal2): recursive hashes
are handled properly now. ref: [ruby-core:23402]
* test/ruby/test_m17n.rb (TestM17N#test_sprintf_p): test fixed
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23759 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'array.c')
-rw-r--r-- | array.c | 12 |
1 files changed, 6 insertions, 6 deletions
@@ -2656,7 +2656,7 @@ recursive_equal(VALUE ary1, VALUE ary2, int recur) { long i; - if (recur) return Qfalse; + if (recur) return Qtrue; /* Subtle! */ for (i=0; i<RARRAY_LEN(ary1); i++) { if (!rb_equal(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i))) return Qfalse; @@ -2689,7 +2689,7 @@ rb_ary_equal(VALUE ary1, VALUE ary2) return rb_equal(ary2, ary1); } if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; - return rb_exec_recursive(recursive_equal, ary1, ary2); + return rb_exec_recursive_paired(recursive_equal, ary1, ary2, ary2); } static VALUE @@ -2697,7 +2697,7 @@ recursive_eql(VALUE ary1, VALUE ary2, int recur) { long i; - if (recur) return Qfalse; + if (recur) return Qtrue; /* Subtle! */ for (i=0; i<RARRAY_LEN(ary1); i++) { if (!rb_eql(rb_ary_elt(ary1, i), rb_ary_elt(ary2, i))) return Qfalse; @@ -2719,7 +2719,7 @@ rb_ary_eql(VALUE ary1, VALUE ary2) if (ary1 == ary2) return Qtrue; if (TYPE(ary2) != T_ARRAY) return Qfalse; if (RARRAY_LEN(ary1) != RARRAY_LEN(ary2)) return Qfalse; - return rb_exec_recursive(recursive_eql, ary1, ary2); + return rb_exec_recursive_paired(recursive_eql, ary1, ary2, ary2); } static VALUE @@ -2786,7 +2786,7 @@ recursive_cmp(VALUE ary1, VALUE ary2, int recur) { long i, len; - if (recur) return Qnil; + if (recur) return Qundef; /* Subtle! */ len = RARRAY_LEN(ary1); if (len > RARRAY_LEN(ary2)) { len = RARRAY_LEN(ary2); @@ -2828,7 +2828,7 @@ rb_ary_cmp(VALUE ary1, VALUE ary2) ary2 = to_ary(ary2); if (ary1 == ary2) return INT2FIX(0); - v = rb_exec_recursive(recursive_cmp, ary1, ary2); + v = rb_exec_recursive_paired(recursive_cmp, ary1, ary2, ary2); if (v != Qundef) return v; len = RARRAY_LEN(ary1) - RARRAY_LEN(ary2); if (len == 0) return INT2FIX(0); |