diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | range.c | 26 | ||||
| -rw-r--r-- | test/ruby/test_range.rb | 3 |
3 files changed, 22 insertions, 11 deletions
@@ -1,3 +1,7 @@ +Tue Aug 18 01:21:31 2009 Yukihiro Matsumoto <matz@ruby-lang.org> + + * range.c (range_each): should honor to_str conversion. + Mon Aug 17 23:45:40 2009 Tadayoshi Funaba <tadf@dotrb.org> * lib/date/delta.rb: removed require 'date'. added to_c. @@ -436,19 +436,23 @@ range_each(VALUE range) rb_yield(LONG2FIX(i)); } } - else if (TYPE(beg) == T_STRING) { - VALUE args[2]; - - args[0] = end; - args[1] = EXCL(range) ? Qtrue : Qfalse; - rb_block_call(beg, rb_intern("upto"), 2, args, rb_yield, 0); - } else { - if (!rb_respond_to(beg, id_succ)) { - rb_raise(rb_eTypeError, "can't iterate from %s", - rb_obj_classname(beg)); + VALUE tmp = rb_check_string_type(beg); + + if (!NIL_P(tmp)) { + VALUE args[2]; + + args[0] = end; + args[1] = EXCL(range) ? Qtrue : Qfalse; + rb_block_call(tmp, rb_intern("upto"), 2, args, rb_yield, 0); + } + else { + if (!rb_respond_to(beg, id_succ)) { + rb_raise(rb_eTypeError, "can't iterate from %s", + rb_obj_classname(beg)); + } + range_each_func(range, each_i, NULL); } - range_each_func(range, each_i, NULL); } return range; } diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index 017a8cb71a..94e6583d22 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -1,4 +1,5 @@ require 'test/unit' +require 'delegate' class TestRange < Test::Unit::TestCase def test_range_string @@ -13,6 +14,8 @@ class TestRange < Test::Unit::TestCase assert_equal(["6", "7", "8"], ("6".."8").to_a, "[ruby-talk:343187]") assert_equal(["6", "7"], ("6"..."8").to_a) assert_equal(["9", "10"], ("9".."10").to_a) + assert_equal(["9", "10"], (SimpleDelegator.new("9").."10").to_a) + assert_equal(["9", "10"], ("9"..SimpleDelegator.new("10")).to_a) end def test_evaluation_order |