From f3e1c29b2414510b4622336bed790960c0762057 Mon Sep 17 00:00:00 2001 From: matz Date: Mon, 27 Feb 2012 14:47:02 +0000 Subject: [PATCH] * parse.y (opt_bv_decl): allow newline at the end. [ruby-dev:45292] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34835 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ parse.y | 11 +++++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5d51cf157f..d6e2f02da8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Mon Feb 27 23:46:09 2012 Yukihiro Matsumoto + + * parse.y (opt_bv_decl): allow newline at the end. [ruby-dev:45292] + Mon Feb 27 20:43:05 2012 NAKAMURA Usaku * io.c (rb_io_set_pos): add rdoc about textmode. diff --git a/parse.y b/parse.y index e47dac4304..bfddcfb34a 100644 --- a/parse.y +++ b/parse.y @@ -3727,13 +3727,16 @@ block_param_def : '|' opt_bv_decl '|' ; -opt_bv_decl : none - | ';' bv_decls +opt_bv_decl : opt_nl + { + $$ = 0; + } + | opt_nl ';' bv_decls opt_nl { /*%%%*/ $$ = 0; /*% - $$ = $2; + $$ = $3; %*/ } ; @@ -3788,7 +3791,7 @@ lambda : { } ; -f_larglist : '(' f_args opt_bv_decl rparen +f_larglist : '(' f_args opt_bv_decl ')' { /*%%%*/ $$ = $2;