* parse.y (f_larglist): allow block argument in lambda parameter

  list without parenthesis.


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

1 files changed, 8 insertions, 8 deletions

diff --git a/parse.y b/parse.y
index dae8ee3263..cca7eca2d6 100644
--- a/parse.y
+++ b/parse.y
@@ -3200,34 +3200,34 @@ f_larglist	: '(' f_args opt_bv_decl rparen
 			$$ = dispatch1(paren, $2);
 		    %*/
 		    }
-		| f_arg opt_bv_decl
+		| f_arg opt_f_block_arg opt_bv_decl
 		    {
 		    /*%%%*/
-			$$ = NEW_LAMBDA(new_args($1, 0, 0, 0), $2);
+			$$ = NEW_LAMBDA(new_args($1, 0, 0, $2), $3);
 		    /*%
 			$$ = dispatch4(params, $1, Qnil, Qnil, Qnil);
 		    %*/
 		    }
-		| f_arg ',' f_rest_arg opt_bv_decl
+		| f_arg ',' opt_f_block_arg f_rest_arg opt_bv_decl
 		    {
 		    /*%%%*/
-			$$ = NEW_LAMBDA(new_args($1, 0, $3, 0), $4);
+			$$ = NEW_LAMBDA(new_args($1, 0, $3, $4), $5);
 		    /*%
 			$$ = dispatch4(params, $1, Qnil, $3, Qnil);
 		    %*/
 		    }
-		| f_rest_arg opt_bv_decl
+		| f_rest_arg opt_f_block_arg opt_bv_decl
 		    {
 		    /*%%%*/
-			$$ = NEW_LAMBDA(new_args(0, 0, $1, 0), $2);
+			$$ = NEW_LAMBDA(new_args(0, 0, $1, $2), $3);
 		    /*%
 			$$ = dispatch4(params, Qnil, Qnil, $1, Qnil);
 		    %*/
 		    }
-		| opt_bv_decl
+		| opt_f_block_arg opt_bv_decl
 		    {
 		    /*%%%*/
-			$$ = NEW_LAMBDA(new_args(0, 0, 0, 0), $1);
+			$$ = NEW_LAMBDA(new_args(0, 0, 0, $1), $2);
 		    /*%
 			$$ = dispatch4(params, Qnil, Qnil, Qnil, Qnil);
 		    %*/