Skip to content

Handle argument or block passed to Range#count #8956

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
headius merged 2 commits into from
Aug 10, 2025
Merged

Handle argument or block passed to Range#count #8956

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
864836f
Properly handle Range#count with a block
headius Aug 10, 2025
f9732d9
Add basic specs for Range#count with arg or block
headius Aug 10, 2025
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
17 changes: 13 additions & 4 deletions core/src/main/java/org/jruby/RubyRange.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1214,16 +1214,25 @@ public IRubyObject call(ThreadContext ctx, IRubyObject larg, Block blk) {

@JRubyMethod
public IRubyObject count(ThreadContext context, Block block) {
if (isBeginless || isEndless) return asFloat(context, RubyFloat.INFINITY);
if (!block.isGiven()) {
if (isBeginless || isEndless) return asFloat(context, RubyFloat.INFINITY);

if (begin instanceof RubyInteger) {
IRubyObject size = size(context);
if (!size.isNil()) return size;
if (begin instanceof RubyInteger) {
IRubyObject size = size(context);
if (!size.isNil()) return size;
}

// fall back on Enumerable logic for other cases
}

return RubyEnumerable.count(context, this, block);
}

@JRubyMethod
public IRubyObject count(ThreadContext context, IRubyObject arg, Block block) {
return RubyEnumerable.count(context, this, arg, block);
}

@JRubyMethod
public IRubyObject minmax(ThreadContext context, Block block) {
if (block.isGiven()) return Helpers.invokeSuper(context, this, context.runtime.getRange(), "minmax", NULL_ARRAY, block);
Expand Down
14 changes: 14 additions & 0 deletions spec/ruby/core/range/count_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,18 @@
(...nil).count.should == inf
(..10.0).count.should == inf
end

it "accepts an argument for comparison using ==" do
(1..10).count(2).should == 1
end

it "uses a block for comparison" do
(1..10).count{|x| x%2==0 }.should == 5
end

it "ignores the block when given an argument" do
-> {
(1..10).count(4){|x| x%2==0 }.should == 1
}.should complain(/given block not used/)
end
end
Loading