kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

parse.y: fix block_call&.call

Browse source 
* parse.y (block_command, block_call): fix `&.` calls after
  block_call.  [Feature #11537]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@53138 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2015-12-16 01:49:42 +00:00
parent da7c77152d
commit bfd34365b6
3 changed files with 26 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Wed Dec 16 10:49:51 2015 Nobuyoshi Nakada <nobu@ruby-lang.org>
* parse.y (block_command, block_call): fix `&.` calls after
block_call. [Feature #11537]
Wed Dec 16 00:53:45 2015 Naohisa Goto <ngotogenome@gmail.com> Wed Dec 16 00:53:45 2015 Naohisa Goto <ngotogenome@gmail.com>
* lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): Acquire * lib/webrick/utils.rb (WEBrick::Utils::TimeoutHandler): Acquire

8
parse.y
View file

@ -1413,7 +1413,7 @@ block_command : block_call
| block_call call_op2 operation2 command_args | block_call call_op2 operation2 command_args
{ {
/*%%%*/ /*%%%*/
$$ = NEW_CALL($1, $3, $4); $$ = NEW_QCALL($2, $1, $3, $4);
/*% /*%
$$ = dispatch3(call, $1, $2, $3); $$ = dispatch3(call, $1, $2, $3);
$$ = method_arg($$, $4); $$ = method_arg($$, $4);
@ -3626,7 +3626,7 @@ block_call : command do_block
| block_call call_op2 operation2 opt_paren_args | block_call call_op2 operation2 opt_paren_args
{ {
/*%%%*/ /*%%%*/
$$ = NEW_CALL($1, $3, $4); $$ = NEW_QCALL($2, $1, $3, $4);
/*% /*%
$$ = dispatch3(call, $1, $2, $3); $$ = dispatch3(call, $1, $2, $3);
$$ = method_optarg($$, $4); $$ = method_optarg($$, $4);
@ -3636,7 +3636,7 @@ block_call : command do_block
{ {
/*%%%*/ /*%%%*/
block_dup_check($4, $5); block_dup_check($4, $5);
$5->nd_iter = NEW_CALL($1, $3, $4); $5->nd_iter = NEW_QCALL($2, $1, $3, $4);
$$ = $5; $$ = $5;
fixpos($$, $1); fixpos($$, $1);
/*% /*%
@ -3648,7 +3648,7 @@ block_call : command do_block
{ {
/*%%%*/ /*%%%*/
block_dup_check($4, $5); block_dup_check($4, $5);
$5->nd_iter = NEW_CALL($1, $3, $4); $5->nd_iter = NEW_QCALL($2, $1, $3, $4);
$$ = $5; $$ = $5;
fixpos($$, $1); fixpos($$, $1);
/*% /*%

17
test/ruby/test_call.rb
View file

@ -65,4 +65,21 @@ class TestCall < Test::Unit::TestCase
o.x&.at(proc.call) o.x&.at(proc.call)
assert_equal(1, count) assert_equal(1, count)
end end
def test_safe_call_block_command
assert_nil(("a".sub! "b" do end&.foo 1))
end
def test_safe_call_block_call
assert_nil(("a".sub! "b" do end&.foo))
end
def test_safe_call_block_call_brace
assert_nil(("a".sub! "b" do end&.foo {}))
assert_nil(("a".sub! "b" do end&.foo do end))
end
def test_safe_call_block_call_command
assert_nil(("a".sub! "b" do end&.foo 1 do end))
end
end end