summaryrefslogtreecommitdiff
path: root/enumerator.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-13 01:00:08 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-03-13 01:00:08 +0000
commit0faf01862435676ba15552b99f282ba49dba620a (patch)
tree163440687c2a808fcab7ddecbf4e14fea3889818 /enumerator.c
parent3438cfa729bc89514890584660d6287982986017 (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
Diffstat (limited to 'enumerator.c')
-rw-r--r--enumerator.c21
1 files changed, 14 insertions, 7 deletions
diff --git a/enumerator.c b/enumerator.c
index ba470a4..4c20ca0 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);
}