From 68a6f2e9e0c6fc2ba09463c848dbbb4ece3e07a1 Mon Sep 17 00:00:00 2001 From: mame Date: Thu, 17 Mar 2016 12:14:21 +0000 Subject: * array.c (rb_ary_max, rb_ary_min): Array#max and Array#min added. [Feature #12172] * internal.h (OPTIMIZED_CMP): moved from enum.c so that array.c can use it. * test/ruby/test_array.rb (test_max, test_min): tests for Array#max and Array#min. * test/ruby/test_enum.rb (test_max, test_min): revised a bit to test Enumerable#max and #min explicitly. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54150 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- enum.c | 7 ------- 1 file changed, 7 deletions(-) (limited to 'enum.c') diff --git a/enum.c b/enum.c index 3fc45b2055..914faeffbf 100644 --- a/enum.c +++ b/enum.c @@ -1486,13 +1486,6 @@ enum_none(VALUE obj) return memo->v1; } -#define OPTIMIZED_CMP(a, b, data) \ - ((FIXNUM_P(a) && FIXNUM_P(b) && CMP_OPTIMIZABLE(data, Fixnum)) ? \ - (((long)a > (long)b) ? 1 : ((long)a < (long)b) ? -1 : 0) : \ - (STRING_P(a) && STRING_P(b) && CMP_OPTIMIZABLE(data, String)) ? \ - rb_str_cmp(a, b) : \ - rb_cmpint(rb_funcallv(a, id_cmp, 1, &b), a, b)) - struct min_t { VALUE min; struct cmp_opt_data cmp_opt; -- cgit v1.2.3