1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* array.c: Support for Enumerator#size in trivial cases:

Browse Source 
each, each_index, reverse_each, sort_by, collect,
  collect!, select, select!, keep_if, reject, reject!, delete_if
  [Feature #6636]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@37500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
marcandre 2012-11-06 17:10:50 +00:00
parent 57d596cdb4
commit 55fb13eff9
2 changed files with 21 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
array.c
View File

@ -1563,7 +1563,7 @@ rb_ary_each(VALUE array)
long i; long i;
volatile VALUE ary = array; volatile VALUE ary = array;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
for (i=0; i<RARRAY_LEN(ary); i++) { for (i=0; i<RARRAY_LEN(ary); i++) {
rb_yield(RARRAY_PTR(ary)[i]); rb_yield(RARRAY_PTR(ary)[i]);
} }
@ -1592,7 +1592,7 @@ static VALUE
rb_ary_each_index(VALUE ary) rb_ary_each_index(VALUE ary)
{ {
long i; long i;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
for (i=0; i<RARRAY_LEN(ary); i++) { for (i=0; i<RARRAY_LEN(ary); i++) {
rb_yield(LONG2NUM(i)); rb_yield(LONG2NUM(i));
@ -1620,7 +1620,7 @@ rb_ary_reverse_each(VALUE ary)
{ {
long len; long len;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
len = RARRAY_LEN(ary); len = RARRAY_LEN(ary);
while (len--) { while (len--) {
rb_yield(RARRAY_PTR(ary)[len]); rb_yield(RARRAY_PTR(ary)[len]);
@ -2291,7 +2291,7 @@ rb_ary_sort_by_bang(VALUE ary)
{ {
VALUE sorted; VALUE sorted;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
rb_ary_modify(ary); rb_ary_modify(ary);
sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0); sorted = rb_block_call(ary, rb_intern("sort_by"), 0, 0, sort_by_i, 0);
rb_ary_replace(ary, sorted); rb_ary_replace(ary, sorted);
@ -2325,7 +2325,7 @@ rb_ary_collect(VALUE ary)
long i; long i;
VALUE collect; VALUE collect;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
collect = rb_ary_new2(RARRAY_LEN(ary)); collect = rb_ary_new2(RARRAY_LEN(ary));
for (i = 0; i < RARRAY_LEN(ary); i++) { for (i = 0; i < RARRAY_LEN(ary); i++) {
rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i])); rb_ary_push(collect, rb_yield(RARRAY_PTR(ary)[i]));
@ -2358,7 +2358,7 @@ rb_ary_collect_bang(VALUE ary)
{ {
long i; long i;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
rb_ary_modify(ary); rb_ary_modify(ary);
for (i = 0; i < RARRAY_LEN(ary); i++) { for (i = 0; i < RARRAY_LEN(ary); i++) {
rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i])); rb_ary_store(ary, i, rb_yield(RARRAY_PTR(ary)[i]));
@ -2441,7 +2441,7 @@ rb_ary_select(VALUE ary)
VALUE result; VALUE result;
long i; long i;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
result = rb_ary_new2(RARRAY_LEN(ary)); result = rb_ary_new2(RARRAY_LEN(ary));
for (i = 0; i < RARRAY_LEN(ary); i++) { for (i = 0; i < RARRAY_LEN(ary); i++) {
if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) { if (RTEST(rb_yield(RARRAY_PTR(ary)[i]))) {
@ -2472,7 +2472,7 @@ rb_ary_select_bang(VALUE ary)
{ {
long i1, i2; long i1, i2;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
rb_ary_modify(ary); rb_ary_modify(ary);
for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) { for (i1 = i2 = 0; i1 < RARRAY_LEN(ary); i1++) {
VALUE v = RARRAY_PTR(ary)[i1]; VALUE v = RARRAY_PTR(ary)[i1];
@ -2508,7 +2508,7 @@ rb_ary_select_bang(VALUE ary)
static VALUE static VALUE
rb_ary_keep_if(VALUE ary) rb_ary_keep_if(VALUE ary)
{ {
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
rb_ary_select_bang(ary); rb_ary_select_bang(ary);
return ary; return ary;
} }
@ -2737,7 +2737,7 @@ ary_reject_bang(VALUE ary)
static VALUE static VALUE
rb_ary_reject_bang(VALUE ary) rb_ary_reject_bang(VALUE ary)
{ {
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
return ary_reject_bang(ary); return ary_reject_bang(ary);
} }
@ -2759,7 +2759,7 @@ rb_ary_reject(VALUE ary)
{ {
VALUE rejected_ary; VALUE rejected_ary;
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
rejected_ary = rb_ary_new(); rejected_ary = rb_ary_new();
ary_reject(ary, rejected_ary); ary_reject(ary, rejected_ary);
return rejected_ary; return rejected_ary;
@ -2786,7 +2786,7 @@ rb_ary_reject(VALUE ary)
static VALUE static VALUE
rb_ary_delete_if(VALUE ary) rb_ary_delete_if(VALUE ary)
{ {
RETURN_ENUMERATOR(ary, 0, 0); RETURN_SIZED_ENUMERATOR(ary, 0, 0, rb_ary_length);
ary_reject_bang(ary); ary_reject_bang(ary);
return ary; return ary;
} }

9
test/ruby/test_enumerator.rb
View File

@ -420,5 +420,14 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal 42, enum.with_index.size assert_equal 42, enum.with_index.size
assert_equal 42, enum.with_object(:foo).size assert_equal 42, enum.with_object(:foo).size
end end
def test_size_for_enum_created_from_array
arr = %w[hello world]
%i[each each_with_index reverse_each sort_by! sort_by map map!
keep_if reject! reject select! select delete_if].each do |method|
assert_equal arr.size, arr.send(method).size
end
end
end end