diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 1 | ||||
| -rw-r--r-- | test/ruby/test_syntax.rb | 5 |
3 files changed, 11 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Thu Jul 23 09:05:28 2015 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (lambda_body): pop cmdarg stack for lookahead + token. [ruby-core:70067] [Bug #11380] + Thu Jul 23 04:03:03 2015 Aaron Patterson <tenderlove@ruby-lang.org> * ext/openssl/ossl_ssl.c: fix tests by not setting the instance @@ -3524,6 +3524,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 189cf1358d..158c12d9b6 100644 --- a/test/ruby/test_syntax.rb +++ b/test/ruby/test_syntax.rb @@ -414,6 +414,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) |