diff options
-rw-r--r-- | range.c | 5 | ||||
-rw-r--r-- | test/ruby/test_range.rb | 26 |
2 files changed, 28 insertions, 3 deletions
@@ -834,10 +834,9 @@ range_each(VALUE range) args[1] = EXCL(range) ? Qtrue : Qfalse; rb_block_call(tmp, rb_intern("upto"), 2, args, each_i, 0); } - else if (RB_TYPE_P(beg, T_STRING)) { - rb_str_upto_endless_each(beg, (VALUE (*)(VALUE, VALUE))each_i, 0); + else { + rb_str_upto_endless_each(tmp, (VALUE (*)(VALUE, VALUE))each_i, 0); } - else goto inf_loop; } else { if (!discrete_object_p(beg)) { diff --git a/test/ruby/test_range.rb b/test/ruby/test_range.rb index beb0b956cd..5f2e970324 100644 --- a/test/ruby/test_range.rb +++ b/test/ruby/test_range.rb @@ -288,6 +288,19 @@ class TestRange < Test::Unit::TestCase o = Object.new def o.to_int() 1 end assert_nothing_raised("[ruby-dev:34558]") { (0..2).step(o) {|x| } } + + o = Object.new + class << o + def to_str() "a" end + def <=>(other) to_str <=> other end + end + + a = [] + (o.."c").step(1) {|x| a << x} + assert_equal(["a", "b", "c"], a) + a = [] + (o..).step(1) {|x| a << x; break if a.size >= 3} + assert_equal(["a", "b", "c"], a) end def test_step_ruby_core_35753 @@ -348,6 +361,19 @@ class TestRange < Test::Unit::TestCase a = [] r2.each {|x| a << x } assert_equal([], a) + + o = Object.new + class << o + def to_str() "a" end + def <=>(other) to_str <=> other end + end + + a = [] + (o.."c").each {|x| a << x} + assert_equal(["a", "b", "c"], a) + a = [] + (o..).each {|x| a << x; break if a.size >= 3} + assert_equal(["a", "b", "c"], a) end def test_begin_end |