kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

* enum.c (enum_each_with_index): reuse array for yield parameters.

Browse source 
* enum.c (enum_min, enum_max): ditto.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11431 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
matz 2006-12-29 19:49:23 +00:00
parent 873b2f9fe3
commit 5ba0254777
2 changed files with 48 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
Sat Dec 30 04:38:23 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* enum.c (enum_each_with_index): reuse array for yield parameters.
* enum.c (enum_min, enum_max): ditto.
Sat Dec 30 04:25:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org> Sat Dec 30 04:25:29 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
* enum.c (enum_inject): reuse array for yield parameters. * enum.c (enum_inject): reuse array for yield parameters.

57
enum.c
View file

@ -887,7 +887,10 @@ min_ii(VALUE i, VALUE *memo)
*memo = i; *memo = i;
} }
else { else {
cmp = rb_yield_values(2, i, *memo); VALUE ary = memo[1];
RARRAY_PTR(ary)[0] = i;
RARRAY_PTR(ary)[1] = *memo;
cmp = rb_yield(ary);
if (rb_cmpint(cmp, i, *memo) < 0) { if (rb_cmpint(cmp, i, *memo) < 0) {
*memo = i; *memo = i;
} }
@ -913,11 +916,18 @@ min_ii(VALUE i, VALUE *memo)
static VALUE static VALUE
enum_min(VALUE obj) enum_min(VALUE obj)
{ {
VALUE result = Qundef; VALUE result[2];
rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? min_ii : min_i, (VALUE)&result); result[0] = Qundef;
if (result == Qundef) return Qnil; if (rb_block_given_p()) {
return result; result[1] = rb_ary_new3(2, Qnil, Qnil);
rb_block_call(obj, id_each, 0, 0, min_ii, (VALUE)result);
}
else {
rb_block_call(obj, id_each, 0, 0, min_i, (VALUE)result);
}
if (result[0] == Qundef) return Qnil;
return result[0];
} }
static VALUE static VALUE
@ -946,7 +956,10 @@ max_ii(VALUE i, VALUE *memo)
*memo = i; *memo = i;
} }
else { else {
cmp = rb_yield_values(2, i, *memo); VALUE ary = memo[1];
RARRAY_PTR(ary)[0] = i;
RARRAY_PTR(ary)[1] = *memo;
cmp = rb_yield(ary);
if (rb_cmpint(cmp, i, *memo) > 0) { if (rb_cmpint(cmp, i, *memo) > 0) {
*memo = i; *memo = i;
} }
@ -971,11 +984,18 @@ max_ii(VALUE i, VALUE *memo)
static VALUE static VALUE
enum_max(VALUE obj) enum_max(VALUE obj)
{ {
VALUE result = Qundef; VALUE result[2];
rb_block_call(obj, id_each, 0, 0, rb_block_given_p() ? max_ii : max_i, (VALUE)&result); result[0] = Qundef;
if (result == Qundef) return Qnil; if (rb_block_given_p()) {
return result; result[1] = rb_ary_new3(2, Qnil, Qnil);
rb_block_call(obj, id_each, 0, 0, max_ii, (VALUE)result);
}
else {
rb_block_call(obj, id_each, 0, 0, max_i, (VALUE)result);
}
if (result[0] == Qundef) return Qnil;
return result[0];
} }
static VALUE static VALUE
@ -1095,10 +1115,16 @@ enum_member(VALUE obj, VALUE val)
} }
static VALUE static VALUE
each_with_index_i(VALUE val, VALUE *memo) each_with_index_i(VALUE val, VALUE memo)
{ {
rb_yield_values(2, val, INT2FIX(*memo)); long n;
++*memo;
RARRAY_PTR(memo)[0] = val;
rb_yield(memo);
val = RARRAY_PTR(memo)[1];
n = NUM2LONG(val);
n++;
RARRAY_PTR(memo)[1] = INT2NUM(n);
return Qnil; return Qnil;
} }
@ -1120,11 +1146,12 @@ each_with_index_i(VALUE val, VALUE *memo)
static VALUE static VALUE
enum_each_with_index(VALUE obj) enum_each_with_index(VALUE obj)
{ {
VALUE memo = 0; VALUE memo;
RETURN_ENUMERATOR(obj, 0, 0); RETURN_ENUMERATOR(obj, 0, 0);
rb_block_call(obj, id_each, 0, 0, each_with_index_i, (VALUE)&memo); memo = rb_ary_new3(2, Qnil, INT2FIX(0));
rb_block_call(obj, id_each, 0, 0, each_with_index_i, memo);
return obj; return obj;
} }