merge revision(s) 51350: [Backport #11380] [Backport #11389]

	* parse.y (lambda_body): pop cmdarg stack for lookahead
	  token.  [ruby-core:70067] [Bug #11380]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@51519 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 12 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index 0ca713faa6..8ff71d674e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Aug 11 00:42:53 2015  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* parse.y (lambda_body): pop cmdarg stack for lookahead
+	  token.  [ruby-core:70067] [Bug #11380]
+
 Tue Aug 11 00:21:56 2015  NARUSE, Yui  <naruse@ruby-lang.org>
 
 	* ext/socket/extconf.rb: Solaris 11 has struct tcp_info.tcpi_ca_state,
diff --git a/parse.y b/parse.y
index 996390e189..9bb569c4ed 100644
--- a/parse.y
+++ b/parse.y
@@ -3540,6 +3540,7 @@ lambda		:   {
 		    {
 			lpar_beg = $<num>2;
 			cmdarg_stack = $<val>5;
+			CMDARG_LEXPOP();
 		    /*%%%*/
 			$$ = NEW_LAMBDA($3, $6);
 			nd_set_line($$, $<num>4);
diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb
index 3507333e82..8df641dc24 100644
--- a/test/ruby/test_syntax.rb
+++ b/test/ruby/test_syntax.rb
@@ -405,6 +405,11 @@ WARN
     assert_valid_syntax('p ->() do a() do end end', bug11107)
   end
 
+  def test_do_block_after_lambda
+    bug11380 = '[ruby-core:70067] [Bug #11380]'
+    assert_valid_syntax('p -> { :hello }, a: 1 do end', bug11380)
+  end
+
   def test_reserved_method_no_args
     bug6403 = '[ruby-dev:45626]'
     assert_valid_syntax("def self; :foo; end", __FILE__, bug6403)
diff --git a/version.h b/version.h
index d9ed25c209..087a50678f 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.2.3"
 #define RUBY_RELEASE_DATE "2015-08-11"
-#define RUBY_PATCHLEVEL 151
+#define RUBY_PATCHLEVEL 152
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 8