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: Fix bug in enum_sort_by and some code indents

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2624 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
michal 2002-07-05 08:58:57 +00:00
parent ad9af3738b
commit 722c202b9a
2 changed files with 60 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Fri Jul 5 08:59:15 2002 Michal Rokos <michal@ruby-lang.org>
* enum.c: Fix bug in enum_sort_by and some code indents
Fri Jul 5 05:00:40 2002 Wakou Aoyama <wakou@ruby-lang.org> Fri Jul 5 05:00:40 2002 Wakou Aoyama <wakou@ruby-lang.org>
* lib/cgi.rb (CGI#initialize): improvement for mod_ruby. * lib/cgi.rb (CGI#initialize): improvement for mod_ruby.

98
enum.c
View file

@ -48,16 +48,15 @@ static VALUE
enum_grep(obj, pat) enum_grep(obj, pat)
VALUE obj, pat; VALUE obj, pat;
{ {
VALUE tmp, arg[2]; VALUE ary = rb_ary_new();
VALUE arg[2];
arg[0] = pat; arg[1] = tmp = rb_ary_new(); arg[0] = pat;
if (rb_block_given_p()) { arg[1] = ary;
rb_iterate(rb_each, obj, grep_iter_i, (VALUE)arg);
} rb_iterate(rb_each, obj, rb_block_given_p() ? grep_iter_i : grep_i, (VALUE)arg);
else {
rb_iterate(rb_each, obj, grep_i, (VALUE)arg); return ary;
}
return tmp;
} }
static VALUE static VALUE
@ -97,11 +96,11 @@ enum_find(argc, argv, obj)
} }
static VALUE static VALUE
find_all_i(i, tmp) find_all_i(i, ary)
VALUE i, tmp; VALUE i, ary;
{ {
if (RTEST(rb_yield(i))) { if (RTEST(rb_yield(i))) {
rb_ary_push(tmp, i); rb_ary_push(ary, i);
} }
return Qnil; return Qnil;
} }
@ -110,20 +109,19 @@ static VALUE
enum_find_all(obj) enum_find_all(obj)
VALUE obj; VALUE obj;
{ {
VALUE tmp; VALUE ary = rb_ary_new();
tmp = rb_ary_new(); rb_iterate(rb_each, obj, find_all_i, ary);
rb_iterate(rb_each, obj, find_all_i, tmp);
return tmp; return ary;
} }
static VALUE static VALUE
reject_i(i, tmp) reject_i(i, ary)
VALUE i, tmp; VALUE i, ary;
{ {
if (!RTEST(rb_yield(i))) { if (!RTEST(rb_yield(i))) {
rb_ary_push(tmp, i); rb_ary_push(ary, i);
} }
return Qnil; return Qnil;
} }
@ -132,19 +130,19 @@ static VALUE
enum_reject(obj) enum_reject(obj)
VALUE obj; VALUE obj;
{ {
VALUE tmp; VALUE ary = rb_ary_new();
tmp = rb_ary_new(); rb_iterate(rb_each, obj, reject_i, ary);
rb_iterate(rb_each, obj, reject_i, tmp);
return tmp; return ary;
} }
static VALUE static VALUE
collect_i(i, tmp) collect_i(i, ary)
VALUE i, tmp; VALUE i, ary;
{ {
rb_ary_push(tmp, rb_yield(i)); rb_ary_push(ary, rb_yield(i));
return Qnil; return Qnil;
} }
@ -153,6 +151,7 @@ collect_all(i, ary)
VALUE i, ary; VALUE i, ary;
{ {
rb_ary_push(ary, i); rb_ary_push(ary, i);
return Qnil; return Qnil;
} }
@ -160,9 +159,8 @@ static VALUE
enum_to_a(obj) enum_to_a(obj)
VALUE obj; VALUE obj;
{ {
VALUE ary; VALUE ary = rb_ary_new();
ary = rb_ary_new();
rb_iterate(rb_each, obj, collect_all, ary); rb_iterate(rb_each, obj, collect_all, ary);
return ary; return ary;
@ -172,9 +170,8 @@ static VALUE
enum_collect(obj) enum_collect(obj)
VALUE obj; VALUE obj;
{ {
VALUE ary; VALUE ary = rb_ary_new();
ary = rb_ary_new();
rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary); rb_iterate(rb_each, obj, rb_block_given_p() ? collect_i : collect_all, ary);
return ary; return ary;
@ -192,7 +189,6 @@ inject_i(i, memo)
else { else {
memo->u1.value = rb_yield(rb_assoc_new(memo->u1.value, i)); memo->u1.value = rb_yield(rb_assoc_new(memo->u1.value, i));
} }
return Qnil; return Qnil;
} }
@ -204,14 +200,14 @@ enum_inject(argc, argv, obj)
NODE *memo; NODE *memo;
VALUE n; VALUE n;
if (rb_scan_args(argc, argv, "01", &n) == 1) if (rb_scan_args(argc, argv, "01", &n) == 1) {
memo = rb_node_newnode(NODE_MEMO, n, Qfalse, 0); memo = rb_node_newnode(NODE_MEMO, n, Qfalse, 0);
else }
else {
memo = rb_node_newnode(NODE_MEMO, Qnil, Qtrue, 0); memo = rb_node_newnode(NODE_MEMO, Qnil, Qtrue, 0);
}
rb_iterate(rb_each, obj, inject_i, (VALUE)memo); rb_iterate(rb_each, obj, inject_i, (VALUE)memo);
n = memo->u1.value; n = memo->u1.value;
rb_gc_force_recycle((VALUE)memo); rb_gc_force_recycle((VALUE)memo);
return n; return n;
} }
@ -280,14 +276,13 @@ enum_sort_by(obj)
ary = rb_ary_new2((TYPE(obj) == T_ARRAY) ? RARRAY(obj)->len : 2000); ary = rb_ary_new2((TYPE(obj) == T_ARRAY) ? RARRAY(obj)->len : 2000);
rb_iterate(rb_each, obj, sort_by_i, ary); rb_iterate(rb_each, obj, sort_by_i, ary);
if (RARRAY(obj)->len > 1) { if (RARRAY(ary)->len > 1) {
qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp); qsort(RARRAY(ary)->ptr, RARRAY(ary)->len, sizeof(VALUE), sort_by_cmp);
} }
for (i=0; i<RARRAY(ary)->len; i++) { for (i=0; i<RARRAY(ary)->len; i++) {
VALUE e = RARRAY(ary)->ptr[i]; VALUE e = RARRAY(ary)->ptr[i];
RARRAY(ary)->ptr[i] = RARRAY(e)->ptr[1]; RARRAY(ary)->ptr[i] = RARRAY(e)->ptr[1];
} }
return ary; return ary;
} }
@ -350,13 +345,15 @@ min_i(i, memo)
{ {
VALUE cmp; VALUE cmp;
if (NIL_P(memo->u1.value)) if (NIL_P(memo->u1.value)) {
memo->u1.value = i; memo->u1.value = i;
}
else { else {
cmp = rb_funcall(i, id_cmp, 1, memo->u1.value); cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
if (rb_cmpint(cmp) < 0) if (rb_cmpint(cmp) < 0) {
memo->u1.value = i; memo->u1.value = i;
} }
}
return Qnil; return Qnil;
} }
@ -367,13 +364,15 @@ min_ii(i, memo)
{ {
VALUE cmp; VALUE cmp;
if (NIL_P(memo->u1.value)) if (NIL_P(memo->u1.value)) {
memo->u1.value = i; memo->u1.value = i;
}
else { else {
cmp = rb_yield(rb_assoc_new(i, memo->u1.value)); cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
if (rb_cmpint(cmp) < 0) if (rb_cmpint(cmp) < 0) {
memo->u1.value = i; memo->u1.value = i;
} }
}
return Qnil; return Qnil;
} }
@ -384,7 +383,7 @@ enum_min(obj)
VALUE result; VALUE result;
NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0); NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
rb_iterate(rb_each, obj, rb_block_given_p()?min_ii:min_i, (VALUE)memo); rb_iterate(rb_each, obj, rb_block_given_p() ? min_ii : min_i, (VALUE)memo);
result = memo->u1.value; result = memo->u1.value;
rb_gc_force_recycle((VALUE)memo); rb_gc_force_recycle((VALUE)memo);
return result; return result;
@ -397,13 +396,15 @@ max_i(i, memo)
{ {
VALUE cmp; VALUE cmp;
if (NIL_P(memo->u1.value)) if (NIL_P(memo->u1.value)) {
memo->u1.value = i; memo->u1.value = i;
}
else { else {
cmp = rb_funcall(i, id_cmp, 1, memo->u1.value); cmp = rb_funcall(i, id_cmp, 1, memo->u1.value);
if (rb_cmpint(cmp) > 0) if (rb_cmpint(cmp) > 0) {
memo->u1.value = i; memo->u1.value = i;
} }
}
return Qnil; return Qnil;
} }
@ -414,13 +415,15 @@ max_ii(i, memo)
{ {
VALUE cmp; VALUE cmp;
if (NIL_P(memo->u1.value)) if (NIL_P(memo->u1.value)) {
memo->u1.value = i; memo->u1.value = i;
}
else { else {
cmp = rb_yield(rb_assoc_new(i, memo->u1.value)); cmp = rb_yield(rb_assoc_new(i, memo->u1.value));
if (rb_cmpint(cmp) > 0) if (rb_cmpint(cmp) > 0) {
memo->u1.value = i; memo->u1.value = i;
} }
}
return Qnil; return Qnil;
} }
@ -431,7 +434,7 @@ enum_max(obj)
VALUE result; VALUE result;
NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0); NODE *memo = rb_node_newnode(NODE_MEMO, Qnil, 0, 0);
rb_iterate(rb_each, obj, rb_block_given_p()?max_ii:max_i, (VALUE)memo); rb_iterate(rb_each, obj, rb_block_given_p() ? max_ii : max_i, (VALUE)memo);
result = memo->u1.value; result = memo->u1.value;
rb_gc_force_recycle((VALUE)memo); rb_gc_force_recycle((VALUE)memo);
return result; return result;
@ -515,3 +518,4 @@ Init_Enumerable()
id_each = rb_intern("each"); id_each = rb_intern("each");
id_cmp = rb_intern("<=>"); id_cmp = rb_intern("<=>");
} }