Skip to content

Fixes Enumerable#count and #uniq behaviour when multiple values yielded #2145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 11, 2020
Merged

Fixes Enumerable#count and #uniq behaviour when multiple values yielded #2145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion spec/tags/core/enumerable/count_tags.txt
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion spec/tags/core/enumerable/uniq_tags.txt
View file
Open in desktop

This file was deleted.

11 changes: 8 additions & 3 deletions src/main/ruby/truffleruby/core/enumerable.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,10 @@ def count(item = undefined)
seq = 0
if !Primitive.undefined?(item)
warn 'given block not used', uplevel: 1 if block_given?
each { |o| seq += 1 if item == o }
each do
o = Primitive.single_block_arg
seq += 1 if item == o
end
elsif block_given?
each { |o| seq += 1 if yield(o) }
else
Expand Down Expand Up @@ -960,7 +963,8 @@ def uniq(&block)
result = []
if block_given?
h = {}
each do |e|
each do
e = Primitive.single_block_arg
v = yield(e)
unless h.key?(v)
h[v] = true
Expand All @@ -969,7 +973,8 @@ def uniq(&block)
end
else
h = {}
each do |e|
each do
e = Primitive.single_block_arg
unless h.key?(e)
h[e] = true
result << e
Expand Down