A few small fixes for rubyspecs #192

headius · 2024-03-05T04:08:55Z

Fixes 10 cases from rubyspec:

Size error cases
Enumerator.product rejects kwargs by name
Product#rewind rewinds in "direct order", not reverse

JRuby is using this impl for now, and this brings the failure count for the Enumerator::Product specs down to 10 (43 total, 20 failures without this PR).

See marcandre/backports#192 for a few small additional fixes incorporated here.

headius · 2024-03-05T04:16:13Z

Remaining failures (running in JRuby):

1)
Enumerator::Product#each returns self if given a block FAILED
Expected nil.equal? #<Enumerator::Product: nil:>
to be truthy but was false
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/each_spec.rb:50:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/each_spec.rb:5:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/each_spec.rb:4:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
2)
Enumerator::Product#initialize_copy replaces content of the receiver with content of the other object FAILED
Expected [[true], [false]] == [[1, :a], [1, :b], [2, :a], [2, :b]]
to be truthy but was false
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:10:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
3)
Enumerator::Product#initialize_copy is a private method FAILED
Expected Enumerator::Product to have private instance method 'initialize_copy'
but it does not
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:21:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
4)
Enumerator::Product#initialize_copy raises ArgumentError if the argument is not initialized yet FAILED
Expected ArgumentError (uninitialized product)
but no exception was raised (#<Enumerator::Product: nil:> was returned)
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:51:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_copy_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
5)
Enumerator::Product#initialize returns self FAILED
Expected [] to be identical to #<Enumerator::Product: nil:>
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:14:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
6)
Enumerator::Product#initialize accepts many arguments FAILED
Expected [0..1, 2..3, 4..5] to be identical to #<Enumerator::Product: nil:>
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:18:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
7)
Enumerator::Product#initialize accepts arguments that are not Enumerable nor responding to :each_entry FAILED
Expected [#<Object:0x731ab49b>] to be identical to #<Enumerator::Product: nil:>
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:22:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/initialize_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
8)
Enumerator::Product#inspect returns a String including enumerators FAILED
Expected "#<Enumerator::Product: nil:>" == "#<Enumerator::Product: [[1, 2], [:a, :b]]>"
to be truthy but was false
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:7:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
9)
Enumerator::Product#inspect represents a recursive element with '[...]' FAILED
Expected "#<Enumerator::Product: nil:>" == "#<Enumerator::Product: [[1, 2, #<Enumerator::Product: ...>]]>"
to be truthy but was false
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:15:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'
                                                                                             
10)
Enumerator::Product#inspect returns a not initialized representation if #initialized is not called yet FAILED
Expected "#<Enumerator::Product: nil:>" == "#<Enumerator::Product: uninitialized>"
to be truthy but was false
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:19:in `block in <main>'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:4912:in `all?'
org/jruby/RubyArray.java:1985:in `each'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:4:in `block in <main>'
/Users/headius/work/jruby/spec/ruby/core/enumerator/product/inspect_spec.rb:3:in `<main>'
org/jruby/RubyKernel.java:1211:in `load'
org/jruby/RubyBasicObject.java:2620:in `instance_exec'
org/jruby/RubyArray.java:1985:in `each'

marcandre

Theses changes are great, thank you so much, except the one with -infinity.

lib/backports/3.2.0/enumerator/product.rb

marcandre · 2024-03-05T15:21:49Z

This PR made me realize there's a bug in Ruby, and missing specs. Feel free to address it now or I can do it later.
https://bugs.ruby-lang.org/issues/20325

* Size error cases * Enumerator.product rejects kwargs by name * Product#rewind rewinds in "direct order", not reverse

headius · 2024-03-05T19:55:07Z

I re-pushed with some tweaks to the size checks. I did not make any changes related to Infinity so I'll leave that up to you to debate on the issue.

Let's not go out of our way to return senseless results. See ruby/spec#1140

lib/backports/3.2.0/enumerator/product.rb

Satisfy rubocop

marcandre · 2024-03-05T20:41:04Z

Merged, thank you again for this PR, much appreciated.

I've also fixed the case 0 * Infinity in a separate PR.

Released as 3.25.0 (along with other features I had forgotten to release!)

headius added a commit to jruby/jruby that referenced this pull request Mar 5, 2024

Add Enumerator::Product from marcandre/backports

bf093d7

See marcandre/backports#192 for a few small additional fixes incorporated here.