1 files changed, 20 insertions, 15 deletions

diff --git a/src/range.c b/src/range.c
index 42e3275d4..976db6491 100644
--- a/src/range.c
+++ b/src/range.c
@@ -152,25 +152,30 @@ mrb_range_eq(mrb_state *mrb, mrb_value range)
   struct RRange *rr;
   struct RRange *ro;
   mrb_value obj;
+  mrb_bool eq_p;
 
   mrb_get_args(mrb, "o", &obj);
 
-  if (mrb_obj_equal(mrb, range, obj)) return mrb_true_value();
-
-  /* same class? */
-  if (!mrb_obj_is_instance_of(mrb, obj, mrb_obj_class(mrb, range)))
-    return mrb_false_value();
-
-  rr = mrb_range_ptr(range);
-  ro = mrb_range_ptr(obj);
-  if (!mrb_obj_equal(mrb, rr->edges->beg, ro->edges->beg))
-    return mrb_false_value();
-  if (!mrb_obj_equal(mrb, rr->edges->end, ro->edges->end))
-    return mrb_false_value();
-  if (rr->excl != ro->excl)
-    return mrb_false_value();
+  if (mrb_obj_equal(mrb, range, obj)) {
+    eq_p = 1;
+  }
+  else if (!mrb_obj_is_instance_of(mrb, obj, mrb_obj_class(mrb, range))) { /* same class? */
+    eq_p = 0;
+  }
+  else {
+    rr = mrb_range_ptr(range);
+    ro = mrb_range_ptr(obj);
+    if (!mrb_obj_equal(mrb, rr->edges->beg, ro->edges->beg) ||
+        !mrb_obj_equal(mrb, rr->edges->end, ro->edges->end) ||
+        rr->excl != ro->excl) {
+      eq_p = 0;
+    }
+    else {
+      eq_p = 1;
+    }
+  }
 
-  return mrb_true_value();
+  return mrb_true_or_false_value(eq_p);
 }
 
 static int