* range.c (range_include): return false unless included in numeric

  range.  fixed: [ruby-dev:27975]


git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@9659 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 4 insertions, 5 deletions

diff --git a/range.c b/range.c
index d18b4efe0..fadcfb41a 100644
--- a/range.c
+++ b/range.c
@@ -625,8 +625,9 @@ range_include(VALUE range, VALUE val)
 	     rb_obj_is_kind_of(beg, rb_cNumeric) ||
 	     rb_obj_is_kind_of(end, rb_cNumeric);
 
-    if (nv) {
-      numeric_range:
+    if (nv ||
+	!NIL_P(rb_check_to_integer(beg, "to_int")) ||
+	!NIL_P(rb_check_to_integer(end, "to_int"))) {
 	if (r_le(beg, val)) {
 	    if (EXCL(range)) {
 		if (r_lt(val, end)) return Qtrue;
@@ -635,10 +636,8 @@ range_include(VALUE range, VALUE val)
 		if (r_le(val, end)) return Qtrue;
 	    }
 	}
+	return Qfalse;
     }
-    if (!NIL_P(rb_check_to_integer(beg, "to_int")) ||
-	!NIL_P(rb_check_to_integer(end, "to_int")))
-	goto numeric_range;
     return rb_call_super(1, &val);
 }