* numeric.c (int_upto, int_downto): should fail unless the

  argument is comparable.  (ruby-bugs-ja:PR#454)


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3766 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 24 insertions, 4 deletions

diff --git a/numeric.c b/numeric.c
index afc3590644..edc42ef6bd 100644
--- a/numeric.c
+++ b/numeric.c
@@ -1654,6 +1654,28 @@ fix_size(fix)
 }
 
 static VALUE
+int_compare(i, to, id)
+    VALUE i, to;
+    ID id;
+{
+    VALUE cmp = rb_funcall(i, id, 1, to);
+    if (NIL_P(cmp)) {
+	char *toclass;
+
+	if (SPECIAL_CONST_P(to)) {
+	    to = rb_inspect(to);
+	    toclass = StringValuePtr(to);
+	}
+	else {
+	    toclass = rb_obj_classname(to);
+	}
+	rb_raise(rb_eArgError, "cannot compare %s with %s",
+		 rb_obj_classname(i), toclass);
+    }
+    return cmp;
+}
+
+static VALUE
 int_upto(from, to)
     VALUE from, to;
 {
@@ -1668,8 +1690,7 @@ int_upto(from, to)
     else {
 	VALUE i = from;
 
-	for (;;) {
-	    if (RTEST(rb_funcall(i, '>', 1, to))) break;
+	while (!int_compare(i, to, '>')) {
 	    rb_yield(i);
 	    i = rb_funcall(i, '+', 1, INT2FIX(1));
 	}
@@ -1692,8 +1713,7 @@ int_downto(from, to)
     else {
 	VALUE i = from;
 
-	for (;;) {
-	    if (RTEST(rb_funcall(i, '<', 1, to))) break;
+	while (!int_compare(i, to, '<')) {
 	    rb_yield(i);
 	    i = rb_funcall(i, '-', 1, INT2FIX(1));
 	}