From 909cfc647f8b4c0540aaa72a925e22c5e452ef05 Mon Sep 17 00:00:00 2001 From: matz Date: Thu, 20 Feb 2003 20:40:20 +0000 Subject: * string.c (rb_str_cmp_m): return nil if str2 does not respond to both "to_str" and "<=>". * compar.c (cmp_gt): return nil if "<=>" returns nil (means incomparable). * compar.c (cmp_ge): ditto. * compar.c (cmp_lt): ditto. * compar.c (cmp_between): use RTEST(), since cmp_lt and cmp_gt may return nil. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@3517 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- string.c | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) (limited to 'string.c') diff --git a/string.c b/string.c index 44f78a6b3..7a21e5c8e 100644 --- a/string.c +++ b/string.c @@ -804,14 +804,28 @@ static VALUE rb_str_cmp_m(str1, str2) VALUE str1, str2; { - int result; + long result; if (TYPE(str2) != T_STRING) { - str2 = rb_check_string_type(str2); - if (NIL_P(str2)) return Qnil; + if (!rb_respond_to(str2, rb_intern("to_str"))) { + return Qnil; + } + else if (!rb_respond_to(str2, rb_intern("<=>"))) { + return Qnil; + } + else { + VALUE tmp = rb_funcall(str2, rb_intern("<=>"), 1, str1); + + if (!FIXNUM_P(tmp)) { + return rb_funcall(LONG2FIX(0), '-', tmp); + } + result = FIX2LONG(tmp); + } + } + else { + result = rb_str_cmp(str1, str2); } - result = rb_str_cmp(str1, str2); - return INT2FIX(result); + return LONG2FIX(result); } static VALUE -- cgit