merges r25010 from trunk into ruby_1_9_1 and adds tests for it.

--
* 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
--
test for r25010
* test/ruby/test_struct.rb (TestStruct#test_comparison_when_recursive):
  new test.
* test/ruby/test_range.rb (TestRange#test_comparison_when_recursive):
  new test.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25943 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 30 insertions, 19 deletions

diff --git a/range.c b/range.c
index 1e66bba856..1e68dbaff9 100644
--- a/range.c
+++ b/range.c
@@ -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);
 }
 
 /*