summaryrefslogtreecommitdiff
path: root/range.c
diff options
context:
space:
mode:
Diffstat (limited to 'range.c')
-rw-r--r--range.c21
1 files changed, 3 insertions, 18 deletions
diff --git a/range.c b/range.c
index 124d9faa51..5e1103ce57 100644
--- a/range.c
+++ b/range.c
@@ -1235,13 +1235,6 @@ range_max(int argc, VALUE *argv, VALUE range)
if (c > 0)
return Qnil;
if (EXCL(range)) {
- if (RB_INTEGER_TYPE_P(b) && !RB_INTEGER_TYPE_P(e)) {
- VALUE end = e;
- e = rb_funcall(e, rb_intern("floor"), 0);
- if (!RTEST(rb_funcall(e, rb_intern("=="), 1, end))) {
- return e;
- }
- }
if (!RB_INTEGER_TYPE_P(e)) {
rb_raise(rb_eTypeError, "cannot exclude non Integer end value");
}
@@ -1254,9 +1247,6 @@ range_max(int argc, VALUE *argv, VALUE range)
}
return rb_funcall(e, '-', 1, INT2FIX(1));
}
- if (RB_INTEGER_TYPE_P(b) && !RB_INTEGER_TYPE_P(e)) {
- e = rb_funcall(e, rb_intern("floor"), 0);
- }
return e;
}
}
@@ -1604,14 +1594,9 @@ r_cover_range_p(VALUE range, VALUE beg, VALUE end, VALUE val)
else if (cmp_end >= 0) {
return TRUE;
}
- if (RB_INTEGER_TYPE_P(val_beg) && RB_INTEGER_TYPE_P(beg) &&
- RB_INTEGER_TYPE_P(val_end) != RB_INTEGER_TYPE_P(end)) {
- val_max = val_end;
- }
- else {
- val_max = rb_rescue2(r_call_max, val, 0, Qnil, rb_eTypeError, (VALUE)0);
- if (val_max == Qnil) return FALSE;
- }
+
+ val_max = rb_rescue2(r_call_max, val, 0, Qnil, rb_eTypeError, (VALUE)0);
+ if (val_max == Qnil) return FALSE;
return r_less(end, val_max) >= 0;
}