diff options
| author | Akinori MUSHA <knu@idaemons.org> | 2019-06-05 20:39:21 +0900 |
|---|---|---|
| committer | Akinori MUSHA <knu@idaemons.org> | 2019-09-04 16:16:46 +0900 |
| commit | 1d4bd229b898671328c2a942b04f08065c640c28 (patch) | |
| tree | ecd881beea9ddc035e2061a27886fded9bd82f8f | |
| parent | 2a6457b5b7d67378528235cee7b9cb93fed00204 (diff) | |
| download | ruby-1d4bd229b898671328c2a942b04f08065c640c28.tar.gz | |
Implement Enumerator::Lazy#eager [Feature #15901]
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | enumerator.c | 21 | ||||
| -rw-r--r-- | test/ruby/test_lazy_enumerator.rb | 8 |
3 files changed, 32 insertions, 0 deletions
@@ -102,6 +102,9 @@ Enumerator:: New method:: + * Added Enumerator::Lazy#eager that generates a non-lazy enumerator + from a lazy enumerator. [Feature #15901] + * Added Enumerator::Yielder#to_proc so that a Yielder object can be directly passed to another method as a block argument. [Feature #15618] diff --git a/enumerator.c b/enumerator.c index 62534ee241..7a0a17b52f 100644 --- a/enumerator.c +++ b/enumerator.c @@ -1894,6 +1894,26 @@ lazy_to_enum(int argc, VALUE *argv, VALUE self) } static VALUE +lazy_eager_size(VALUE self, VALUE args, VALUE eobj) +{ + return enum_size(self); +} + +/* + * call-seq: + * lzy.eager -> enum + * + * Returns a non-lazy Enumerator converted from the lazy enumerator. + */ + +static VALUE +lazy_eager(VALUE self) +{ + return enumerator_init(enumerator_allocate(rb_cEnumerator), + self, sym_each, 0, 0, lazy_eager_size, Qnil); +} + +static VALUE lazyenum_yield(VALUE proc_entry, struct MEMO *result) { struct proc_entry *entry = proc_entry_ptr(proc_entry); @@ -3741,6 +3761,7 @@ InitVM_Enumerator(void) rb_define_method(rb_cLazy, "initialize", lazy_initialize, -1); rb_define_method(rb_cLazy, "to_enum", lazy_to_enum, -1); rb_define_method(rb_cLazy, "enum_for", lazy_to_enum, -1); + rb_define_method(rb_cLazy, "eager", lazy_eager, 0); rb_define_method(rb_cLazy, "map", lazy_map, 0); rb_define_method(rb_cLazy, "collect", lazy_map, 0); rb_define_method(rb_cLazy, "flat_map", lazy_flat_map, 0); diff --git a/test/ruby/test_lazy_enumerator.rb b/test/ruby/test_lazy_enumerator.rb index 72fe1a4a24..caa9a9c713 100644 --- a/test/ruby/test_lazy_enumerator.rb +++ b/test/ruby/test_lazy_enumerator.rb @@ -452,6 +452,14 @@ class TestLazyEnumerator < Test::Unit::TestCase EOS end + def test_lazy_eager + lazy = [1, 2, 3].lazy.map { |x| x * 2 } + enum = lazy.eager + assert_equal Enumerator, enum.class + assert_equal 3, enum.size + assert_equal [1, 2, 3], enum.map { |x| x / 2 } + end + def test_lazy_to_enum lazy = [1, 2, 3].lazy def lazy.foo(*args) |