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

* enumerator.c (enumerator_with_index): try to convert given offset to

Browse source 
integer. fix bug introduced in r39594.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@39722 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2013-03-11 09:47:15 +00:00
parent 7590de68e2
commit 5f257cf403
3 changed files with 19 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Mon Mar 11 18:45:09 2013 NARUSE, Yui <naruse@ruby-lang.org>
* enumerator.c (enumerator_with_index): try to convert given offset to
integer. fix bug introduced in r39594.
Mon Mar 11 17:27:57 2013 NARUSE, Yui <naruse@ruby-lang.org>
* test/ruby/envutil.rb (EnvUtil.with_default_external): add for

2
enumerator.c
View file

@ -494,6 +494,8 @@ enumerator_with_index(int argc, VALUE *argv, VALUE obj)
RETURN_SIZED_ENUMERATOR(obj, argc, argv, enumerator_size);
if (NIL_P(memo))
memo = INT2FIX(0);
else
memo = rb_to_int(memo);
return enumerator_block_call(obj, enumerator_with_index_i, (VALUE)&memo);
}

12
test/ruby/test_enumerator.rb
View file

@ -112,6 +112,18 @@ class TestEnumerator < Test::Unit::TestCase
assert_equal([[1,s],[2,s+1],[3,s+2]], @obj.to_enum(:foo, 1, 2, 3).with_index(s).to_a, bug8010)
end
def test_with_index_nonnum_offset
bug8010 = '[ruby-dev:47131] [Bug #8010]'
s = Object.new
def s.to_int; 1 end
assert_equal([[1,1],[2,2],[3,3]], @obj.to_enum(:foo, 1, 2, 3).with_index(s).to_a, bug8010)
end
def test_with_index_string_offset
bug8010 = '[ruby-dev:47131] [Bug #8010]'
assert_raise(TypeError, bug8010){ @obj.to_enum(:foo, 1, 2, 3).with_index('1').to_a }
end
def test_with_object
obj = [0, 1]
ret = (1..10).each.with_object(obj) {|i, memo|