return StopIteration#result from loop instead of nil (Ruby 2.3 feature)

jruby · Dec 15, 2015 · fccf3a5 · fccf3a5
1 parent 310e2a5
commit fccf3a5
Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/core/src/main/java/org/jruby/RubyKernel.java b/core/src/main/java/org/jruby/RubyKernel.java
@@ -1295,7 +1295,7 @@ public static IRubyObject loop(ThreadContext context, IRubyObject recv, Block bl
             final RubyClass StopIteration = runtime.getStopIteration();
             if ( StopIteration.isInstance(ex.getException()) ) {
                 runtime.getGlobalVariables().set("$!", oldExc); // Restore $!
-                return context.nil;
+                return ex.getException().callMethod("result");
             }
             else {
                 throw ex;

diff --git a/test/mri/ruby/test_enumerator.rb b/test/mri/ruby/test_enumerator.rb
@@ -47,6 +47,13 @@ def test_loop
     }
   end
 
+  def test_loop_return_value
+    assert_equal nil, loop { break }
+    assert_equal 42,  loop { break 42 }
+    e = Enumerator.new { |y| y << 1; y << 2; :stopped }
+    assert_equal :stopped, loop { e.next while true }
+  end
+
   def test_nested_iteration
     def (o = Object.new).each
       yield :ok1