nobu	2018-08-16 09:58:21 +0900 (Thu, 16 Aug 2018)

  New Revision: 64385

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=64385

  Log:
    Adding Enumerator::Lazy#uniq and Enumerator::Lazy#grep_v to proc chaining
    
    [Feature #14994]
    
    [Fix GH-1930]
    
    From: Anmol Chopra <chopraanmol1@g...>

  Added files:
    trunk/benchmark/enum_lazy_grep_v_100.rb
    trunk/benchmark/enum_lazy_grep_v_20.rb
    trunk/benchmark/enum_lazy_grep_v_50.rb
    trunk/benchmark/enum_lazy_uniq_100.rb
    trunk/benchmark/enum_lazy_uniq_20.rb
    trunk/benchmark/enum_lazy_uniq_50.rb
  Modified files:
    trunk/enumerator.c
Index: enumerator.c
===================================================================
--- enumerator.c	(revision 64384)
+++ enumerator.c	(revision 64385)
@@ -1980,38 +1980,43 @@ lazy_grep(VALUE obj, VALUE pattern) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L1980
     return lazy_add_method(obj, 0, 0, pattern, rb_ary_new3(1, pattern), funcs);
 }
 
-static VALUE
-lazy_grep_v_func(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_grep_v_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
-    VALUE result = rb_funcall(m, id_eqq, 1, i);
-
-    if (!RTEST(result)) {
-	rb_funcall(argv[0], id_yield, 1, i);
-    }
-    return Qnil;
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
+    if (RTEST(chain)) return 0;
+    return result;
 }
 
-static VALUE
-lazy_grep_v_iter(RB_BLOCK_CALL_FUNC_ARGLIST(val, m))
+static struct MEMO *
+lazy_grep_v_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
-    VALUE result = rb_funcall(m, id_eqq, 1, i);
+    struct proc_entry *entry = proc_entry_ptr(proc_entry);
+    VALUE value, chain = rb_funcall(entry->memo, id_eqq, 1, result->memo_value);
 
-    if (!RTEST(result)) {
-	rb_funcall(argv[0], id_yield, 1, rb_yield(i));
-    }
-    return Qnil;
+    if (RTEST(chain)) return 0;
+    value = rb_proc_call_with_block(entry->proc, 1, &(result->memo_value), Qnil);
+    LAZY_MEMO_SET_VALUE(result, value);
+    LAZY_MEMO_RESET_PACKED(result);
+
+    return result;
 }
 
+static const lazyenum_funcs lazy_grep_v_iter_funcs = {
+    lazy_grep_v_iter_proc, 0,
+};
+
+static const lazyenum_funcs lazy_grep_v_funcs = {
+    lazy_grep_v_proc, 0,
+};
+
 static VALUE
 lazy_grep_v(VALUE obj, VALUE pattern)
 {
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 rb_block_given_p() ?
-					 lazy_grep_v_iter : lazy_grep_v_func,
-					 pattern),
-			   rb_ary_new3(1, pattern), 0);
+    const lazyenum_funcs *const funcs = rb_block_given_p() ?
+        &lazy_grep_v_iter_funcs : &lazy_grep_v_funcs;
+    return lazy_add_method(obj, 0, 0, pattern, rb_ary_new3(1, pattern), funcs);
 }
 
 static VALUE
@@ -2275,46 +2280,49 @@ lazy_drop_while(VALUE obj) https://github.com/ruby/ruby/blob/trunk/enumerator.c#L2280
     return lazy_add_method(obj, 0, 0, Qfalse, Qnil, &lazy_drop_while_funcs);
 }
 
-static VALUE
-lazy_uniq_i(VALUE i, int argc, const VALUE *argv, VALUE yielder)
+static int
+lazy_uniq_check(VALUE chain, VALUE memos, long memo_index)
 {
-    VALUE hash;
+    VALUE hash = rb_ary_entry(memos, memo_index);;
 
-    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);
+        rb_ary_store(memos, memo_index, hash);
     }
 
-    if (rb_hash_add_new_element(hash, i, Qfalse))
-	return Qnil;
-    return rb_funcallv(yielder, id_yield, argc, argv);
+    return rb_hash_add_new_element(hash, chain, Qfalse);
 }
 
-static VALUE
-lazy_uniq_func(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
+static struct MEMO *
+lazy_uniq_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE yielder = (--argc, *argv++);
-    i = rb_enum_values_pack(argc, argv);
-    return lazy_uniq_i(i, argc, argv, yielder);
+    if (lazy_uniq_check(result->memo_value, memos, memo_index)) return 0;
+    return result;
 }
 
-static VALUE
-lazy_uniq_iter(RB_BLOCK_CALL_FUNC_ARGLIST(i, m))
+static struct MEMO *
+lazy_uniq_iter_proc(VALUE proc_entry, struct MEMO *result, VALUE memos, long memo_index)
 {
-    VALUE yielder = (--argc, *argv++);
-    i = rb_yield_values2(argc, argv);
-    return lazy_uniq_i(i, argc, argv, yielder);
+    VALUE chain = lazyenum_yield(proc_entry, result);
+
+    if (lazy_uniq_check(chain, memos, memo_index)) return 0;
+    return result;
 }
 
+static const lazyenum_funcs lazy_uniq_iter_funcs = {
+    lazy_uniq_iter_proc, 0,
+};
+
+static const lazyenum_funcs lazy_uniq_funcs = {
+    lazy_uniq_proc, 0,
+};
+
 static VALUE
 lazy_uniq(VALUE obj)
 {
-    rb_block_call_func *const func =
-	rb_block_given_p() ? lazy_uniq_iter : lazy_uniq_func;
-    return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
-					 func, 0),
-			   0, 0);
+    const lazyenum_funcs *const funcs =
+        rb_block_given_p() ? &lazy_uniq_iter_funcs : &lazy_uniq_funcs;
+    return lazy_add_method(obj, 0, 0, Qnil, Qnil, funcs);
 }
 
 static VALUE
Index: benchmark/enum_lazy_grep_v_20.rb
===================================================================
--- benchmark/enum_lazy_grep_v_20.rb	(nonexistent)
+++ benchmark/enum_lazy_grep_v_20.rb	(revision 64385)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/benchmark/enum_lazy_grep_v_20.rb#L1
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i > 2}).grep_v(->(i){i > 2})
+N.times {enum.each {}}
Index: benchmark/enum_lazy_grep_v_100.rb
===================================================================
--- benchmark/enum_lazy_grep_v_100.rb	(nonexistent)
+++ benchmark/enum_lazy_grep_v_100.rb	(revision 64385)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/benchmark/enum_lazy_grep_v_100.rb#L1
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i == 0}).grep_v(->(i){i == 0})
+N.times {enum.each {}}
Index: benchmark/enum_lazy_uniq_20.rb
===================================================================
--- benchmark/enum_lazy_uniq_20.rb	(nonexistent)
+++ benchmark/enum_lazy_uniq_20.rb	(revision 64385)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/benchmark/enum_lazy_uniq_20.rb#L1
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 2000}.uniq {|i| i % 2000}
+N.times {enum.each {}}
Index: benchmark/enum_lazy_uniq_100.rb
===================================================================
--- benchmark/enum_lazy_uniq_100.rb	(nonexistent)
+++ benchmark/enum_lazy_uniq_100.rb	(revision 64385)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/benchmark/enum_lazy_uniq_100.rb#L1
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 10000}.uniq {|i| i % 10000}
+N.times {enum.each {}}
Index: benchmark/enum_lazy_grep_v_50.rb
===================================================================
--- benchmark/enum_lazy_grep_v_50.rb	(nonexistent)
+++ benchmark/enum_lazy_grep_v_50.rb	(revision 64385)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/benchmark/enum_lazy_grep_v_50.rb#L1
+grep_data = (1..10).to_a * 1000
+N = 100
+enum = grep_data.lazy.grep_v(->(i){i > 5}).grep_v(->(i){i > 5})
+N.times {enum.each {}}
Index: benchmark/enum_lazy_uniq_50.rb
===================================================================
--- benchmark/enum_lazy_uniq_50.rb	(nonexistent)
+++ benchmark/enum_lazy_uniq_50.rb	(revision 64385)
@@ -0,0 +1,4 @@ https://github.com/ruby/ruby/blob/trunk/benchmark/enum_lazy_uniq_50.rb#L1
+uniq_data = (1..10_000).to_a
+N = 100
+enum = uniq_data.lazy.uniq {|i| i % 5000}.uniq {|i| i % 5000}
+N.times {enum.each {}}

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/