Return nil when Enumerator#product receives a block

headius · Dec 17, 2024 · 61659c9 · 61659c9
1 parent 3ea2847
commit 61659c9
Showing 1 changed file with 8 additions and 1 deletion.
diff --git a/core/src/main/ruby/jruby/kernel/enumerator.rb b/core/src/main/ruby/jruby/kernel/enumerator.rb
@@ -481,7 +481,14 @@ def Enumerator.product(*enums, **kwargs, &block)
   if kwargs && !kwargs.empty?
     raise ArgumentError.new("unknown keywords: " + kwargs.keys.map(&:inspect).join(", "))
   end
-  Enumerator::Product.new(*enums).each(&block)
+  product = Enumerator::Product.new(*enums)
+
+  if block_given?
+    product.each(&block)
+    return nil
+  end
+
+  product
 end
 
 class Enumerator::Product < Enumerator