summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-02 09:20:21 (GMT)
committermatz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-02 09:20:21 (GMT)
commitfd5f913f333dbdca213c2adffe5b680aa9915eac (patch)
tree80595ae9f08a71d682531a40722d9c3152f9e4e0
parentc9356d82bc56fae5858f0cbdb9078637ed3c779b (diff)
* compar.c (cmp_gt): raises ArgumentError when "<=>" give nil.
inspired by discussion on comp.lang.python. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3746 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--compar.c18
2 files changed, 18 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 129d4ee..27691e8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Fri May 2 18:17:37 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
+
+ * compar.c (cmp_gt): raises ArgumentError when "<=>" give nil.
+ inspired by discussion on comp.lang.python.
+
Fri May 2 17:37:01 2003 Yukihiro Matsumoto <matz@ruby-lang.org>
* lib/cgi/session.rb (CGI::Session::initialize): updated to
diff --git a/compar.c b/compar.c
index 42258d5..0a5a10e 100644
--- a/compar.c
+++ b/compar.c
@@ -31,14 +31,22 @@ rb_cmpint(val)
}
static VALUE
+cmperr()
+{
+ rb_raise(rb_eArgError, "comparison failed");
+ return Qnil; /* not reached */
+}
+
+static VALUE
cmp_equal(x, y)
VALUE x, y;
{
int c;
if (x == y) return Qtrue;
+
c = rb_funcall(x, cmp, 1, y);
- if (NIL_P(c)) return Qfalse;
+ if (NIL_P(c)) return Qnil;
if (c == INT2FIX(0)) return Qtrue;
if (rb_cmpint(c) == 0) return Qtrue;
return Qfalse;
@@ -50,7 +58,7 @@ cmp_gt(x, y)
{
VALUE c = rb_funcall(x, cmp, 1, y);
- if (NIL_P(c)) return Qnil;
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c) > 0) return Qtrue;
return Qfalse;
}
@@ -61,7 +69,7 @@ cmp_ge(x, y)
{
VALUE c = rb_funcall(x, cmp, 1, y);
- if (NIL_P(c)) return Qnil;
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c) >= 0) return Qtrue;
return Qfalse;
}
@@ -72,7 +80,7 @@ cmp_lt(x, y)
{
VALUE c = rb_funcall(x, cmp, 1, y);
- if (NIL_P(c)) return Qnil;
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c) < 0) return Qtrue;
return Qfalse;
}
@@ -83,7 +91,7 @@ cmp_le(x, y)
{
VALUE c = rb_funcall(x, cmp, 1, y);
- if (NIL_P(c)) return Qnil;
+ if (NIL_P(c)) return cmperr();
if (rb_cmpint(c) <= 0) return Qtrue;
return Qfalse;
}