summaryrefslogtreecommitdiff
path: root/test/ruby/test_proc.rb
diff options
context:
space:
mode:
authorJeremy Evans <code@jeremyevans.net>2019-09-26 17:25:54 -0700
committerJeremy Evans <code@jeremyevans.net>2019-09-26 19:24:58 -0700
commit660c7e050f6cb050fd5618f812129c211af29810 (patch)
treef02c96afc73682c13bd8bca49a3751c059ea4d45 /test/ruby/test_proc.rb
parent0c6f36668a11902903d85ada61a812d297d02de5 (diff)
Fix more keyword separation issues
This fixes instance_exec and similar methods. It also fixes Enumerator::Yielder#yield, rb_yield_block, and a couple of cases with Proc#{<<,>>}. This support requires the addition of rb_yield_values_kw, similar to rb_yield_values2, for passing the keyword flag. Unlike earlier attempts at this, this does not modify the rb_block_call_func type or add a separate function type. The functions of type rb_block_call_func are called by Ruby with a separate VM frame, and we can get the keyword flag information from the VM frame flags, so it doesn't need to be passed as a function argument. These changes require the following VM functions accept a keyword flag: * vm_yield_with_cref * vm_yield * vm_yield_with_block
Notes
Notes: Merged: https://github.com/ruby/ruby/pull/2493
Diffstat (limited to 'test/ruby/test_proc.rb')
-rw-r--r--test/ruby/test_proc.rb12
1 files changed, 3 insertions, 9 deletions
diff --git a/test/ruby/test_proc.rb b/test/ruby/test_proc.rb
index b7d644345d..467bbf5925 100644
--- a/test/ruby/test_proc.rb
+++ b/test/ruby/test_proc.rb
@@ -1552,9 +1552,7 @@ class TestProcKeywords < Test::Unit::TestCase
assert_warn(/The last argument is used as the keyword parameter.*for method/m) do
assert_equal(1, (f << g).call(a: 3)[:a])
end
- assert_warn(/The last argument is used as the keyword parameter.*for method/m) do
- assert_equal(2, (f >> g).call(a: 3)[:a])
- end
+ assert_equal(2, (f >> g).call(a: 3)[:a])
assert_warn(/The last argument is used as the keyword parameter.*for method/m) do
assert_equal(1, (f << g).call({a: 3})[:a])
end
@@ -1574,9 +1572,7 @@ class TestProcKeywords < Test::Unit::TestCase
assert_warn(/The keyword argument is passed as the last hash parameter.*The last argument is used as the keyword parameter.*for method/m) do
assert_equal(1, (f << g).call(**{})[:a])
end
- assert_warn(/The last argument is used as the keyword parameter.*for method/m) do
- assert_equal(2, (f >> g).call(**{})[:a])
- end
+ assert_equal(2, (f >> g).call(**{})[:a])
end
def test_compose_keywords_non_proc
@@ -1632,9 +1628,7 @@ class TestProcKeywords < Test::Unit::TestCase
assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do
assert_equal(2, (g << f).call(a: 3)[:a])
end
- assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do
- assert_equal(1, (g >> f).call(a: 3)[:a])
- end
+ assert_equal(1, (g >> f).call(a: 3)[:a])
assert_warn(/The last argument is used as the keyword parameter.*for `call'/m) do
assert_equal(2, (g << f).call({a: 3})[:a])
end