diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-22 02:58:39 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-06-22 02:58:39 +0000 |
commit | 342619300ce26f9a134249002270c5d38d5993b3 (patch) | |
tree | e5596f52d92004847655de82aac3c5512a4462a9 | |
parent | c19ecf05b4c728951e1a1e223a40ae6883a4f8e0 (diff) |
range.c: Range#size now returns Float::INFINITY if it is endless
Fixes [Bug #14699]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63715 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | range.c | 10 | ||||
-rw-r--r-- | test/ruby/test_range.rb | 4 |
2 files changed, 10 insertions, 4 deletions
@@ -749,9 +749,15 @@ static VALUE range_size(VALUE range) { VALUE b = RANGE_BEG(range), e = RANGE_END(range); - if (rb_obj_is_kind_of(b, rb_cNumeric) && rb_obj_is_kind_of(e, rb_cNumeric)) { - return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range)); + if (rb_obj_is_kind_of(b, rb_cNumeric)) { + if (rb_obj_is_kind_of(e, rb_cNumeric)) { + return ruby_num_interval_step_size(b, e, INT2FIX(1), EXCL(range)); + } + if (NIL_P(e)) { + return DBL2NUM(HUGE_VAL); + } } + return Qnil; } diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index 3cbd155d84..a57cf18bbf 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -582,8 +582,8 @@ class TestRange < Test::Unit::TestCase assert_equal 42, (1..42).each.size assert_nil ("a"..."z").size - assert_nil (1...).size - assert_nil (1.0...).size + assert_equal Float::INFINITY, (1...).size + assert_equal Float::INFINITY, (1.0...).size assert_nil ("a"...).size end |