archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Make Enumerator#{+,chain} create lazy chain if any included enumerator is lazy

Browse source 
Implements [Feature #17347]
This commit is contained in:
Jeremy Evans 2021-03-05 12:25:51 -08:00
parent bf40fe9fed
commit e1d16a9e56
Notes: git 2021-03-07 06:56:44 +09:00
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

21
enumerator.c
View file

@ -3137,6 +3137,20 @@ enum_chain_initialize(VALUE obj, VALUE enums)
return obj;
}
static VALUE
new_enum_chain(VALUE enums) {
long i;
VALUE obj = enum_chain_initialize(enum_chain_allocate(rb_cEnumChain), enums);
for (i = 0; i < RARRAY_LEN(enums); i++) {
if (RTEST(rb_obj_is_kind_of(RARRAY_AREF(enums, i), rb_cLazy))) {
return enumerable_lazy(obj);
}
}
return obj;
}
/* :nodoc: */
static VALUE
enum_chain_init_copy(VALUE obj, VALUE orig)
@ -3306,8 +3320,7 @@ enum_chain(int argc, VALUE *argv, VALUE obj)
{
VALUE enums = rb_ary_new_from_values(1, &obj);
rb_ary_cat(enums, argv, argc);
return enum_chain_initialize(enum_chain_allocate(rb_cEnumChain), enums);
return new_enum_chain(enums);
}
/*
@ -3323,9 +3336,7 @@ enum_chain(int argc, VALUE *argv, VALUE obj)
static VALUE
enumerator_plus(VALUE obj, VALUE eobj)
{
VALUE enums = rb_ary_new_from_args(2, obj, eobj);
return enum_chain_initialize(enum_chain_allocate(rb_cEnumChain), enums);
return new_enum_chain(rb_ary_new_from_args(2, obj, eobj));
}
/*