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 (grep_i): Be aware of multiple values;

Browse source 
fix [ruby-dev:34653].
  (grep_iter_i): Ditto.
  (count_i): Ditto.
  (find_i): Ditto.
  (find_index_i): Ditto.
  (find_all_i): Ditto.
  (reject_i): Ditto.
  (inject_i): Ditto.
  (inject_op_i): Ditto.
  (partition_i): Ditto.
  (group_by_i): Ditto.
  (first_i): Ditto.
  (sort_by_i): Ditto.
  (all_i): Ditto.
  (all_iter_i): Ditto.
  (any_i): Ditto.
  (any_iter_i): Ditto.
  (one_i): Ditto.
  (one_iter_i): Ditto.
  (none_i): Ditto.
  (none_iter_i): Ditto.
  (min_i): Ditto.
  (min_ii): Ditto.
  (max_i): Ditto.
  (max_ii): Ditto.
  (minmax_i): Ditto.
  (minmax_ii): Ditto.
  (min_by_i): Ditto.
  (max_by_i): Ditto.
  (minmax_by_i): Ditto.
  (member_i): Ditto.
  (take_i): Ditto.
  (take_while_i): Ditto.
  (drop_i): Ditto.
  (drop_while_i): Ditto.
  (cycle_i): Ditto.

* enum.c (each_with_index): Update rdoc.  each_with_index() takes
  argments that are passed through to each(), and a hash preserves
  key order.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@16391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
knu 2008-05-12 11:21:39 +00:00
parent 8d72d7bd2a
commit d701d21dbe
2 changed files with 168 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
ChangeLog
View file

@ -1,3 +1,47 @@
Mon May 12 20:19:55 2008 Akinori MUSHA <knu@iDaemons.org>
* enum.c (grep_i): Be aware of multiple values;
fix [ruby-dev:34653].
(grep_iter_i): Ditto.
(count_i): Ditto.
(find_i): Ditto.
(find_index_i): Ditto.
(find_all_i): Ditto.
(reject_i): Ditto.
(inject_i): Ditto.
(inject_op_i): Ditto.
(partition_i): Ditto.
(group_by_i): Ditto.
(first_i): Ditto.
(sort_by_i): Ditto.
(all_i): Ditto.
(all_iter_i): Ditto.
(any_i): Ditto.
(any_iter_i): Ditto.
(one_i): Ditto.
(one_iter_i): Ditto.
(none_i): Ditto.
(none_iter_i): Ditto.
(min_i): Ditto.
(min_ii): Ditto.
(max_i): Ditto.
(max_ii): Ditto.
(minmax_i): Ditto.
(minmax_ii): Ditto.
(min_by_i): Ditto.
(max_by_i): Ditto.
(minmax_by_i): Ditto.
(member_i): Ditto.
(take_i): Ditto.
(take_while_i): Ditto.
(drop_i): Ditto.
(drop_while_i): Ditto.
(cycle_i): Ditto.
* enum.c (each_with_index): Update rdoc. each_with_index() takes
argments that are passed through to each(), and a hash preserves
key order.
Mon May 12 19:05:24 2008 NAKAMURA Usaku <usa@ruby-lang.org> Mon May 12 19:05:24 2008 NAKAMURA Usaku <usa@ruby-lang.org>
* process.c (rb_spawn_internal): remove calling run_exec_options() * process.c (rb_spawn_internal): remove calling run_exec_options()

174
enum.c
View file

@ -24,6 +24,10 @@ enum_values_pack(int argc, VALUE *argv)
return rb_ary_new4(argc, argv); return rb_ary_new4(argc, argv);
} }
#define ENUM_WANT_SVALUE() do { \
i = enum_values_pack(argc, argv); \
} while (0)
static VALUE static VALUE
enum_yield(int argc, VALUE *argv) enum_yield(int argc, VALUE *argv)
{ {
@ -33,8 +37,10 @@ enum_yield(int argc, VALUE *argv)
static VALUE static VALUE
grep_i(VALUE i, VALUE *arg, int argc, VALUE *argv) grep_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
{ {
ENUM_WANT_SVALUE();
if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) { if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
rb_ary_push(arg[1], enum_values_pack(argc, argv)); rb_ary_push(arg[1], i);
} }
return Qnil; return Qnil;
} }
@ -42,8 +48,10 @@ grep_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
static VALUE static VALUE
grep_iter_i(VALUE i, VALUE *arg, int argc, VALUE *argv) grep_iter_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
{ {
ENUM_WANT_SVALUE();
if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) { if (RTEST(rb_funcall(arg[0], id_eqq, 1, i))) {
rb_ary_push(arg[1], enum_yield(argc, argv)); rb_ary_push(arg[1], rb_yield(i));
} }
return Qnil; return Qnil;
} }
@ -85,6 +93,8 @@ count_i(VALUE i, VALUE memop, int argc, VALUE *argv)
{ {
VALUE *memo = (VALUE*)memop; VALUE *memo = (VALUE*)memop;
ENUM_WANT_SVALUE();
if (rb_equal(i, memo[1])) { if (rb_equal(i, memo[1])) {
memo[0]++; memo[0]++;
} }
@ -142,7 +152,9 @@ enum_count(int argc, VALUE *argv, VALUE obj)
static VALUE static VALUE
find_i(VALUE i, VALUE *memo, int argc, VALUE *argv) find_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
if (RTEST(enum_yield(argc, argv))) { ENUM_WANT_SVALUE();
if (RTEST(rb_yield(i))) {
*memo = i; *memo = i;
rb_iter_break(); rb_iter_break();
} }
@ -187,6 +199,8 @@ find_index_i(VALUE i, VALUE memop, int argc, VALUE *argv)
{ {
VALUE *memo = (VALUE*)memop; VALUE *memo = (VALUE*)memop;
ENUM_WANT_SVALUE();
if (rb_equal(i, memo[2])) { if (rb_equal(i, memo[2])) {
memo[0] = UINT2NUM(memo[1]); memo[0] = UINT2NUM(memo[1]);
rb_iter_break(); rb_iter_break();
@ -251,7 +265,9 @@ enum_find_index(int argc, VALUE *argv, VALUE obj)
static VALUE static VALUE
find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv) find_all_i(VALUE i, VALUE ary, int argc, VALUE *argv)
{ {
if (RTEST(enum_yield(argc, argv))) { ENUM_WANT_SVALUE();
if (RTEST(rb_yield(i))) {
rb_ary_push(ary, i); rb_ary_push(ary, i);
} }
return Qnil; return Qnil;
@ -286,7 +302,9 @@ enum_find_all(VALUE obj)
static VALUE static VALUE
reject_i(VALUE i, VALUE ary, int argc, VALUE *argv) reject_i(VALUE i, VALUE ary, int argc, VALUE *argv)
{ {
if (!RTEST(enum_yield(argc, argv))) { ENUM_WANT_SVALUE();
if (!RTEST(rb_yield(i))) {
rb_ary_push(ary, i); rb_ary_push(ary, i);
} }
return Qnil; return Qnil;
@ -382,11 +400,14 @@ static VALUE
inject_i(VALUE i, VALUE p, int argc, VALUE *argv) inject_i(VALUE i, VALUE p, int argc, VALUE *argv)
{ {
VALUE *memo = (VALUE *)p; VALUE *memo = (VALUE *)p;
ENUM_WANT_SVALUE();
if (memo[0] == Qundef) { if (memo[0] == Qundef) {
memo[0] = i; memo[0] = i;
} }
else { else {
memo[0] = rb_yield_values(2, memo[0], enum_values_pack(argc, argv)); memo[0] = rb_yield_values(2, memo[0], i);
} }
return Qnil; return Qnil;
} }
@ -396,8 +417,10 @@ inject_op_i(VALUE i, VALUE p, int argc, VALUE *argv)
{ {
VALUE *memo = (VALUE *)p; VALUE *memo = (VALUE *)p;
ENUM_WANT_SVALUE();
if (memo[0] == Qundef) { if (memo[0] == Qundef) {
memo[0] = enum_values_pack(argc, argv); memo[0] = i;
} }
else { else {
memo[0] = rb_funcall(memo[0], (ID)memo[1], 1, i); memo[0] = rb_funcall(memo[0], (ID)memo[1], 1, i);
@ -484,7 +507,9 @@ enum_inject(int argc, VALUE *argv, VALUE obj)
static VALUE static VALUE
partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv) partition_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
{ {
if (RTEST(enum_yield(argc, argv))) { ENUM_WANT_SVALUE();
if (RTEST(rb_yield(i))) {
rb_ary_push(ary[0], i); rb_ary_push(ary[0], i);
} }
else { else {
@ -522,9 +547,12 @@ enum_partition(VALUE obj)
static VALUE static VALUE
group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv) group_by_i(VALUE i, VALUE hash, int argc, VALUE *argv)
{ {
VALUE group = enum_yield(argc, argv); VALUE group;
VALUE values; VALUE values;
ENUM_WANT_SVALUE();
group = rb_yield(i);
values = rb_hash_aref(hash, group); values = rb_hash_aref(hash, group);
if (NIL_P(values)) { if (NIL_P(values)) {
values = rb_ary_new3(1, i); values = rb_ary_new3(1, i);
@ -562,8 +590,10 @@ enum_group_by(VALUE obj)
} }
static VALUE static VALUE
first_i(VALUE i, VALUE *ary) first_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
{ {
ENUM_WANT_SVALUE();
if (NIL_P(ary[0])) { if (NIL_P(ary[0])) {
ary[1] = i; ary[1] = i;
rb_iter_break(); rb_iter_break();
@ -637,14 +667,14 @@ enum_sort(VALUE obj)
static VALUE static VALUE
sort_by_i(VALUE i, VALUE ary, int argc, VALUE *argv) sort_by_i(VALUE i, VALUE ary, int argc, VALUE *argv)
{ {
VALUE v;
NODE *memo; NODE *memo;
v = enum_yield(argc, argv); ENUM_WANT_SVALUE();
if (RBASIC(ary)->klass) { if (RBASIC(ary)->klass) {
rb_raise(rb_eRuntimeError, "sort_by reentered"); rb_raise(rb_eRuntimeError, "sort_by reentered");
} }
memo = rb_node_newnode(NODE_MEMO, v, i, 0); memo = rb_node_newnode(NODE_MEMO, rb_yield(i), i, 0);
rb_ary_push(ary, (VALUE)memo); rb_ary_push(ary, (VALUE)memo);
return Qnil; return Qnil;
} }
@ -762,9 +792,9 @@ enum_sort_by(VALUE obj)
} }
static VALUE static VALUE
all_i(VALUE i, VALUE *memo) all_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
if (!RTEST(i)) { if (!RTEST(enum_values_pack(argc, argv))) {
*memo = Qfalse; *memo = Qfalse;
rb_iter_break(); rb_iter_break();
} }
@ -772,9 +802,13 @@ all_i(VALUE i, VALUE *memo)
} }
static VALUE static VALUE
all_iter_i(VALUE i, VALUE *memo) all_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
return all_i(rb_yield(i), memo); if (!RTEST(enum_yield(argc, argv))) {
*memo = Qfalse;
rb_iter_break();
}
return Qnil;
} }
/* /*
@ -804,9 +838,9 @@ enum_all(VALUE obj)
} }
static VALUE static VALUE
any_i(VALUE i, VALUE *memo) any_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
if (RTEST(i)) { if (RTEST(enum_values_pack(argc, argv))) {
*memo = Qtrue; *memo = Qtrue;
rb_iter_break(); rb_iter_break();
} }
@ -814,9 +848,13 @@ any_i(VALUE i, VALUE *memo)
} }
static VALUE static VALUE
any_iter_i(VALUE i, VALUE *memo) any_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
return any_i(rb_yield(i), memo); if (RTEST(enum_yield(argc, argv))) {
*memo = Qtrue;
rb_iter_break();
}
return Qnil;
} }
/* /*
@ -847,9 +885,9 @@ enum_any(VALUE obj)
} }
static VALUE static VALUE
one_i(VALUE i, VALUE *memo) one_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
if (RTEST(i)) { if (RTEST(enum_values_pack(argc, argv))) {
if (*memo == Qundef) { if (*memo == Qundef) {
*memo = Qtrue; *memo = Qtrue;
} }
@ -862,9 +900,18 @@ one_i(VALUE i, VALUE *memo)
} }
static VALUE static VALUE
one_iter_i(VALUE i, VALUE *memo) one_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
return one_i(rb_yield(i), memo); if (RTEST(enum_yield(argc, argv))) {
if (*memo == Qundef) {
*memo = Qtrue;
}
else if (*memo == Qtrue) {
*memo = Qfalse;
rb_iter_break();
}
}
return Qnil;
} }
/* /*
@ -896,9 +943,9 @@ enum_one(VALUE obj)
} }
static VALUE static VALUE
none_i(VALUE i, VALUE *memo) none_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
if (RTEST(i)) { if (RTEST(enum_values_pack(argc, argv))) {
*memo = Qfalse; *memo = Qfalse;
rb_iter_break(); rb_iter_break();
} }
@ -906,9 +953,13 @@ none_i(VALUE i, VALUE *memo)
} }
static VALUE static VALUE
none_iter_i(VALUE i, VALUE *memo) none_iter_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
return none_i(rb_yield(i), memo); if (RTEST(enum_yield(argc, argv))) {
*memo = Qfalse;
rb_iter_break();
}
return Qnil;
} }
/* /*
@ -936,10 +987,12 @@ enum_none(VALUE obj)
} }
static VALUE static VALUE
min_i(VALUE i, VALUE *memo) min_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
VALUE cmp; VALUE cmp;
ENUM_WANT_SVALUE();
if (*memo == Qundef) { if (*memo == Qundef) {
*memo = i; *memo = i;
} }
@ -953,10 +1006,12 @@ min_i(VALUE i, VALUE *memo)
} }
static VALUE static VALUE
min_ii(VALUE i, VALUE *memo) min_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
VALUE cmp; VALUE cmp;
ENUM_WANT_SVALUE();
if (*memo == Qundef) { if (*memo == Qundef) {
*memo = i; *memo = i;
} }
@ -1005,10 +1060,12 @@ enum_min(VALUE obj)
} }
static VALUE static VALUE
max_i(VALUE i, VALUE *memo) max_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
VALUE cmp; VALUE cmp;
ENUM_WANT_SVALUE();
if (*memo == Qundef) { if (*memo == Qundef) {
*memo = i; *memo = i;
} }
@ -1022,10 +1079,12 @@ max_i(VALUE i, VALUE *memo)
} }
static VALUE static VALUE
max_ii(VALUE i, VALUE *memo) max_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
VALUE cmp; VALUE cmp;
ENUM_WANT_SVALUE();
if (*memo == Qundef) { if (*memo == Qundef) {
*memo = i; *memo = i;
} }
@ -1073,10 +1132,12 @@ enum_max(VALUE obj)
} }
static VALUE static VALUE
minmax_i(VALUE i, VALUE *memo) minmax_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
int n; int n;
ENUM_WANT_SVALUE();
if (memo[0] == Qundef) { if (memo[0] == Qundef) {
memo[0] = i; memo[0] = i;
memo[1] = i; memo[1] = i;
@ -1095,10 +1156,12 @@ minmax_i(VALUE i, VALUE *memo)
} }
static VALUE static VALUE
minmax_ii(VALUE i, VALUE *memo) minmax_ii(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
int n; int n;
ENUM_WANT_SVALUE();
if (memo[0] == Qundef) { if (memo[0] == Qundef) {
memo[0] = i; memo[0] = i;
memo[1] = i; memo[1] = i;
@ -1163,7 +1226,9 @@ min_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
VALUE v; VALUE v;
v = enum_yield(argc, argv); ENUM_WANT_SVALUE();
v = rb_yield(i);
if (memo[0] == Qundef) { if (memo[0] == Qundef) {
memo[0] = v; memo[0] = v;
memo[1] = i; memo[1] = i;
@ -1204,7 +1269,9 @@ max_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
VALUE v; VALUE v;
v = enum_yield(argc, argv); ENUM_WANT_SVALUE();
v = rb_yield(i);
if (memo[0] == Qundef) { if (memo[0] == Qundef) {
memo[0] = v; memo[0] = v;
memo[1] = i; memo[1] = i;
@ -1245,7 +1312,9 @@ minmax_by_i(VALUE i, VALUE *memo, int argc, VALUE *argv)
{ {
VALUE v; VALUE v;
v = enum_yield(argc, argv); ENUM_WANT_SVALUE();
v = rb_yield(i);
if (memo[0] == Qundef) { if (memo[0] == Qundef) {
memo[0] = v; memo[0] = v;
memo[1] = v; memo[1] = v;
@ -1293,9 +1362,9 @@ enum_minmax_by(VALUE obj)
} }
static VALUE static VALUE
member_i(VALUE item, VALUE *memo) member_i(VALUE iter, VALUE *memo, int argc, VALUE *argv)
{ {
if (rb_equal(item, memo[0])) { if (rb_equal(enum_values_pack(argc, argv), memo[0])) {
memo[1] = Qtrue; memo[1] = Qtrue;
rb_iter_break(); rb_iter_break();
} }
@ -1338,14 +1407,15 @@ each_with_index_i(VALUE i, VALUE memo, int argc, VALUE *argv)
* call-seq: * call-seq:
* enum.each_with_index {|obj, i| block } -> enum * enum.each_with_index {|obj, i| block } -> enum
* *
* Calls <em>block</em> with two arguments, the item and its index, for * Calls <em>block</em> with two arguments, the item and its index,
* each item in <i>enum</i>. * for each item in <i>enum</i>. Given arguments are passed through
* to #each().
* *
* hash = Hash.new * hash = Hash.new
* %w(cat dog wombat).each_with_index {|item, index| * %w(cat dog wombat).each_with_index {|item, index|
* hash[item] = index * hash[item] = index
* } * }
* hash #=> {"cat"=>0, "wombat"=>2, "dog"=>1} * hash #=> {"cat"=>0, "dog"=>1, "wombat"=>2}
* *
*/ */
@ -1493,10 +1563,10 @@ enum_zip(int argc, VALUE *argv, VALUE obj)
} }
static VALUE static VALUE
take_i(VALUE i, VALUE *arg) take_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
{ {
if (arg[1]-- == 0) rb_iter_break(); if (arg[1]-- == 0) rb_iter_break();
rb_ary_push(arg[0], i); rb_ary_push(arg[0], enum_values_pack(argc, argv));
return Qnil; return Qnil;
} }
@ -1532,7 +1602,7 @@ static VALUE
take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv) take_while_i(VALUE i, VALUE *ary, int argc, VALUE *argv)
{ {
if (!RTEST(enum_yield(argc, argv))) rb_iter_break(); if (!RTEST(enum_yield(argc, argv))) rb_iter_break();
rb_ary_push(*ary, i); rb_ary_push(*ary, enum_values_pack(argc, argv));
return Qnil; return Qnil;
} }
@ -1560,10 +1630,10 @@ enum_take_while(VALUE obj)
} }
static VALUE static VALUE
drop_i(VALUE i, VALUE *arg) drop_i(VALUE i, VALUE *arg, int argc, VALUE *argv)
{ {
if (arg[1] == 0) { if (arg[1] == 0) {
rb_ary_push(arg[0], i); rb_ary_push(arg[0], enum_values_pack(argc, argv));
} }
else { else {
arg[1]--; arg[1]--;
@ -1603,7 +1673,9 @@ enum_drop(VALUE obj, VALUE n)
static VALUE static VALUE
drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv) drop_while_i(VALUE i, VALUE *args, int argc, VALUE *argv)
{ {
if (!args[1] && !RTEST(enum_yield(argc, argv))) { ENUM_WANT_SVALUE();
if (!args[1] && !RTEST(rb_yield(i))) {
args[1] = Qtrue; args[1] = Qtrue;
} }
if (args[1]) { if (args[1]) {
@ -1640,8 +1712,10 @@ enum_drop_while(VALUE obj)
static VALUE static VALUE
cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv) cycle_i(VALUE i, VALUE ary, int argc, VALUE *argv)
{ {
ENUM_WANT_SVALUE();
rb_ary_push(ary, i); rb_ary_push(ary, i);
enum_yield(argc, argv); rb_yield(i);
return Qnil; return Qnil;
} }