kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

range.c: each on endless range

Browse source 
* range.c (range_each): endless range begins with string-like
  object should iterate from the converted result string, as well
  as `#each` on a string-end range or `#step` method on an endless
  range, i.e., `begin.succ` should not be called.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@63283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-04-28 07:31:32 +00:00
parent b6e2851431
commit d07861fb2f
2 changed files with 28 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
range.c
View file

@ -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)) {

26
test/ruby/test_range.rb
View file

@ -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