nobu	2008-05-01 23:35:13 +0900 (Thu, 01 May 2008)

  New Revision: 16255

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

  Log:
    * range.c (range_step): allow float step bigger than zero but less
      than one.  [ruby-dev:34557]


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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 16254)
+++ ChangeLog	(revision 16255)
@@ -1,3 +1,8 @@
+Thu May  1 23:35:11 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* range.c (range_step): allow float step bigger than zero but less
+	  than one.  [ruby-dev:34557]
+
 Thu May  1 23:20:12 2008  Nobuyoshi Nakada  <nobu@r...>
 
 	* bignum.c (rb_big_divide): return an integer for idiv.
Index: range.c
===================================================================
--- range.c	(revision 16254)
+++ range.c	(revision 16255)
@@ -312,7 +312,7 @@
 	    unit = NUM2LONG(step);
 	}
 	else {
-	    VALUE tmp = rb_to_int(step);
+	    VALUE 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 16254)
+++ ruby_1_8/ChangeLog	(revision 16255)
@@ -1,3 +1,8 @@
+Thu May  1 23:35:11 2008  Nobuyoshi Nakada  <nobu@r...>
+
+	* range.c (range_step): allow float step bigger than zero but less
+	  than one.  [ruby-dev:34557]
+
 Wed Apr 30 20:22:40 2008  James Edward Gray II  <jeg2@r...>
 
 	Merged 16241 from trunk.
Index: ruby_1_8/version.h
===================================================================
--- ruby_1_8/version.h	(revision 16254)
+++ ruby_1_8/version.h	(revision 16255)
@@ -1,15 +1,15 @@
 #define RUBY_VERSION "1.8.7"
-#define RUBY_RELEASE_DATE "2008-04-30"
+#define RUBY_RELEASE_DATE "2008-05-01"
 #define RUBY_VERSION_CODE 187
-#define RUBY_RELEASE_CODE 20080430
+#define RUBY_RELEASE_CODE 20080501
 #define RUBY_PATCHLEVEL 5000
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
 #define RUBY_VERSION_TEENY 7
 #define RUBY_RELEASE_YEAR 2008
-#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 30
+#define RUBY_RELEASE_MONTH 5
+#define RUBY_RELEASE_DAY 1
 
 #ifdef RUBY_EXTERN
 RUBY_EXTERN const char ruby_version[];
Index: ruby_1_8/range.c
===================================================================
--- ruby_1_8/range.c	(revision 16254)
+++ ruby_1_8/range.c	(revision 16255)
@@ -314,16 +314,19 @@
 
     b = rb_ivar_get(range, id_beg);
     e = rb_ivar_get(range, id_end);
-    if (rb_scan_args(argc, argv, "01", &step) == 0) {
+    if (argc == 0) {
 	step = INT2FIX(1);
 	unit = 1;
     }
-    else if (FIXNUM_P(step)) {
-	unit = NUM2LONG(step);
-    }
     else {
-	VALUE tmp = rb_to_int(step);
-	unit = rb_cmpint(tmp, step, INT2FIX(0));
+	rb_scan_args(argc, argv, "01", &step);
+	if (FIXNUM_P(step)) {
+	    unit = NUM2LONG(step);
+	}
+	else {
+	    VALUE tmp = rb_funcall(rb_funcall(b, '+', 1, step), '-', 1, b);
+	    unit = rb_cmpint(tmp, step, INT2FIX(0));
+	}
     }
     if (unit < 0) {
 	rb_raise(rb_eArgError, "step can't be negative");

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