summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-10 08:26:46 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-08-10 08:26:46 +0000
commit064ed74be4a4d0d03a2de13f5d6732e62b959930 (patch)
treedd9965e0b388eccaa5873c988462c8fac3a09033
parent89ab385b17276858a64e614fb1c9c39b14ff6648 (diff)
parse.y: rescue modifier in rhs
* parse.y (command_asgn): rescue modifier in command assignment should be limited to rhs only. [ruby-core:75621] [Bug #12402] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@55851 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--parse.y12
-rw-r--r--test/ruby/test_parse.rb10
3 files changed, 27 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index da2c8fb..e88db3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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
diff --git a/parse.y b/parse.y
index ac7ad14..94518ab 100644
--- a/parse.y
+++ b/parse.y
@@ -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 eca1744..7f01778 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")}}