From 2743b0d6082561a55c6a0d0843201f2413de93f3 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 6 Aug 2013 08:42:51 +0000
Subject: 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
---
 range.c | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'range.c')

diff --git a/range.c b/range.c
index 8fa7dcb..c805848 100644
--- a/range.c
+++ b/range.c
@@ -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));
 }
 
-- 
cgit v1.1