Make Method/Proc#parameters handle **nil syntax

Use a [:nokey] entry in this case.

2 files changed, 12 insertions, 0 deletions

diff --git a/iseq.c b/iseq.c
index b6d8c7224a..1b0aefbf92 100644
--- a/iseq.c
+++ b/iseq.c
@@ -2933,6 +2933,12 @@ rb_iseq_parameters(const rb_iseq_t *iseq, int is_proc)
 	    rb_ary_push(args, PARAM(i, req));
 	}
     }
+    if (body->param.flags.accepts_no_kwarg) {
+	ID nokey;
+	CONST_ID(nokey, "nokey");
+	PARAM_TYPE(nokey);
+	rb_ary_push(args, a);
+    }
     if (body->param.flags.has_kw) {
 	i = 0;
 	if (keyword->required_num > 0) {
diff --git a/test/ruby/test_method.rb b/test/ruby/test_method.rb
index d85f9010c7..1289b44c63 100644
--- a/test/ruby/test_method.rb
+++ b/test/ruby/test_method.rb
@@ -30,6 +30,7 @@ class TestMethod < Test::Unit::TestCase
   def mk5(a, b = nil, **o) nil && o end
   def mk6(a, b = nil, c, **o) nil && o end
   def mk7(a, b = nil, *c, d, **o) nil && o end
+  def mnk(**nil) end
 
   class Base
     def foo() :base end
@@ -529,6 +530,7 @@ class TestMethod < Test::Unit::TestCase
   define_method(:pmk5) {|a, b = nil, **o|}
   define_method(:pmk6) {|a, b = nil, c, **o|}
   define_method(:pmk7) {|a, b = nil, *c, d, **o|}
+  define_method(:pmnk) {|**nil|}
 
   def test_bound_parameters
     assert_equal([], method(:m0).parameters)
@@ -549,6 +551,7 @@ class TestMethod < Test::Unit::TestCase
     assert_equal([[:req, :a], [:opt, :b], [:keyrest, :o]], method(:mk5).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:req, :c], [:keyrest, :o]], method(:mk6).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:rest, :c], [:req, :d], [:keyrest, :o]], method(:mk7).parameters)
+    assert_equal([[:nokey]], method(:mnk).parameters)
   end
 
   def test_unbound_parameters
@@ -570,6 +573,7 @@ class TestMethod < Test::Unit::TestCase
     assert_equal([[:req, :a], [:opt, :b], [:keyrest, :o]], self.class.instance_method(:mk5).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:req, :c], [:keyrest, :o]], self.class.instance_method(:mk6).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:rest, :c], [:req, :d], [:keyrest, :o]], self.class.instance_method(:mk7).parameters)
+    assert_equal([[:nokey]], self.class.instance_method(:mnk).parameters)
   end
 
   def test_bmethod_bound_parameters
@@ -591,6 +595,7 @@ class TestMethod < Test::Unit::TestCase
     assert_equal([[:req, :a], [:opt, :b], [:keyrest, :o]], method(:pmk5).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:req, :c], [:keyrest, :o]], method(:pmk6).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:rest, :c], [:req, :d], [:keyrest, :o]], method(:pmk7).parameters)
+    assert_equal([[:nokey]], method(:pmnk).parameters)
   end
 
   def test_bmethod_unbound_parameters
@@ -613,6 +618,7 @@ class TestMethod < Test::Unit::TestCase
     assert_equal([[:req, :a], [:opt, :b], [:keyrest, :o]], self.class.instance_method(:pmk5).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:req, :c], [:keyrest, :o]], self.class.instance_method(:pmk6).parameters)
     assert_equal([[:req, :a], [:opt, :b], [:rest, :c], [:req, :d], [:keyrest, :o]], self.class.instance_method(:pmk7).parameters)
+    assert_equal([[:nokey]], self.class.instance_method(:pmnk).parameters)
   end
 
   def test_hidden_parameters