1 files changed, 90 insertions, 1 deletions
diff --git a/test/ruby/test_lambda.rb b/test/ruby/test_lambda.rb
index 40bd134e2f..597da8a819 100644
--- a/test/ruby/test_lambda.rb
+++ b/test/ruby/test_lambda.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: false
 require 'test/unit'
 
 class TestLambdaParameters < Test::Unit::TestCase
@@ -25,8 +26,13 @@ class TestLambdaParameters < Test::Unit::TestCase
   def test_lambda_as_iterator
     a = 0
     2.times(&->(_){ a += 1 })
-    assert_equal(a, 2)
+    assert_equal(2, a)
     assert_raise(ArgumentError) {1.times(&->(){ a += 1 })}
+    bug9605 = '[ruby-core:61468] [Bug #9605]'
+    assert_nothing_raised(ArgumentError, bug9605) {1.times(&->(n){ a += 1 })}
+    assert_equal(3, a, bug9605)
+    assert_nothing_raised(ArgumentError, bug9605) {a = [[1, 2]].map(&->(x, y) {x+y})}
+    assert_equal([3], a, bug9605)
   end
 
   def test_call_rest_args
@@ -60,6 +66,45 @@ class TestLambdaParameters < Test::Unit::TestCase
     assert_nil(b)
   end
 
+  def test_call_block_from_lambda
+    bug9605 = '[ruby-core:61470] [Bug #9605]'
+    plus = ->(x,y) {x+y}
+    assert_raise(ArgumentError, bug9605) {proc(&plus).call [1,2]}
+  end
+
+  def test_instance_exec
+    bug12568 = '[ruby-core:76300] [Bug #12568]'
+    assert_nothing_raised(ArgumentError, bug12568) do
+      instance_exec([1,2,3], &->(a=[]){ a })
+    end
+  end
+
+  def yield_1(arg)
+    yield arg
+  end
+
+  tap do |;bug9605, expected, result|
+    bug9605 = '[ruby-core:65887] [Bug #9605] arity check should be relaxed'
+    expected = [1,2,3]
+
+    [
+      ["array",  expected],
+      ["to_ary", Struct.new(:to_ary).new(expected)],
+    ].product \
+    [
+      ["proc",   proc {|a, b, c| [a, b, c]}],
+      ["lambda", lambda {|a, b, c| [a, b, c]}],
+    ] do
+      |(vtype, val), (btype, block)|
+      define_method("test_yield_relaxed(#{vtype},&#{btype})") do
+        result = assert_nothing_raised(ArgumentError, bug9605) {
+          break yield_1(val, &block)
+        }
+        assert_equal(expected, result, bug9605)
+      end
+    end
+  end
+
   def foo
     assert_equal(nil, ->(&b){ b }.call)
   end
@@ -89,4 +134,48 @@ class TestLambdaParameters < Test::Unit::TestCase
     assert_send([e.backtrace.first, :start_with?, "#{__FILE__}:#{line}:"], bug6151)
     assert_equal(0, called)
   end
+
+  def return_in_current(val)
+    1.tap(&->(*) {return 0})
+    val
+  end
+
+  def yield_block
+    yield
+  end
+
+  def return_in_callee(val)
+    yield_block(&->(*) {return 0})
+    val
+  end
+
+  def test_return
+    feature8693 = '[ruby-core:56193] [Feature #8693]'
+    assert_equal(42, return_in_current(42), feature8693)
+    assert_equal(42, return_in_callee(42), feature8693)
+  end
+
+  def test_do_lambda_source_location
+    exp_lineno = __LINE__ + 3
+    lmd = ->(x,
+             y,
+             z) do
+      #
+    end
+    file, lineno = lmd.source_location
+    assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
+    assert_equal(exp_lineno, lineno, "must be at the beginning of the block")
+  end
+
+  def test_brace_lambda_source_location
+    exp_lineno = __LINE__ + 3
+    lmd = ->(x,
+             y,
+             z) {
+      #
+    }
+    file, lineno = lmd.source_location
+    assert_match(/^#{ Regexp.quote(__FILE__) }$/, file)
+    assert_equal(exp_lineno, lineno, "must be at the beginning of the block")
+  end
 end