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: Fix ArithmeticSequence for complex step

Browse source 
Make sure Enumerator::ArithmeticSequence#each to work well
for a complex step value.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64692 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
mrkn 2018-09-12 05:35:46 +00:00
parent 0f6708eb9b
commit 0a0f8238d0
2 changed files with 22 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
enumerator.c
View file

@ -2661,7 +2661,8 @@ arith_seq_each(VALUE self)
s = arith_seq_step(self);
x = arith_seq_exclude_end_p(self);
if (ruby_float_step(c, e, s, x, TRUE)) {
if (RB_TYPE_P(c, T_FLOAT) && RB_TYPE_P(s, T_FLOAT) &&
ruby_float_step(c, e, s, x, TRUE)) {
return self;
}

20
test/ruby/test_arithmetic_sequence.rb
View file

@ -396,4 +396,24 @@ class TestArithmeticSequence < Test::Unit::TestCase
assert_equal(4, (10...2).step(-2).size)
assert_equal(Float::INFINITY, (1..).step(-1).size)
end
def assert_num_equal_type(ary1, ary2, message=nil)
assert_equal(ary1.length, ary2.length, message)
ary1.zip(ary2) do |e1, e2|
assert_equal(e1.class, e2.class, message)
if e1.is_a? Complex
assert_equal(e1.real, e2.real, message)
assert_equal(e1.imag, e2.imag, message)
else
assert_equal(e1, e2, message)
end
end
end
def test_complex
assert_num_equal_type([1, 1+1i, 1+2i], (1..).step(1i).take(3))
assert_num_equal_type([1, 1+1.0i, 1+2.0i], (1..).step(1.0i).take(3))
assert_num_equal_type([0.0, 0.0+1.0i, 0.0+2.0i], (0.0..).step(1.0i).take(3))
assert_num_equal_type([0.0+0.0i, 0.0+1.0i, 0.0+2.0i], (0.0i..).step(1.0i).take(3))
end
end