зеркало из https://github.com/github/ruby.git
[ruby/prime] Fix Prime.include?
Previously, it would be an infinite loop if passed a non-prime integer. Also, Prime.include? should also provide similar results to Module#include? if passed a Module, so handle that. For consistency with Enumerable#include?, return false if passed other object types. Fixes Ruby Bug 10167. https://github.com/ruby/prime/commit/55dda6aa7f
This commit is contained in:
Родитель
2630757fb5
Коммит
e79fc05a4c
12
lib/prime.rb
12
lib/prime.rb
|
@ -141,6 +141,18 @@ class Prime
|
||||||
generator.each(&block)
|
generator.each(&block)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
# Return true if +obj+ is an Integer an is prime. Also returns
|
||||||
|
# true if +obj+ is a Module that is an ancestor of +Prime+.
|
||||||
|
def include?(obj)
|
||||||
|
case obj
|
||||||
|
when Integer
|
||||||
|
prime?(obj)
|
||||||
|
when Module
|
||||||
|
Module.instance_method(:include?).bind(Prime).call(obj)
|
||||||
|
else
|
||||||
|
false
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
# Returns true if +value+ is a prime number, else returns false.
|
# Returns true if +value+ is a prime number, else returns false.
|
||||||
#
|
#
|
||||||
|
|
|
@ -27,6 +27,14 @@ class TestPrime < Test::Unit::TestCase
|
||||||
assert_equal PRIMES, primes
|
assert_equal PRIMES, primes
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def test_include?
|
||||||
|
assert_equal(false, Prime.include?(nil))
|
||||||
|
assert_equal(true, Prime.include?(3))
|
||||||
|
assert_equal(false, Prime.include?(4))
|
||||||
|
assert_equal(true, Prime.include?(Enumerable))
|
||||||
|
assert_equal(false, Prime.include?(Comparable))
|
||||||
|
end
|
||||||
|
|
||||||
def test_integer_each_prime
|
def test_integer_each_prime
|
||||||
primes = []
|
primes = []
|
||||||
Integer.each_prime(1000) do |p|
|
Integer.each_prime(1000) do |p|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче