summaryrefslogtreecommitdiff
path: root/string.c
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 08:43:42 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-11-30 08:43:42 +0000
commit1dbc720c0d91bfdb39dbef75606d5cd4ef4d9884 (patch)
tree30b8d0c9866957f05473bbed5e49fa45b98a4621 /string.c
parent981f9c52c6b0d7197e098ae9a0375485cf0c9c0c (diff)
string.c: always fixed value
* string.c (rb_str_cmp_m): return fixed value, one of -1,0,+1 always. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38042 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'string.c')
-rw-r--r--string.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/string.c b/string.c
index 0c30ee4bc2..4270460e16 100644
--- a/string.c
+++ b/string.c
@@ -2382,7 +2382,7 @@ rb_str_eql(VALUE str1, VALUE str2)
static VALUE
rb_str_cmp_m(VALUE str1, VALUE str2)
{
- long result;
+ int result;
if (!RB_TYPE_P(str2, T_STRING)) {
if (!rb_respond_to(str2, rb_intern("to_str"))) {
@@ -2395,16 +2395,13 @@ rb_str_cmp_m(VALUE str1, VALUE str2)
VALUE tmp = rb_funcall(str2, rb_intern("<=>"), 1, str1);
if (NIL_P(tmp)) return Qnil;
- if (!FIXNUM_P(tmp)) {
- return rb_funcall(LONG2FIX(0), '-', 1, tmp);
- }
- result = -FIX2LONG(tmp);
+ result = -rb_cmpint(tmp, str1, str2);
}
}
else {
result = rb_str_cmp(str1, str2);
}
- return LONG2NUM(result);
+ return INT2FIX(result);
}
/*