merge revision(s) 60666,60667,60668: [Backport #14082]
Fix size on Enumerable#cycle when the size is 0 [Bug #14082]. Patch by Kenichi Kamiya test/ruby/test_lazy_enumerator.rb: test for [Bug #14082] enum.c: check argument first * enum.c (enum_cycle_size): check an argument before the size of the receiver, if it is given. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62827 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
091f98cf8c
commit
f8b4df93d2
15
ChangeLog
15
ChangeLog
|
@ -1,3 +1,18 @@
|
|||
Mon Mar 19 00:32:31 2018 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* test/ruby/test_lazy_enumerator.rb: test for [Bug #14082]
|
||||
|
||||
enum.c: check argument first
|
||||
|
||||
* enum.c (enum_cycle_size): check an argument before the size of the
|
||||
receiver, if it is given.
|
||||
|
||||
Mon Mar 19 00:32:31 2018 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
|
||||
|
||||
Fix size on Enumerable#cycle when the size is 0 [Bug #14082].
|
||||
|
||||
Patch by Kenichi Kamiya
|
||||
|
||||
Mon Mar 19 00:28:28 2018 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* parse.y (parser_here_document): an escaped newline is not an
|
||||
|
|
14
enum.c
14
enum.c
|
@ -2678,17 +2678,19 @@ cycle_i(RB_BLOCK_CALL_FUNC_ARGLIST(i, ary))
|
|||
static VALUE
|
||||
enum_cycle_size(VALUE self, VALUE args, VALUE eobj)
|
||||
{
|
||||
long mul;
|
||||
long mul = 0;
|
||||
VALUE n = Qnil;
|
||||
VALUE size = enum_size(self, args, 0);
|
||||
|
||||
if (size == Qnil) return Qnil;
|
||||
VALUE size;
|
||||
|
||||
if (args && (RARRAY_LEN(args) > 0)) {
|
||||
n = RARRAY_AREF(args, 0);
|
||||
if (!NIL_P(n)) mul = NUM2LONG(n);
|
||||
}
|
||||
if (n == Qnil) return DBL2NUM(INFINITY);
|
||||
mul = NUM2LONG(n);
|
||||
|
||||
size = enum_size(self, args, 0);
|
||||
if (NIL_P(size) || size == INT2FIX(0)) return size;
|
||||
|
||||
if (NIL_P(n)) return DBL2NUM(INFINITY);
|
||||
if (mul <= 0) return INT2FIX(0);
|
||||
return rb_funcall(size, '*', 1, LONG2FIX(mul));
|
||||
}
|
||||
|
|
|
@ -575,13 +575,22 @@ class TestEnumerator < Test::Unit::TestCase
|
|||
assert_equal Float::INFINITY, [:foo].cycle.size
|
||||
assert_equal 10, [:foo, :bar].cycle(5).size
|
||||
assert_equal 0, [:foo, :bar].cycle(-10).size
|
||||
assert_equal Float::INFINITY, {foo: 1}.cycle.size
|
||||
assert_equal 10, {foo: 1, bar: 2}.cycle(5).size
|
||||
assert_equal 0, {foo: 1, bar: 2}.cycle(-10).size
|
||||
assert_equal 0, [].cycle.size
|
||||
assert_equal 0, [].cycle(5).size
|
||||
assert_equal 0, {}.cycle.size
|
||||
assert_equal 0, {}.cycle(5).size
|
||||
|
||||
assert_equal nil, @obj.cycle.size
|
||||
assert_equal nil, @obj.cycle(5).size
|
||||
assert_equal Float::INFINITY, @sized.cycle.size
|
||||
assert_equal 126, @sized.cycle(3).size
|
||||
assert_equal Float::INFINITY, [].to_enum { 42 }.cycle.size
|
||||
assert_equal 0, [].to_enum { 0 }.cycle.size
|
||||
|
||||
assert_raise(TypeError) {[].to_enum { 0 }.cycle("").size}
|
||||
end
|
||||
|
||||
def test_size_for_loops
|
||||
|
|
|
@ -480,6 +480,15 @@ EOS
|
|||
assert_equal Float::INFINITY, loop.lazy.cycle.size
|
||||
assert_equal nil, lazy.select{}.cycle(4).size
|
||||
assert_equal nil, lazy.select{}.cycle.size
|
||||
|
||||
class << (obj = Object.new)
|
||||
def each; end
|
||||
def size; 0; end
|
||||
include Enumerable
|
||||
end
|
||||
lazy = obj.lazy
|
||||
assert_equal 0, lazy.cycle.size
|
||||
assert_raise(TypeError) {lazy.cycle("").size}
|
||||
end
|
||||
|
||||
def test_map_zip
|
||||
|
|
Loading…
Reference in New Issue