From 78a59da8bc242413c58723203aa007d0f3beecf0 Mon Sep 17 00:00:00 2001 From: matz Date: Wed, 3 Feb 2010 01:29:44 +0000 Subject: [PATCH] * enumerator.c: move implementation of each_slice, each_cons, each_with_object to enum.c. * enum.c (each_slice_i): convert multiple values from yield into an array. * enum.c (each_cons_i): ditto. * enum.c (each_with_object_i): ditto. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26546 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 12 ++++ enum.c | 144 +++++++++++++++++++++++++++++++++++++++++ enumerator.c | 142 ---------------------------------------- test/ruby/test_enum.rb | 19 +++--- 4 files changed, 167 insertions(+), 150 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4a14b52129..6063480d38 100644 --- a/ChangeLog +++ b/ChangeLog @@ -31,6 +31,18 @@ Tue Feb 2 18:15:12 2010 Nobuyoshi Nakada which has been reverted in r9880 probably unintentionally, according to matz. [ruby-core:24530] +Tue Feb 2 14:46:06 2010 Yukihiro Matsumoto + + * enumerator.c: move implementation of each_slice, each_cons, + each_with_object to enum.c. + + * enum.c (each_slice_i): convert multiple values from yield into + an array. + + * enum.c (each_cons_i): ditto. + + * enum.c (each_with_object_i): ditto. + Tue Feb 2 14:30:27 2010 Yukihiro Matsumoto * enum.c (enum_each_entry): new method #each_entry to pack values diff --git a/enum.c b/enum.c index c6cc0ad00c..6eeb62cd6b 100644 --- a/enum.c +++ b/enum.c @@ -1655,6 +1655,147 @@ enum_each_entry(int argc, VALUE *argv, VALUE obj) return obj; } +static VALUE +each_slice_i(VALUE i, VALUE *memo, int argc, VALUE *argv) +{ + VALUE ary = memo[0]; + VALUE v = Qnil; + long size = (long)memo[1]; + ENUM_WANT_SVALUE(); + + rb_ary_push(ary, i); + + if (RARRAY_LEN(ary) == size) { + v = rb_yield(ary); + memo[0] = rb_ary_new2(size); + } + + return v; +} + +/* + * call-seq: + * e.each_slice(n) {...} + * e.each_slice(n) + * + * Iterates the given block for each slice of elements. If no + * block is given, returns an enumerator. + * + * e.g.: + * (1..10).each_slice(3) {|a| p a} + * # outputs below + * [1, 2, 3] + * [4, 5, 6] + * [7, 8, 9] + * [10] + * + */ +static VALUE +enum_each_slice(VALUE obj, VALUE n) +{ + long size = NUM2LONG(n); + VALUE args[2], ary; + + if (size <= 0) rb_raise(rb_eArgError, "invalid slice size"); + RETURN_ENUMERATOR(obj, 1, &n); + args[0] = rb_ary_new2(size); + args[1] = (VALUE)size; + + rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)args); + + ary = args[0]; + if (RARRAY_LEN(ary) > 0) rb_yield(ary); + + return Qnil; +} + +static VALUE +each_cons_i(VALUE i, VALUE *memo, int argc, VALUE *argv) +{ + VALUE ary = memo[0]; + VALUE v = Qnil; + long size = (long)memo[1]; + ENUM_WANT_SVALUE(); + + if (RARRAY_LEN(ary) == size) { + rb_ary_shift(ary); + } + rb_ary_push(ary, i); + if (RARRAY_LEN(ary) == size) { + v = rb_yield(rb_ary_dup(ary)); + } + return v; +} + +/* + * call-seq: + * each_cons(n) {...} + * each_cons(n) + * + * Iterates the given block for each array of consecutive + * elements. If no block is given, returns an enumerator. + * + * e.g.: + * (1..10).each_cons(3) {|a| p a} + * # outputs below + * [1, 2, 3] + * [2, 3, 4] + * [3, 4, 5] + * [4, 5, 6] + * [5, 6, 7] + * [6, 7, 8] + * [7, 8, 9] + * [8, 9, 10] + * + */ +static VALUE +enum_each_cons(VALUE obj, VALUE n) +{ + long size = NUM2LONG(n); + VALUE args[2]; + + if (size <= 0) rb_raise(rb_eArgError, "invalid size"); + RETURN_ENUMERATOR(obj, 1, &n); + args[0] = rb_ary_new2(size); + args[1] = (VALUE)size; + + rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)args); + + return Qnil; +} + +static VALUE +each_with_object_i(VALUE i, VALUE memo, int argc, VALUE *argv) +{ + ENUM_WANT_SVALUE(); + return rb_yield_values(2, i, memo); +} + +/* + * call-seq: + * each_with_object(obj) {|(*args), memo_obj| ... } + * each_with_object(obj) + * + * Iterates the given block for each element with an arbitrary + * object given, and returns the initially given object. + * + * If no block is given, returns an enumerator. + * + * e.g.: + * evens = (1..10).each_with_object([]) {|i, a| a << i*2 } + * # => [2, 4, 6, 8, 10, 12, 14, 16, 18, 20] + * + */ +static VALUE +enum_each_with_object(VALUE obj, VALUE memo) +{ + RETURN_ENUMERATOR(obj, 1, &memo); + + rb_block_call(obj, id_each, 0, 0, each_with_object_i, memo); + + return memo; +} + static VALUE zip_ary(VALUE val, NODE *memo, int argc, VALUE *argv) { @@ -2474,6 +2615,9 @@ Init_Enumerable(void) rb_define_method(rb_mEnumerable, "each_with_index", enum_each_with_index, -1); rb_define_method(rb_mEnumerable, "reverse_each", enum_reverse_each, -1); rb_define_method(rb_mEnumerable, "each_entry", enum_each_entry, -1); + rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1); + rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1); + rb_define_method(rb_mEnumerable, "each_with_object", enum_each_with_object, 1); rb_define_method(rb_mEnumerable, "zip", enum_zip, -1); rb_define_method(rb_mEnumerable, "take", enum_take, 1); rb_define_method(rb_mEnumerable, "take_while", enum_take_while, 0); diff --git a/enumerator.c b/enumerator.c index 34d16c057e..53cd49a361 100644 --- a/enumerator.c +++ b/enumerator.c @@ -179,144 +179,6 @@ obj_to_enum(int argc, VALUE *argv, VALUE obj) return rb_enumeratorize(obj, meth, argc, argv); } -static VALUE -each_slice_i(VALUE val, VALUE *memo) -{ - VALUE ary = memo[0]; - VALUE v = Qnil; - long size = (long)memo[1]; - - rb_ary_push(ary, val); - - if (RARRAY_LEN(ary) == size) { - v = rb_yield(ary); - memo[0] = rb_ary_new2(size); - } - - return v; -} - -/* - * call-seq: - * e.each_slice(n) {...} - * e.each_slice(n) - * - * Iterates the given block for each slice of elements. If no - * block is given, returns an enumerator. - * - * e.g.: - * (1..10).each_slice(3) {|a| p a} - * # outputs below - * [1, 2, 3] - * [4, 5, 6] - * [7, 8, 9] - * [10] - * - */ -static VALUE -enum_each_slice(VALUE obj, VALUE n) -{ - long size = NUM2LONG(n); - VALUE args[2], ary; - - if (size <= 0) rb_raise(rb_eArgError, "invalid slice size"); - RETURN_ENUMERATOR(obj, 1, &n); - args[0] = rb_ary_new2(size); - args[1] = (VALUE)size; - - rb_block_call(obj, id_each, 0, 0, each_slice_i, (VALUE)args); - - ary = args[0]; - if (RARRAY_LEN(ary) > 0) rb_yield(ary); - - return Qnil; -} - -static VALUE -each_cons_i(VALUE val, VALUE *memo) -{ - VALUE ary = memo[0]; - VALUE v = Qnil; - long size = (long)memo[1]; - - if (RARRAY_LEN(ary) == size) { - rb_ary_shift(ary); - } - rb_ary_push(ary, val); - if (RARRAY_LEN(ary) == size) { - v = rb_yield(rb_ary_dup(ary)); - } - return v; -} - -/* - * call-seq: - * each_cons(n) {...} - * each_cons(n) - * - * Iterates the given block for each array of consecutive - * elements. If no block is given, returns an enumerator. - * - * e.g.: - * (1..10).each_cons(3) {|a| p a} - * # outputs below - * [1, 2, 3] - * [2, 3, 4] - * [3, 4, 5] - * [4, 5, 6] - * [5, 6, 7] - * [6, 7, 8] - * [7, 8, 9] - * [8, 9, 10] - * - */ -static VALUE -enum_each_cons(VALUE obj, VALUE n) -{ - long size = NUM2LONG(n); - VALUE args[2]; - - if (size <= 0) rb_raise(rb_eArgError, "invalid size"); - RETURN_ENUMERATOR(obj, 1, &n); - args[0] = rb_ary_new2(size); - args[1] = (VALUE)size; - - rb_block_call(obj, id_each, 0, 0, each_cons_i, (VALUE)args); - - return Qnil; -} - -static VALUE -each_with_object_i(VALUE val, VALUE memo) -{ - return rb_yield_values(2, val, memo); -} - -/* - * call-seq: - * each_with_object(obj) {|(*args), memo_obj| ... } - * each_with_object(obj) - * - * Iterates the given block for each element with an arbitrary - * object given, and returns the initially given object. - * - * If no block is given, returns an enumerator. - * - * e.g.: - * evens = (1..10).each_with_object([]) {|i, a| a << i*2 } - * # => [2, 4, 6, 8, 10, 12, 14, 16, 18, 20] - * - */ -static VALUE -enum_each_with_object(VALUE obj, VALUE memo) -{ - RETURN_ENUMERATOR(obj, 1, &memo); - - rb_block_call(obj, id_each, 0, 0, each_with_object_i, memo); - - return memo; -} - static VALUE enumerator_allocate(VALUE klass) { @@ -1190,10 +1052,6 @@ Init_Enumerator(void) rb_define_method(rb_mKernel, "to_enum", obj_to_enum, -1); rb_define_method(rb_mKernel, "enum_for", obj_to_enum, -1); - rb_define_method(rb_mEnumerable, "each_slice", enum_each_slice, 1); - rb_define_method(rb_mEnumerable, "each_cons", enum_each_cons, 1); - rb_define_method(rb_mEnumerable, "each_with_object", enum_each_with_object, 1); - rb_cEnumerator = rb_define_class("Enumerator", rb_cObject); rb_include_module(rb_cEnumerator, rb_mEnumerable); diff --git a/test/ruby/test_enum.rb b/test/ruby/test_enum.rb index 945661f4b9..7e490a1212 100644 --- a/test/ruby/test_enum.rb +++ b/test/ruby/test_enum.rb @@ -197,6 +197,14 @@ class TestEnumerable < Test::Unit::TestCase assert(!([1,2,3].member?(4))) end + class Foo + include Enumerable + def each + yield 1 + yield 1,2 + end + end + def test_each_with_index a = [] @obj.each_with_index {|x, i| a << [x, i] } @@ -207,6 +215,7 @@ class TestEnumerable < Test::Unit::TestCase hash[item] = index end assert_equal({"cat"=>0, "wombat"=>2, "dog"=>1}, hash) + assert_equal([[1, 0], [[1, 2], 1]], Foo.new.each_with_index.to_a) end def test_each_with_object @@ -217,17 +226,11 @@ class TestEnumerable < Test::Unit::TestCase } assert_same(obj, ret) assert_equal([55, 3628800], ret) - end - - class Foo - include Enumerable - def each - yield 1 - yield 1,2 - end + assert_equal([[1, nil], [[1, 2], nil]], Foo.new.each_with_object(nil).to_a) end def test_each_entry + assert_equal([1, 2, 3], [1, 2, 3].each_entry.to_a) assert_equal([1, [1, 2]], Foo.new.each_entry.to_a) end