tarui	2011-07-10 09:47:31 +0900 (Sun, 10 Jul 2011)

  New Revision: 32482

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=32482

  Log:
    * range.c (range_max): fix behavior with excluded end value.
      [Bug #4591]

  Modified files:
    trunk/ChangeLog
    trunk/range.c
    trunk/test/ruby/test_range.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 32481)
+++ ChangeLog	(revision 32482)
@@ -1,3 +1,8 @@
+Sun Jul 10 09:46:14 2011  Masaya Tarui  <tarui@r...>
+
+	* range.c (range_max): fix behavior with excluded end value.
+	  [Bug #4591]
+
 Sun Jul 10 09:13:18 2011  Eric Hodel  <drbrain@s...>
 
 	* NEWS:  Fix RubyGems version.  [Ruby 1.9 - Bug #5004]
Index: range.c
===================================================================
--- range.c	(revision 32481)
+++ range.c	(revision 32482)
@@ -665,6 +665,9 @@
 		rb_raise(rb_eTypeError, "cannot exclude non Integer end value");
 	    }
 	    if (c == 0) return Qnil;
+	    if (!FIXNUM_P(b) && !rb_obj_is_kind_of(b,rb_cInteger)) {
+		rb_raise(rb_eTypeError, "cannot exclude end value with non Integer begin value");
+	    }
 	    if (FIXNUM_P(e)) {
 		return LONG2NUM(FIX2LONG(e) - 1);
 	    }
Index: test/ruby/test_range.rb
===================================================================
--- test/ruby/test_range.rb	(revision 32481)
+++ test/ruby/test_range.rb	(revision 32482)
@@ -68,6 +68,8 @@
     assert_equal(2.0, (1.0..2.0).max)
     assert_equal(nil, (2.0..1.0).max)
     assert_raise(TypeError) { (1.0...2.0).max }
+    assert_raise(TypeError) { (1...1.5).max }
+    assert_raise(TypeError) { (1.5...2).max }
 
     assert_equal(-0x80000002, ((-0x80000002)...(-0x80000001)).max)
 

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