* time.c (rb_time_succ): make Time#succ obsolete since time is not

  a discrete value.

* range.c (discrete_object_p): treat time objects specially to
  determine discrete values, since time objects have #succ yet are
  discrete (for now at least).

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@25170 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 2 deletions

diff --git a/range.c b/range.c
index 1c735d0ed..ec10bdf90 100644
--- a/range.c
+++ b/range.c
@@ -308,6 +308,15 @@ step_i(VALUE i, void *arg)
 
 extern int ruby_float_step(VALUE from, VALUE to, VALUE step, int excl);
 
+static int
+discrete_object_p(obj)
+{
+    if (rb_obj_is_kind_of(obj, rb_cTime)) return Qfalse; /* until Time#succ removed */
+    if (rb_respond_to(obj, id_succ)) return Qtrue;
+    return Qfalse;
+}
+
+
 /*
  *  call-seq:
  *     rng.step(n=1) {| obj | block }    => rng
@@ -416,7 +425,7 @@ range_step(int argc, VALUE *argv, VALUE range)
 	else {
 	    VALUE args[2];
 
-	    if (!rb_respond_to(b, id_succ)) {
+	    if (!discrete_object_p(b)) {
 		rb_raise(rb_eTypeError, "can't iterate from %s",
 			 rb_obj_classname(b));
 	    }
@@ -498,7 +507,7 @@ range_each(VALUE range)
 	    rb_block_call(tmp, rb_intern("upto"), 2, args, rb_yield, 0);
 	}
 	else {
-	    if (!rb_respond_to(beg, id_succ)) {
+	    if (!discrete_object_p(beg)) {
 		rb_raise(rb_eTypeError, "can't iterate from %s",
 			 rb_obj_classname(beg));
 	    }