summaryrefslogtreecommitdiff
path: root/internal.h
diff options
context:
space:
mode:
authormame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-17 12:14:21 (GMT)
committermame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-03-17 12:14:21 (GMT)
commit68a6f2e9e0c6fc2ba09463c848dbbb4ece3e07a1 (patch)
treeff47d04d683438a00f3f406bcd3a4e89d9732072 /internal.h
parenta22455199bf5b3ce68a6bded62a5c184373d1adb (diff)
* 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
Diffstat (limited to 'internal.h')
-rw-r--r--internal.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/internal.h b/internal.h
index 03b1e1c..4a38762 100644
--- a/internal.h
+++ b/internal.h
@@ -698,6 +698,13 @@ struct cmp_opt_data {
rb_method_basic_definition_p(TOKEN_PASTE(rb_c,type), id_cmp) && \
((data).opt_methods |= CMP_OPTIMIZABLE_BIT(type))))
+#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))
+
/* ment is in method.h */
/* global variable */