nobu	2008-05-01 23:43:24 +0900 (Thu, 01 May 2008)

  New Revision: 16256

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/range.c
    trunk/ChangeLog
    trunk/range.c

  Log:
    * range.c (range_step): check if step can be converted to an integer.
      [ruby-dev:34558]


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/range.c?r1=16256&r2=16255&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=16256&r2=16255&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=16256&r2=16255&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/range.c?r1=16256&r2=16255&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16255)
+++ ChangeLog	(revision 16256)
@@ -1,5 +1,8 @@
-Thu May  1 23:35:11 2008  Nobuyoshi Nakada  <nobu@r...>
+Thu May  1 23:43:21 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* range.c (range_step): check if step can be converted to an integer.
+	  [ruby-dev:34558]
+
 	* range.c (range_step): allow float step bigger than zero but less
 	  than one.  [ruby-dev:34557]
 
Index: range.c
===================================================================
--- range.c	(revision 16255)
+++ range.c	(revision 16256)
@@ -308,11 +308,13 @@
     }
     else {
 	rb_scan_args(argc, argv, "01", &step);
-	if (FIXNUM_P(step)) {
+	tmp = rb_check_to_integer(step, "to_int");
+	if (!NIL_P(tmp)) {
+	    step = tmp;
 	    unit = NUM2LONG(step);
 	}
 	else {
-	    VALUE tmp = rb_funcall(rb_funcall(b, '+', 1, step), '-', 1, b);
+	    tmp = rb_funcall(rb_funcall(b, '+', 1, step), '-', 1, b);
 	    unit = rb_cmpint(tmp, step, INT2FIX(0));
 	}
     }
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 16255)
+++ ruby_1_8/ChangeLog	(revision 16256)
@@ -1,5 +1,8 @@
-Thu May  1 23:35:11 2008  Nobuyoshi Nakada  <nobu@r...>
+Thu May  1 23:43:21 2008  Nobuyoshi Nakada  <nobu@r...>
 
+	* range.c (range_step): check if step can be converted to an integer.
+	  [ruby-dev:34558]
+
 	* range.c (range_step): allow float step bigger than zero but less
 	  than one.  [ruby-dev:34557]
 
Index: ruby_1_8/range.c
===================================================================
--- ruby_1_8/range.c	(revision 16255)
+++ ruby_1_8/range.c	(revision 16256)
@@ -307,7 +307,7 @@
     VALUE *argv;
     VALUE range;
 {
-    VALUE b, e, step;
+    VALUE b, e, step, tmp;
     long unit;
 
     RETURN_ENUMERATOR(range, argc, argv);
@@ -320,11 +320,13 @@
     }
     else {
 	rb_scan_args(argc, argv, "01", &step);
-	if (FIXNUM_P(step)) {
+	tmp = rb_check_to_integer(step, "to_int");
+	if (!NIL_P(tmp)) {
+	    step = tmp;
 	    unit = NUM2LONG(step);
 	}
 	else {
-	    VALUE tmp = rb_funcall(rb_funcall(b, '+', 1, step), '-', 1, b);
+	    tmp = rb_funcall(rb_funcall(b, '+', 1, step), '-', 1, b);
 	    unit = rb_cmpint(tmp, step, INT2FIX(0));
 	}
     }

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