matz	2008-05-02 16:15:28 +0900 (Fri, 02 May 2008)

  New Revision: 16269

  Modified files:
    trunk/ChangeLog
    trunk/range.c

  Log:
    * range.c (range_step): do not forcefully convert steps into
      integers.  [ruby-dev:34571]

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16269&r2=16268&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/range.c?r1=16269&r2=16268&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16268)
+++ ChangeLog	(revision 16269)
@@ -1,3 +1,8 @@
+Fri May  2 16:10:57 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* range.c (range_step): do not forcefully convert steps into
+	  integers.  [ruby-dev:34571]
+
 Fri May  2 14:52:33 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* misc/ruby-mode.el: move fontifying code from hook.  a patch from
Index: range.c
===================================================================
--- range.c	(revision 16268)
+++ range.c	(revision 16269)
@@ -296,7 +296,6 @@
 range_step(int argc, VALUE *argv, VALUE range)
 {
     VALUE b, e, step, tmp;
-    long unit;
 
     RETURN_ENUMERATOR(range, argc, argv);
 
@@ -304,33 +303,20 @@
     e = RANGE_END(range);
     if (argc == 0) {
 	step = INT2FIX(1);
-	unit = 1;
     }
     else {
 	rb_scan_args(argc, argv, "01", &step);
-	tmp = rb_check_to_integer(step, "to_int");
-	if (!NIL_P(tmp)) {
-	    if (FIXNUM_P(tmp))
-		unit = FIX2LONG(tmp);
-	    else 
-		unit = rb_cmpint(tmp, step, INT2FIX(0));
-	    step = tmp;
+	if (rb_funcall(step, '<', 1, INT2FIX(0))) {
+	    rb_raise(rb_eArgError, "step can't be negative");
 	}
-	else {
-	    tmp = rb_funcall(rb_funcall(b, '+', 1, step), '-', 1, b);
-	    unit = rb_cmpint(tmp, step, INT2FIX(0));
+	else if (!rb_funcall(step, '>', 1, INT2FIX(0))) {
+	    rb_raise(rb_eArgError, "step can't be 0");
 	}
     }
-    if (unit < 0) {
-	rb_raise(rb_eArgError, "step can't be negative");
-    }
-    if (unit == 0) {
-	rb_raise(rb_eArgError, "step can't be 0");
-    }
 
     if (FIXNUM_P(b) && FIXNUM_P(e) && FIXNUM_P(step)) { /* fixnums are special */
 	long end = FIX2LONG(e);
-	long i;
+	long i, unit = FIX2LONG(step);
 
 	if (!EXCL(range))
 	    end += 1;

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/