1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

parse.y: pop cmdarg

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@51350 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-07-23 00:05:30 +00:00
parent 28e866d7bb
commit dfec9d9788
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -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> 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 * ext/openssl/ossl_ssl.c: fix tests by not setting the instance

1
parse.y
View File

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

5
test/ruby/test_syntax.rb
View File

@ -414,6 +414,11 @@ WARN
assert_valid_syntax('p ->() do a() do end end', bug11107) assert_valid_syntax('p ->() do a() do end end', bug11107)
end 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 def test_reserved_method_no_args
bug6403 = '[ruby-dev:45626]' bug6403 = '[ruby-dev:45626]'
assert_valid_syntax("def self; :foo; end", __FILE__, bug6403) assert_valid_syntax("def self; :foo; end", __FILE__, bug6403)