From b609bdeb5307e280137b4b2838af0fe4e4b46f1c Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Fri, 25 Oct 2019 01:16:05 +0900 Subject: Define arguments forwarding as `ruby2_keywords` style Get rid of these redundant and useless warnings. ``` $ ruby -e 'def bar(a) a; end; def foo(...) bar(...) end; foo({})' -e:1: warning: The last argument is used as the keyword parameter -e:1: warning: for `foo' defined here -e:1: warning: The keyword argument is passed as the last hash parameter -e:1: warning: for `bar' defined here ``` --- test/ruby/test_syntax.rb | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) (limited to 'test/ruby') diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index cbcdefb23b..5c2a9fc289 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -1527,13 +1527,23 @@ eom obj3.instance_eval('def foo(...) bar(...) end', __FILE__, __LINE__) [obj1, obj2, obj3].each do |obj| - assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5) {|*x| x}) - assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5)) + assert_warning('') { + assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5) {|*x| x}) + } + assert_warning('') { + assert_equal([[1, 2, 3], {k1: 4, k2: 5}], obj.foo(1, 2, 3, k1: 4, k2: 5)) + } + warning = "warning: The last argument is used as the keyword parameter" + assert_warning(/\A\z|:(?!#{__LINE__+1})\d+: #{warning}/o) { + assert_equal([[], {}], obj.foo({}) {|*x| x}) + } + assert_warning(/\A\z|:(?!#{__LINE__+1})\d+: #{warning}/o) { + assert_equal([[], {}], obj.foo({})) + } assert_equal(-1, obj.:foo.arity) parameters = obj.:foo.parameters assert_equal(:rest, parameters.dig(0, 0)) - assert_equal(:keyrest, parameters.dig(1, 0)) - assert_equal(:block, parameters.dig(2, 0)) + assert_equal(:block, parameters.dig(1, 0)) end end -- cgit v1.2.3