1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

range.c: Range#last and #max raises a RangeError if it is endless

Browse Source 
Also, Range#min raises an error if it is endless and a comparison method
is specified.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63716 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2018-06-22 02:58:40 +00:00
parent 342619300c
commit cae4517419
2 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
range.c
View File

@ -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);

10
test/ruby/test_range.rb
View File

@ -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