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

* array.c (rb_ary_max, rb_ary_min): implement a block by itself instead

Browse Source 
of delegating Enumerable#max/min.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54151 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mame 2016-03-17 12:25:40 +00:00
parent 68a6f2e9e0
commit 90ab5beb42
2 changed files with 37 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Thu Mar 17 21:24:52 2016 Yusuke Endoh <mame@ruby-lang.org>
* array.c (rb_ary_max, rb_ary_min): implement a block by itself instead
of delegating Enumerable#max/min.
Thu Mar 17 21:09:34 2016 Yusuke Endoh <mame@ruby-lang.org> Thu Mar 17 21:09:34 2016 Yusuke Endoh <mame@ruby-lang.org>
* array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added. * array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added.

44
array.c
View File

@ -4210,14 +4210,24 @@ rb_ary_max(int argc, VALUE *argv, VALUE ary)
rb_scan_args(argc, argv, "01", &num); rb_scan_args(argc, argv, "01", &num);
if (!NIL_P(num) || rb_block_given_p()) if (!NIL_P(num))
return rb_call_super(argc, argv); /* XXX: should redefine? */ return rb_call_super(argc, argv); /* XXX: should redefine? */
for (i = 0; i < RARRAY_LEN(ary); i++) { if (rb_block_given_p()) {
v = RARRAY_AREF(ary, i); for (i = 0; i < RARRAY_LEN(ary); i++) {
if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) { v = RARRAY_AREF(ary, i);
result = v; if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) > 0) {
} result = v;
}
}
}
else {
for (i = 0; i < RARRAY_LEN(ary); i++) {
v = RARRAY_AREF(ary, i);
if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) > 0) {
result = v;
}
}
} }
if (result == Qundef) return Qnil; if (result == Qundef) return Qnil;
return result; return result;
@ -4255,14 +4265,24 @@ rb_ary_min(int argc, VALUE *argv, VALUE ary)
rb_scan_args(argc, argv, "01", &num); rb_scan_args(argc, argv, "01", &num);
if (!NIL_P(num) || rb_block_given_p()) if (!NIL_P(num))
return rb_call_super(argc, argv); /* XXX: should redefine? */ return rb_call_super(argc, argv); /* XXX: should redefine? */
for (i = 0; i < RARRAY_LEN(ary); i++) { if (rb_block_given_p()) {
v = RARRAY_AREF(ary, i); for (i = 0; i < RARRAY_LEN(ary); i++) {
if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) { v = RARRAY_AREF(ary, i);
result = v; if (result == Qundef || rb_cmpint(rb_yield_values(2, v, result), v, result) < 0) {
} result = v;
}
}
}
else {
for (i = 0; i < RARRAY_LEN(ary); i++) {
v = RARRAY_AREF(ary, i);
if (result == Qundef || OPTIMIZED_CMP(v, result, cmp_opt) < 0) {
result = v;
}
}
} }
if (result == Qundef) return Qnil; if (result == Qundef) return Qnil;
return result; return result;