summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-12 15:45:44 +0000
committermarcandre <marcandre@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2015-06-12 15:45:44 +0000
commit5b78e48c318b342c46943a4723f3d556ead7795b (patch)
tree84d625b38444456d71185335cb6c7d162189b456
parent2689fd677c298d96c9c0dd0e5d035bc2cd7247a5 (diff)
* lib/prime.rb: Fix with_object with no block given
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50856 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--lib/prime.rb2
-rw-r--r--test/test_prime.rb9
3 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4104d244cc..ff5ae43c38 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sat Jun 13 00:45:06 2015 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
+
+ * lib/prime.rb: Fix with_object with no block given
+
Sat Jun 13 00:44:59 2015 Marc-Andre Lafortune <ruby-core@marc-andre.ca>
* lib/prime.rb: Have with_index accept an offset parameter.
diff --git a/lib/prime.rb b/lib/prime.rb
index 757538db79..1eed28d914 100644
--- a/lib/prime.rb
+++ b/lib/prime.rb
@@ -281,7 +281,7 @@ class Prime
# see +Enumerator+#with_object.
def with_object(obj)
- return enum_for(:with_object) unless block_given?
+ return enum_for(:with_object, obj) unless block_given?
each do |prime|
yield prime, obj
end
diff --git a/test/test_prime.rb b/test/test_prime.rb
index 5975336023..d4f056466f 100644
--- a/test/test_prime.rb
+++ b/test/test_prime.rb
@@ -97,6 +97,15 @@ class TestPrime < Test::Unit::TestCase
end
end
+ def test_enumerator_with_object
+ object = Object.new
+ enum = Prime.each
+ enum.with_object(object).each do |p, o|
+ assert_equal object, o
+ break
+ end
+ end
+
def test_default_instance_does_not_have_compatibility_methods
assert !Prime.instance.respond_to?(:succ)
assert !Prime.instance.respond_to?(:next)