diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-13 01:00:08 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-03-13 01:00:08 +0000 |
commit | 0faf01862435676ba15552b99f282ba49dba620a (patch) | |
tree | 163440687c2a808fcab7ddecbf4e14fea3889818 | |
parent | 3438cfa729bc89514890584660d6287982986017 (diff) |
Bug Fix Enumerator::Lazy#uniq state for multiple call
* enumerator.c (lazy_uniq_i): create new hash for each calls.
[Fix GH-1820]
Currently
2.5.0-preview1 :001 > arr = (0..100).lazy.uniq{|i| i % 10}
=> #<Enumerator::Lazy: #<Enumerator::Lazy: 0..100>:uniq>
2.5.0-preview1 :002 > arr.to_a
=> [0, 1, 2, 3, 4, 5, 6, 7, 8, 9]
2.5.0-preview1 :003 > arr.to_a
=> []
Expected
arr.to_a to always return same output
From: Anmol Chopra <anmolchopra@rocketbox.in>
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62731 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | enumerator.c | 21 | ||||
-rw-r--r-- | spec/ruby/core/enumerator/lazy/uniq_spec.rb | 31 | ||||
-rw-r--r-- | test/ruby/test_enumerator.rb | 9 | ||||
-rw-r--r-- | test/ruby/test_lazy_enumerator.rb | 9 |
4 files changed, 61 insertions, 9 deletions
diff --git a/enumerator.c b/enumerator.c index ba470a4492..4c20ca08d4 100644 --- a/enumerator.c +++ b/enumerator.c @@ -2240,27 +2240,35 @@ lazy_drop_while(VALUE obj) } static VALUE -lazy_uniq_i(VALUE i, VALUE hash, int argc, const VALUE *argv, VALUE yielder) +lazy_uniq_i(VALUE i, int argc, const VALUE *argv, VALUE yielder) { + VALUE hash; + + hash = rb_attr_get(yielder, id_memo); + if (NIL_P(hash)) { + hash = rb_obj_hide(rb_hash_new()); + rb_ivar_set(yielder, id_memo, hash); + } + if (rb_hash_add_new_element(hash, i, Qfalse)) return Qnil; return rb_funcallv(yielder, id_yield, argc, argv); } static VALUE -lazy_uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) +lazy_uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, m)) { VALUE yielder = (--argc, *argv++); i = rb_enum_values_pack(argc, argv); - return lazy_uniq_i(i, hash, argc, argv, yielder); + return lazy_uniq_i(i, argc, argv, yielder); } static VALUE -lazy_uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, hash)) +lazy_uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, m)) { VALUE yielder = (--argc, *argv++); i = rb_yield_values2(argc, argv); - return lazy_uniq_i(i, hash, argc, argv, yielder); + return lazy_uniq_i(i, argc, argv, yielder); } static VALUE @@ -2268,9 +2276,8 @@ lazy_uniq(VALUE obj) { rb_block_call_func *const func = rb_block_given_p() ? lazy_uniq_iter : lazy_uniq_func; - VALUE hash = rb_obj_hide(rb_hash_new()); return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj, - func, hash), + func, 0), 0, 0); } diff --git a/spec/ruby/core/enumerator/lazy/uniq_spec.rb b/spec/ruby/core/enumerator/lazy/uniq_spec.rb index ca74cf4062..d31e816faf 100644 --- a/spec/ruby/core/enumerator/lazy/uniq_spec.rb +++ b/spec/ruby/core/enumerator/lazy/uniq_spec.rb @@ -3,6 +3,26 @@ require_relative 'fixtures/classes' ruby_version_is '2.4' do describe 'Enumerator::Lazy#uniq' do + context 'without block' do + before :each do + @lazy = [0, 1, 0, 1].to_enum.lazy.uniq + end + + it 'returns a lazy enumerator' do + @lazy.should be_an_instance_of(Enumerator::Lazy) + @lazy.force.should == [0, 1] + end + + it 'return same value after rewind' do + @lazy.force.should == [0, 1] + @lazy.force.should == [0, 1] + end + + it 'sets the size to nil' do + @lazy.size.should == nil + end + end + context 'when yielded with an argument' do before :each do @lazy = [0, 1, 2, 3].to_enum.lazy.uniq(&:even?) @@ -13,6 +33,11 @@ ruby_version_is '2.4' do @lazy.force.should == [0, 1] end + it 'return same value after rewind' do + @lazy.force.should == [0, 1] + @lazy.force.should == [0, 1] + end + it 'sets the size to nil' do @lazy.size.should == nil end @@ -31,6 +56,12 @@ ruby_version_is '2.4' do @lazy = enum.lazy end + it 'return same value after rewind' do + enum = @lazy.uniq { |_, label| label.downcase } + enum.force.should == [[0, 'foo'], [2, 'bar']] + enum.force.should == [[0, 'foo'], [2, 'bar']] + end + it 'returns all yield arguments as an array' do @lazy.uniq { |_, label| label.downcase }.force.should == [[0, 'foo'], [2, 'bar']] end diff --git a/test/ruby/test_enumerator.rb b/test/ruby/test_enumerator.rb index 86cab539ab..1889f58b69 100644 --- a/test/ruby/test_enumerator.rb +++ b/test/ruby/test_enumerator.rb @@ -657,8 +657,13 @@ class TestEnumerator < Test::Unit::TestCase end def test_uniq - assert_equal([1, 2, 3, 4, 5, 10], - (1..Float::INFINITY).lazy.uniq{|x| (x**2) % 10 }.first(6)) + u = [0, 1, 0, 1].to_enum.lazy.uniq + assert_equal([0, 1], u.force) + assert_equal([0, 1], u.force) + + u = (1..Float::INFINITY).lazy.uniq{|x| (x**2) % 10 } + assert_equal([1, 2, 3, 4, 5, 10], u.first(6)) + assert_equal([1, 2, 3, 4, 5, 10], u.first(6)) end end diff --git a/test/ruby/test_lazy_enumerator.rb b/test/ruby/test_lazy_enumerator.rb index 22028283ce..03371c912a 100644 --- a/test/ruby/test_lazy_enumerator.rb +++ b/test/ruby/test_lazy_enumerator.rb @@ -569,4 +569,13 @@ EOS [1, 2, 3].lazy.map(&:undefined).map(&:to_s).force end end + + def test_uniq + u = (1..Float::INFINITY).lazy.uniq do |x| + raise "too big" if x > 10000 + (x**2) % 10 + end + assert_equal([1, 2, 3, 4, 5, 10], u.first(6)) + assert_equal([1, 2, 3, 4, 5, 10], u.first(6)) + end end |