diff options
| -rw-r--r-- | range.c | 10 | ||||
| -rw-r--r-- | test/ruby/test_range.rb | 10 |
2 files changed, 15 insertions, 5 deletions
@@ -1013,6 +1013,9 @@ range_first(int argc, VALUE *argv, VALUE range) static VALUE range_last(int argc, VALUE *argv, VALUE range) { + if (NIL_P(RANGE_END(range))) { + rb_raise(rb_eRangeError, "cannot get the last element of endless range"); + } if (argc == 0) return RANGE_END(range); return rb_ary_last(argc, argv, rb_Array(range)); } @@ -1040,6 +1043,9 @@ static VALUE range_min(int argc, VALUE *argv, VALUE range) { if (rb_block_given_p()) { + if (NIL_P(RANGE_END(range))) { + rb_raise(rb_eRangeError, "cannot get the minimum of endless range with custom comparison method"); + } return rb_call_super(argc, argv); } else if (argc != 0) { @@ -1080,7 +1086,9 @@ range_max(int argc, VALUE *argv, VALUE range) VALUE e = RANGE_END(range); int nm = FIXNUM_P(e) || rb_obj_is_kind_of(e, rb_cNumeric); - if (NIL_P(e)) return Qnil; + if (NIL_P(RANGE_END(range))) { + rb_raise(rb_eRangeError, "cannot get the maximum of endless range"); + } if (rb_block_given_p() || (EXCL(range) && !nm) || argc) { return rb_call_super(argc, argv); diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index a57cf18bbf..cc9e67053c 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -99,8 +99,8 @@ class TestRange < Test::Unit::TestCase assert_equal(2, (1..2).max) assert_equal(nil, (2..1).max) assert_equal(1, (1...2).max) - assert_equal(nil, (1..).max) - assert_equal(nil, (1...).max) + assert_raise(RangeError) { (1..).max } + assert_raise(RangeError) { (1...).max } assert_equal(2.0, (1.0..2.0).max) assert_equal(nil, (2.0..1.0).max) @@ -115,7 +115,8 @@ class TestRange < Test::Unit::TestCase assert_equal([10,9,8], (0..10).max(3)) assert_equal([9,8,7], (0...10).max(3)) - # XXX: How should (0...).max(3) behave? + assert_raise(RangeError) { (1..).max(3) } + assert_raise(RangeError) { (1...).max(3) } end def test_initialize_twice @@ -405,7 +406,8 @@ class TestRange < Test::Unit::TestCase assert_equal([0, 1, 2], (0..nil).first(3)) assert_equal(0, (0..nil).first) assert_equal("a", ("a"..nil).first) - # XXX: How should (0...).last(3) behave? + assert_raise(RangeError) { (0..nil).last } + assert_raise(RangeError) { (0..nil).last(3) } end def test_to_s |