vm_eval.c: blockarg

* vm_eval.c (rb_yield_block): implement non-nil block argument.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43927 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 28 insertions, 4 deletions

diff --git a/test/-ext-/iter/test_iter_break.rb b/test/-ext-/iter/test_iter_break.rb
index 1ef2aad3c2..5bac6331fd 100644
--- a/test/-ext-/iter/test_iter_break.rb
+++ b/test/-ext-/iter/test_iter_break.rb
@@ -1,12 +1,15 @@
 require 'test/unit'
-require '-test-/iter/break'
+require '-test-/iter'
 
-class TestIterBreak < Test::Unit::TestCase
+module TestIter
+end
+
+class TestIter::IterBreak < Test::Unit::TestCase
   def test_iter_break
     backport7896 = '[ruby-core:52607]'
-    assert_equal(nil, 1.times{Bug::Breakable.iter_break}, backport7896)
+    assert_equal(nil, 1.times{Bug::Iter::Breakable.iter_break}, backport7896)
 
     feature5895 = '[ruby-dev:45132]'
-    assert_equal(42, 1.times{Bug::Breakable.iter_break_value(42)}, feature5895)
+    assert_equal(42, 1.times{Bug::Iter::Breakable.iter_break_value(42)}, feature5895)
   end
 end
diff --git a/test/-ext-/iter/test_yield_block.rb b/test/-ext-/iter/test_yield_block.rb
new file mode 100644
index 0000000000..bec993c950
--- /dev/null
+++ b/test/-ext-/iter/test_yield_block.rb
@@ -0,0 +1,21 @@
+require 'test/unit'
+require '-test-/iter'
+
+module TestIter
+end
+
+class TestIter::YieldBlock < Test::Unit::TestCase
+  class YieldTest
+    include Bug::Iter::Yield
+    attr_reader :blockarg
+    def test(arg, &block)
+      block.call(arg) {|blockarg| @blockarg = blockarg}
+    end
+  end
+
+  def test_yield_block
+    a = YieldTest.new
+    a.yield_block(:test, "foo") {|x, &b| assert_kind_of(Proc, b); b.call(x)}
+    assert_equal("foo", a.blockarg)
+  end
+end