diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-02 08:30:36 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-07-02 08:30:36 +0000 |
commit | bb8532946030cb2e4337bd4f1f462e19ee507fa1 (patch) | |
tree | 8d60b3acf837bc51a22cb21c829cfbbeab72212c /enumerator.c | |
parent | 905189b2e3a7d746af91cdea254ed041a5fc111f (diff) |
merge revision(s) 62731,62735: [Backport #14495]
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>
test_enumerator.rb: duplicate assertions
* test/ruby/test_enumerator.rb (test_uniq): remove assertions
which ared duplicate of lazy enumerator tests in
test_lazy_enumerator.rb.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@63824 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'enumerator.c')
-rw-r--r-- | enumerator.c | 21 |
1 files changed, 14 insertions, 7 deletions
diff --git a/enumerator.c b/enumerator.c index d61d79e897..419f34f9e5 100644 --- a/enumerator.c +++ b/enumerator.c @@ -2233,27 +2233,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 @@ -2261,9 +2269,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); } |