Merge pull request #1322 from suzukaze/refactor-range-c

Refactor range_eql() func in rangec.c and add Range#eql? method test.

2 files changed, 19 insertions, 24 deletions

diff --git a/src/range.c b/src/range.c
index 43de0e799..73d532d94 100644
--- a/src/range.c
+++ b/src/range.c
@@ -377,34 +377,23 @@ range_eql(mrb_state *mrb, mrb_value range)
 {
   mrb_value obj;
   struct RRange *r, *o;
-  mrb_bool eql_p;
 
   mrb_get_args(mrb, "o", &obj);
-  if (mrb_obj_equal(mrb, range, obj)) {
-    eql_p = 1;
-  }
-  else if (!mrb_obj_is_kind_of(mrb, obj, RANGE_CLASS)) {
-    eql_p = 0;
-  }
-  else {
-    r = mrb_range_ptr(range);
-    if (mrb_type(obj) != MRB_TT_RANGE) {
-      eql_p = 0;
-    }
-    else {
-      o = mrb_range_ptr(obj);
-      if (!mrb_eql(mrb, r->edges->beg, o->edges->beg) ||
-          !mrb_eql(mrb, r->edges->end, o->edges->end) ||
-          (r->excl != o->excl)) {
-        eql_p = 0;
-      }
-      else {
-        eql_p = 1;
-      }
-    }
+
+  if (mrb_obj_equal(mrb, range, obj)) return mrb_true_value();
+  if (!mrb_obj_is_kind_of(mrb, obj, RANGE_CLASS)) {
+    return mrb_false_value();
   }
+  if (mrb_type(obj) != MRB_TT_RANGE) return mrb_false_value();
 
-  return mrb_bool_value(eql_p);
+  r = mrb_range_ptr(range);
+  o = mrb_range_ptr(obj);
+  if (!mrb_eql(mrb, r->edges->beg, o->edges->beg) ||
+      !mrb_eql(mrb, r->edges->end, o->edges->end) ||
+      (r->excl != o->excl)) {
+    return mrb_false_value();
+  }
+  return mrb_true_value();
 }
 
 /* 15.2.14.4.15(x) */
diff --git a/test/t/range.rb b/test/t/range.rb
index fdf6b415c..4d0d4cddd 100644
--- a/test/t/range.rb
+++ b/test/t/range.rb
@@ -72,3 +72,9 @@ assert('Range#member?', '15.2.14.4.11') do
   assert_true a.member?(5)
   assert_false a.member?(20)
 end
+
+assert('Range#eql?', '15.2.14.4.14') do
+  assert_true (1..10).eql? (1..10)
+  assert_false (1..10).eql? (1..100)
+  assert_false (1..10).eql? "1..10"
+end