diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-22 09:14:24 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2002-11-22 09:14:24 +0000 |
commit | e2d384d628c8e4bd59300844e9111645d1070d5a (patch) | |
tree | cce3e69dea4b7f93481a4cdc5d16c61558cfa546 /compar.c | |
parent | 8347974c9fd6fcfd6af8d06f5c8ceca3bce76057 (diff) |
* file.c (rb_find_file_ext): should not terminate searching with
empty path, just ignore.
* dir.c: remove <sys/parm.h> inclusion.
* compar.c (cmp_eq,cmp_gt,cmp_ge,cmp_lt,cmp_le): check using
rb_cmpint().
* error.c (init_syserr): remove sys_nerr dependency.
* numeric.c (num_cmp): added to satisfy Comparable assumption.
* eval.c (rb_add_method): "initialize" should be public if it is a
singleton method.
* regex.c (re_match): avoid dereferencing if size == 0.
(ruby-bugs-ja:PR#360)
* time.c (time_cmp): should return nil if an operand is not a
number nor time. (ruby-bugs-ja:PR#359)
* file.c (rb_stat_cmp): should return nil if an operand is not
File::Stat.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3076 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'compar.c')
-rw-r--r-- | compar.c | 46 |
1 files changed, 22 insertions, 24 deletions
@@ -16,17 +16,31 @@ VALUE rb_mComparable; static ID cmp; +int +rb_cmpint(val) + VALUE val; +{ + if (FIXNUM_P(val)) return FIX2INT(val); + if (TYPE(val) == T_BIGNUM) { + if (RBIGNUM(val)->sign) return 1; + return -1; + } + if (RTEST(rb_funcall(val, '>', 1, INT2FIX(0)))) return 1; + if (RTEST(rb_funcall(val, '<', 1, INT2FIX(0)))) return -1; + return 0; +} + static VALUE cmp_equal(x, y) VALUE x, y; { - VALUE c = rb_funcall(x, cmp, 1, y); + int c; + if (x == y) return Qtrue; + c = rb_funcall(x, cmp, 1, y); if (NIL_P(c)) return Qfalse; if (c == INT2FIX(0)) return Qtrue; - if (TYPE(c) == T_BIGNUM) { - if (rb_big_norm(c) == INT2FIX(0)) return Qtrue; - } + if (rb_cmpint(c) == 0) return Qtrue; return Qfalse; } @@ -37,11 +51,7 @@ cmp_gt(x, y) VALUE c = rb_funcall(x, cmp, 1, y); if (NIL_P(c)) return Qfalse; - if (FIXNUM_P(c) && FIX2INT(c) > 0) return Qtrue; - if (TYPE(c) == T_BIGNUM) { - if (rb_big_norm(x) == INT2FIX(0)) return Qfalse; - if (RBIGNUM(c)->sign) return Qtrue; - } + if (rb_cmpint(c) > 0) return Qtrue; return Qfalse; } @@ -52,11 +62,7 @@ cmp_ge(x, y) VALUE c = rb_funcall(x, cmp, 1, y); if (NIL_P(c)) return Qfalse; - if (FIXNUM_P(c) && FIX2INT(c) >= 0) return Qtrue; - if (TYPE(c) == T_BIGNUM) { - if (rb_big_norm(x) == INT2FIX(0)) return Qtrue; - if (RBIGNUM(c)->sign) return Qtrue; - } + if (rb_cmpint(c) >= 0) return Qtrue; return Qfalse; } @@ -66,11 +72,7 @@ cmp_lt(x, y) { VALUE c = rb_funcall(x, cmp, 1, y); - if (FIXNUM_P(c) && FIX2INT(c) < 0) return Qtrue; - if (TYPE(c) == T_BIGNUM) { - if (rb_big_norm(x) == INT2FIX(0)) return Qfalse; - if (!RBIGNUM(c)->sign) return Qtrue; - } + if (rb_cmpint(c) < 0) return Qtrue; return Qfalse; } @@ -81,11 +83,7 @@ cmp_le(x, y) VALUE c = rb_funcall(x, cmp, 1, y); if (NIL_P(c)) return Qfalse; - if (FIXNUM_P(c) && FIX2INT(c) <= 0) return Qtrue; - if (TYPE(c) == T_BIGNUM) { - if (rb_big_norm(x) == INT2FIX(0)) return Qtrue; - if (!RBIGNUM(c)->sign) return Qtrue; - } + if (rb_cmpint(c) <= 0) return Qtrue; return Qfalse; } |