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

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


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

Author: unak

ChangeLog

@@ -1,3 +1,8 @@
+Mon Aug 17 17:09:02 2015  Nobuyoshi Nakada  <[email protected]>
+
+	* parse.y (lambda_body): pop cmdarg stack for lookahead
+	  token.  [ruby-core:70067] [Bug #11380]
+
 Mon Aug 17 17:04:57 2015  Jeremy Evans  <[email protected]>
 
 	* test/openssl/test_ssl.rb: Fix LocalJumpErrors being raised

parse.y

@@ -3475,6 +3475,7 @@ lambda		:   {
 		    {
 			lpar_beg = $<num>2;
 			cmdarg_stack = $<val>5;
+			CMDARG_LEXPOP();
 		    /*%%%*/
 			$$ = NEW_LAMBDA($3, $6);
 			nd_set_line($$, $<num>4);

test/ruby/test_syntax.rb

@@ -271,6 +271,11 @@ def test_do_block_in_lambda
     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)

version.h

@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.1.7"
 #define RUBY_RELEASE_DATE "2015-08-17"
-#define RUBY_PATCHLEVEL 388
+#define RUBY_PATCHLEVEL 389
 
 #define RUBY_RELEASE_YEAR 2015
 #define RUBY_RELEASE_MONTH 8