diff options
author | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-20 02:14:02 +0000 |
---|---|---|
committer | marcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-09-20 02:14:02 +0000 |
commit | 0ebfc1348bdf3f571e15438fb6cea1c4e71aae29 (patch) | |
tree | 02f409949edcc691c3105e403b9d9d28f09d6b90 /range.c | |
parent | 8892dd725744f2b58afefedb6640e28a6ff83872 (diff) | |
download | ruby-0ebfc1348bdf3f571e15438fb6cea1c4e71aae29.tar.gz |
* struct.c (rb_struct_equal, rb_struct_eql): Handle comparison of recursive structures [ruby-core:24759]
* range.c (range_eq, range_eql): ditto for ranges
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25010 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'range.c')
-rw-r--r-- | range.c | 49 |
1 files changed, 30 insertions, 19 deletions
@@ -105,6 +105,20 @@ range_exclude_end_p(VALUE range) return EXCL(range) ? Qtrue : Qfalse; } +static VALUE +recursive_equal(VALUE range, VALUE obj, int recur) +{ + if (recur) return Qtrue; /* Subtle! */ + if (!rb_equal(RANGE_BEG(range), RANGE_BEG(obj))) + return Qfalse; + if (!rb_equal(RANGE_END(range), RANGE_END(obj))) + return Qfalse; + + if (EXCL(range) != EXCL(obj)) + return Qfalse; + return Qtrue; +} + /* * call-seq: @@ -128,15 +142,7 @@ range_eq(VALUE range, VALUE obj) if (!rb_obj_is_kind_of(obj, rb_cRange)) return Qfalse; - if (!rb_equal(RANGE_BEG(range), RANGE_BEG(obj))) - return Qfalse; - if (!rb_equal(RANGE_END(range), RANGE_END(obj))) - return Qfalse; - - if (EXCL(range) != EXCL(obj)) - return Qfalse; - - return Qtrue; + return rb_exec_recursive_paired(recursive_equal, range, obj, obj); } static int @@ -168,6 +174,20 @@ r_le(VALUE a, VALUE b) } +static VALUE +recursive_eql(VALUE range, VALUE obj, int recur) +{ + if (recur) return Qtrue; /* Subtle! */ + if (!rb_eql(RANGE_BEG(range), RANGE_BEG(obj))) + return Qfalse; + if (!rb_eql(RANGE_END(range), RANGE_END(obj))) + return Qfalse; + + if (EXCL(range) != EXCL(obj)) + return Qfalse; + return Qtrue; +} + /* * call-seq: * rng.eql?(obj) => true or false @@ -189,16 +209,7 @@ range_eql(VALUE range, VALUE obj) return Qtrue; if (!rb_obj_is_kind_of(obj, rb_cRange)) return Qfalse; - - if (!rb_eql(RANGE_BEG(range), RANGE_BEG(obj))) - return Qfalse; - if (!rb_eql(RANGE_END(range), RANGE_END(obj))) - return Qfalse; - - if (EXCL(range) != EXCL(obj)) - return Qfalse; - - return Qtrue; + return rb_exec_recursive_paired(recursive_eql, range, obj, obj); } static VALUE |