8000 Enumerator::Lazy optimized using Procs chaining by gregolsen · Pull Request #150 · ruby/ruby · GitHub
[go: up one dir, main page]
Skip to content

Enumerator::Lazy optimized using Procs chaining #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 17 commits into from
Closed

Enumerator::Lazy optimized using Procs chaining #150

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
013a3c4
Enumerator::Lazy changed to use direct procs chaining for #map and #s…
gregolsen Apr 8, 2012
394ab24
lazy_init_iterator cleanup
gregolsen Apr 17, 2012
463760c
using generator as an object for procs chaining when unoptimized lazy…
gregolsen Apr 17, 2012
dda7f1c
move_next madness moved to process_element
gregolsen Apr 17, 2012
b35d33a
lazy_take optimized
gregolsen Apr 28, 2012
4c70750
lazy_drop optimized
gregolsen Apr 28, 2012
a08728f
marking all generators created by unoptimized lazy methods as hybrid
gregolsen Apr 30, 2012
eb11c11
lazy #take_while optimized
gregolsen May 10, 2012
540f7bd
lazy #reject & #drop_while optimized
gregolsen May 10, 2012
8c05fcc
#grep optimized
gregolsen May 15, 2012
6a6284f
instantiating proc_entry properly with marking for GC
gregolsen May 16, 2012
b8af5d6
adding test for hybrid chaining
gregolsen Jun 6, 2012
e40e8ed
fixing multiple force call problem for #take
gregolsen Jun 7, 2012
b2437fc
tiny cleanup
gregolsen Jun 7, 2012
434ff9d
#inspect fixed to support procs chainged lazy enumerators
gregolsen Jul 14, 2012
68cc5b2
cycle_chain test fixed
gregolsen Jul 31, 2012
30f1146
rb_funcall changed to rb_proc_call_with_block for speed up
gregolsen Jul 31, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
#grep optimized
  • Loading branch information
@gregolsen
gregolsen committed Jul 31, 2012
commit 8c05fcc792055bfd8fa0c65aa2f4c36f5e06b04b
57 changes: 21 additions & 36 deletions enumerator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1201,13 +1201,14 @@ enum proc_entry_type {
T_PROC_DROP = 3,
T_PROC_TAKE_WHILE = 4,
T_PROC_DROP_WHILE = 5,
T_PROC_REJECT = 6
T_PROC_REJECT = 6,
T_PROC_GREP = 7
};

static VALUE
process_element(VALUE procs_array, VALUE yielder, int argc, VALUE* argv)
{
VALUE result = argv[0];
VALUE result = rb_enum_values_pack(argc, argv);
struct proc_entry *entry;
VALUE *procs = RARRAY_PTR(procs_array);
VALUE move_next = Qtrue;
Expand Down Expand Up @@ -1259,13 +1260,20 @@ process_element(VALUE procs_array, VALUE yielder, int argc, VALUE* argv)
move_next = !RTEST(rb_funcall(entry->proc, rb_intern("call"),
1, result));
break;
case T_PROC_GREP:
move_next = rb_funcall(entry->memo, id_eqq, 1, result);

if (RTEST(move_next) && entry->proc) {
result = rb_funcall(entry->proc,
rb_intern("call"), 1, result);
}
break;
}
}
}

if (RTEST(move_next)) {
argv[0] = result;
rb_funcall2(yielder, id_yield, argc, argv);
rb_funcall2(yielder, id_yield, 1, &result);
}
if (break_point == Qundef) rb_iter_break();
return result;
Expand Down Expand Up @@ -1358,7 +1366,7 @@ create_proc_entry(enum proc_entry_type proc_type, VALUE memo)
entry_obj = Data_Make_Struct(rb_cObject, struct proc_entry,
0, RUBY_DEFAULT_FREE, entry);
Data_Get_Struct(entry_obj, struct proc_entry, entry);
if (proc_type != T_PROC_TAKE && proc_type != T_PROC_DROP) {
if (rb_block_given_p()) {
entry->proc = rb_block_proc();
}
entry->type = proc_type;
Expand Down Expand Up @@ -1622,41 +1630,18 @@ lazy_reject(VALUE obj)
new_enum = lazy_copy(0, 0, obj);
lazy_add_proc(new_enum, T_PROC_REJECT, Qnil);

return lazy_set_method(new_enum, Qnil);
}

static VALUE
lazy_grep_func(VALUE val, VALUE m, int argc, VALUE *argv)
{
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;
return new_enum;
}

static VALUE
lazy_grep_iter(VALUE val, VALUE m, int argc, VALUE *argv)
lazy_grep(VALUE obj, VALUE pattern)
{
VALUE i = rb_enum_values_pack(argc - 1, argv + 1);
VALUE result = rb_funcall(m, id_eqq, 1, i);
VALUE new_enum;

if (RTEST(result)) {
rb_funcall(argv[0], id_yield, 1, rb_yield(i));
}
return Qnil;
}
new_enum = lazy_copy(0, 0, obj);
lazy_add_proc(new_enum, T_PROC_GREP, pattern);

static VALUE
lazy_grep(VALUE obj, VALUE pattern)
{
return lazy_set_method(rb_block_call(rb_cLazy, id_new, 1, &obj,
rb_block_given_p() ?
lazy_grep_iter : lazy_grep_func,
pattern),
rb_ary_new3(1, pattern));
return new_enum;
}

static VALUE
Expand Down Expand Up @@ -1741,7 +1726,7 @@ lazy_take_while(VALUE obj)
new_enum = lazy_copy(0, 0, obj);
lazy_add_proc(new_enum, T_PROC_TAKE_WHILE, Qnil);

return lazy_set_method(new_enum, Qnil);
return new_enum;
}

static VALUE
Expand Down Expand Up @@ -1772,7 +1757,7 @@ lazy_drop_while(VALUE obj)
new_enum = lazy_copy(0, 0, obj);
lazy_add_proc(new_enum, T_PROC_DROP_WHILE, (VALUE) memo);

return lazy_set_method(new_enum, Qnil);
return new_enum;
}

static VALUE
Expand Down
0