diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 9 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 5 |
3 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Thu Apr 30 16:22:16 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (lambda): push and reset cmdarg_stack in lambda body. + [ruby-core:69017] [Bug #11107] + Sun Apr 26 07:36:48 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> * enc/utf_8.c (code_to_mbclen, code_to_mbc): reject values larger @@ -3518,14 +3518,19 @@ lambda : { { $<num>$ = ruby_sourceline; } + { + $<val>$ = cmdarg_stack; + cmdarg_stack = 0; + } lambda_body { lpar_beg = $<num>2; + cmdarg_stack = $<val>5; /*%%%*/ - $$ = NEW_LAMBDA($3, $5); + $$ = NEW_LAMBDA($3, $6); nd_set_line($$, $<num>4); /*% - $$ = dispatch2(lambda, $3, $5); + $$ = dispatch2(lambda, $3, $6); %*/ dyna_pop($<vars>1); } diff --git a/test/ruby/test_syntax.rb b/test/ruby/test_syntax.rb index 0274a11e83..dbb18164f4 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -400,6 +400,11 @@ WARN assert_valid_syntax("bar def foo; self.each do end end", bug9308) end + def test_do_block_in_lambda + bug11107 = '[ruby-core:69017] [Bug #11107]' + assert_valid_syntax('p ->() do a() do end end', bug11107) + end + def test_reserved_method_no_args bug6403 = '[ruby-dev:45626]' assert_valid_syntax("def self; :foo; end", __FILE__, bug6403) |