range.c: consider exclusive

* range.c (range_last): exclude the last number of the exclusive range
  if the end is Numeric.  [ruby-dev:47587] [Bug #8739]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@42400 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2013-08-06 08:42:51 +00:00
parent b0391268a2
commit 2743b0d608
3 changed files with 26 additions and 1 deletions

10
range.c
View file

@ -887,7 +887,15 @@ range_first(int argc, VALUE *argv, VALUE range)
static VALUE
range_last(int argc, VALUE *argv, VALUE range)
{
if (argc == 0) return RANGE_END(range);
if (argc == 0) {
VALUE e = RANGE_END(range);
if (!EXCL(range)) return e; /* inclusive, the end is the last */
/* exclusive, the last is previous to the end */
if (FIXNUM_P(e) || rb_obj_is_kind_of(e, rb_cNumeric))
return rb_int_pred(e);
/* fallback to Array */
}
return rb_ary_last(argc, argv, rb_Array(range));
}