From d6a977f667f9d824cfe95976f3afc31e55580edb Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 13 Mar 2012 06:17:08 +0000
Subject: [PATCH] * parse.y (block_param, f_args): add rules for the case
 arguments   begin with kwrest.  [ruby-core:42455][Bug #5989]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34998 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                |  5 +++++
 parse.y                  | 16 ++++++++++++++++
 test/ruby/test_syntax.rb |  6 ++++++
 3 files changed, 27 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 231aca8b8e..dbd749b1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Mar 13 15:17:03 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (block_param, f_args): add rules for the case arguments
+	  begin with kwrest.  [ruby-core:42455][Bug #5989]
+
 Tue Mar 13 12:37:53 2012  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* io.c (io_encoding_set): always warn if external encoding and internal
diff --git a/parse.y b/parse.y
index d5f7852156..579da3a391 100644
--- a/parse.y
+++ b/parse.y
@@ -3672,6 +3672,14 @@ block_param	: f_arg ',' f_block_optarg ',' f_rest_arg ',' f_block_kwarg f_kwrest
 			$$ = params_new(Qnil, Qnil, Qnil, Qnil, $1, Qnil, escape_Qundef($2));
 		    %*/
 		    }
+		| tPOW tIDENTIFIER opt_f_block_arg
+		    {
+		    /*%%%*/
+			$$ = new_args(0, 0, 0, 0, 0, $2, $3);
+		    /*%
+			$$ = params_new(Qnil, Qnil, Qnil, Qnil, Qnil, $2, escape_Qundef($3));
+		    %*/
+		    }
 		| f_block_arg
 		    {
 		    /*%%%*/
@@ -4994,6 +5002,14 @@ f_args		: f_arg ',' f_optarg ',' f_rest_arg ',' f_kwarg f_kwrest opt_f_block_arg
 			$$ = params_new(Qnil, Qnil, Qnil, Qnil, $1, Qnil, escape_Qundef($2));
 		    %*/
 		    }
+		| tPOW tIDENTIFIER opt_f_block_arg
+		    {
+		    /*%%%*/
+			$$ = new_args(0, 0, 0, 0, 0, $2, $3);
+		    /*%
+			$$ = params_new(Qnil, Qnil, Qnil, Qnil, Qnil, $2, escape_Qundef($3));
+		    %*/
+		    }
 		| f_block_arg
 		    {
 		    /*%%%*/
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index f247b4c6dc..532b989bbd 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -77,6 +77,12 @@ class TestSyntax < Test::Unit::TestCase
     end
   end
 
+  def test_keyword_rest
+    bug5989 = '[ruby-core:42455]'
+    assert_valid_syntax("def kwrest_test(**a) end", __FILE__)
+    assert_valid_syntax("def kwrest_test(**a, &b) end", __FILE__)
+  end
+
   private
 
   def make_tmpsrc(f, src)