diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | parse.y | 12 | ||||
| -rw-r--r-- | test/ruby/test_parse.rb | 10 |
3 files changed, 27 insertions, 0 deletions
@@ -1,3 +1,8 @@ +Wed Aug 10 17:26:43 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * parse.y (command_asgn): rescue modifier in command assignment + should be limited to rhs only. [ruby-core:75621] [Bug #12402] + Wed Aug 10 15:35:03 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/win32/resolv/resolv.c: needs windows.h for iphlpapi.h on @@ -1357,6 +1357,18 @@ command_asgn : lhs '=' command_call $$ = dispatch2(assign, $1, $3); %*/ } + | lhs '=' command_call modifier_rescue stmt + { + /*%%%*/ + NODE *resq = NEW_RESBODY(0, remove_begin($5), 0); + value_expr($3); + resq = NEW_RESCUE($3, resq, 0); + $$ = node_assign($1, resq); + /*% + $3 = dispatch2(rescue_mod, $3, $5); + $$ = dispatch2(assign, $1, $3); + %*/ + } | lhs '=' command_asgn { /*%%%*/ diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb index eca1744b96..7f0177819e 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -874,6 +874,16 @@ x = __ENCODING__ assert_warning('') {eval("#{a} = 1; /(?<#{a}>)/ =~ ''")} end + def test_rescue_in_command_assignment + bug = '[ruby-core:75621] [Bug #12402]' + v = bug + v = raise(v) rescue "ok" + assert_equal("ok", v) + v = bug + v = raise v rescue "ok" + assert_equal("ok", v) + end + =begin def test_past_scope_variable assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}} |