admin/mruby-mruby
1
0
Fork 0
mirror of https://github.com/mruby/mruby synced 2026-06-08 16:11:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4557 from shuujii/fix-Numeric-step-to-infinity

Browse Source 
Fix `Numeric#step` to infinity; ref. #4555
This commit is contained in:
Yukihiro "Matz" Matsumoto
2019-07-08 18:50:28 +09:00
committed by GitHub
parent 519f396365 32c2aa10c7
commit fd4e37404b
2 changed files with 69 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mrblib/numeric.rb
+4 -4
View File
@@ -105,14 +105,14 @@ module Integral
return to_enum(:step, num, step) unless block
i = __coerce_step_counter(num, step)
if num == nil
if num == self || step.infinite?
block.call(i) if step > 0 && i <= (num||i) || step < 0 && i >= (num||-i)
elsif num == nil
while true
block.call(i)
i += step
end
return self
end
if step > 0
elsif step > 0
while i <= num
block.call(i)
i += step
test/t/numeric.rb
+65 -23
View File
@@ -1,6 +1,19 @@
##
# Numeric ISO Test
def assert_step(exp, receiver, args, inf: false)
act = []
ret = receiver.step(*args) do |i|
act << i
break if inf && exp.size == act.size
end
expr = "#{receiver.inspect}.step(#{args.map(&:inspect).join(', ')})"
assert do
assert_true(exp.eql?(act), "#{expr}: counters", assertion_diff(exp, act))
assert_same(receiver, ret, "#{expr}: return value") unless inf
end
end
assert('Numeric', '15.2.7') do
assert_equal(Class, Numeric.class)
end
@@ -42,31 +55,60 @@ assert('Numeric#**') do
end
assert('Numeric#step') do
assert_step = ->(exp, receiver, args) do
inf = !args[0]
act = []
ret = receiver.step(*args) do |i|
act << i
break if inf && exp.size == act.size
end
expr = "#{receiver.inspect}.step(#{args.map(&:inspect).join(', ')})"
assert_true(exp.eql?(act), "#{expr}: counters", assertion_diff(exp, act))
assert_same(receiver, ret, "#{expr}: return value") unless inf
end
assert_raise(ArgumentError) { 1.step(2, 0) { break } }
assert_step.([2, 3, 4], 2, [4])
assert_step.([10, 8, 6, 4, 2], 10, [1, -2])
assert_step.([], 2, [1, 3])
assert_step.([], -2, [-1, -3])
assert_step.([10, 11, 12, 13], 10, [])
assert_step.([10, 7, 4], 10, [nil, -3])
assert_step([2, 3, 4], 2, [4])
assert_step([10, 8, 6, 4, 2], 10, [1, -2])
assert_step([], 2, [1, 3])
assert_step([], -2, [-1, -3])
assert_step([10, 11, 12, 13], 10, [], inf: true)
assert_step([10, 7, 4], 10, [nil, -3], inf: true)
skip unless Object.const_defined?(:Float)
inf = Float::INFINITY
assert_raise(ArgumentError) { 1.step(2, 0.0) { break } }
assert_step.([2.0, 3.0, 4.0], 2, [4.0])
assert_step.([7.0, 4.0, 1.0, -2.0], 7, [-4, -3.0])
assert_step.([2.0, 3.0, 4.0], 2.0, [4])
assert_step.([10.0, 11.0, 12.0, 13.0], 10.0, [])
assert_step.([10.0, 7.0, 4.0], 10, [nil, -3.0])
assert_step([2.0, 3.0, 4.0], 2, [4.0])
assert_step([7.0, 4.0, 1.0, -2.0], 7, [-4, -3.0])
assert_step([2.0, 3.0, 4.0], 2.0, [4])
assert_step([10.0, 11.0, 12.0, 13.0], 10.0, [], inf: true)
assert_step([10.0, 7.0, 4.0], 10, [nil, -3.0], inf: true)
assert_step([1.0], 1, [nil, inf])
assert_step([1.0], 1, [nil, -inf])
assert_step([1.0], 1, [3, inf])
assert_step([], 1, [-3, inf])
assert_step([], 1, [3, -inf])
assert_step([1.0], 1, [-3, -inf])
assert_step([1.0], 1, [inf, inf])
assert_step([], 1, [inf, -inf])
assert_step([], 1, [-inf, inf])
assert_step([1.0], 1, [-inf, -inf])
assert_step([], inf, [2])
assert_step([], inf, [-2])
assert_step([], inf, [2, 3])
assert_step([inf, inf, inf], inf, [2, -3], inf: true)
assert_step([], inf, [2, inf])
assert_step([inf], inf, [2, -inf])
assert_step([], inf, [-2, inf])
assert_step([inf], inf, [-2, -inf])
assert_step([], inf, [-2, 3])
assert_step([inf, inf, inf], inf, [-2, -3], inf: true)
assert_step([inf], inf, [inf])
assert_step([], inf, [-inf])
assert_step([inf], inf, [inf, inf])
assert_step([inf], inf, [inf, -inf])
assert_step([inf], inf, [-inf, -inf])
assert_step([-inf, -inf, -inf], -inf, [2], inf: true)
assert_step([-inf, -inf, -inf], -inf, [-2], inf: true)
assert_step([-inf, -inf, -inf], -inf, [2, 3], inf: true)
assert_step([], -inf, [2, -3])
assert_step([-inf], -inf, [2, inf])
assert_step([], -inf, [2, -inf])
assert_step([-inf], -inf, [-2, inf])
assert_step([], -inf, [-2, -inf])
assert_step([-inf, -inf, -inf], -inf, [-2, 3], inf: true)
assert_step([], -inf, [-2, -3])
assert_step([-inf, -inf, -inf], -inf, [inf], inf: true)
assert_step([-inf], -inf, [-inf])
assert_step([-inf], -inf, [inf, inf])
assert_step([], -inf, [inf, -inf])
assert_step([-inf], -inf, [-inf, -inf])
end