archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-08-15 13:39:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

merge revision(s) 6e6844320d: [Backport #16619]

Browse source 
Fixed duplicated warning

	As `command_rhs` is always a "value expression", `command_asgn`
	does not need the same check.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@67868 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2020-03-30 22:11:15 +00:00
parent fdffe91d46
commit 67b77240ee
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

6
parse.y
View file

@ -1511,12 +1511,10 @@ stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
command_asgn : lhs '=' command_rhs
{
value_expr($3);
$$ = node_assign($1, $3, &@$);
}
| var_lhs tOP_ASGN command_rhs
{
value_expr($3);
$$ = new_op_assign($1, $2, $3, &@$);
}
| primary_value '[' opt_call_args rbracket tOP_ASGN command_rhs
@ -1524,7 +1522,6 @@ command_asgn : lhs '=' command_rhs
/*%%%*/
NODE *args;
value_expr($6);
$3 = make_array($3, &@3);
args = arg_concat($3, $6, &@$);
if ($5 == tOROP) {
@ -1543,12 +1540,10 @@ command_asgn : lhs '=' command_rhs
}
| primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
{
value_expr($5);
$$ = new_attr_op_assign($1, $2, $3, $4, $5, &@$);
}
| primary_value call_op tCONSTANT tOP_ASGN command_rhs
{
value_expr($5);
$$ = new_attr_op_assign($1, $2, $3, $4, $5, &@$);
}
| primary_value tCOLON2 tCONSTANT tOP_ASGN command_rhs
@ -1564,7 +1559,6 @@ command_asgn : lhs '=' command_rhs
}
| primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_rhs
{
value_expr($5);
$$ = new_attr_op_assign($1, ID2VAL(idCOLON2), $3, $4, $5, &@$);
}
| backref tOP_ASGN command_rhs

6
test/ruby/test_parse.rb
View file

@ -1099,6 +1099,12 @@ x = __ENCODING__
assert_raise(SyntaxError) { eval("def m\n\C-z""end") }
end
def test_void_value_in_command_rhs
w = "void value expression"
ex = assert_syntax_error("x = return 1", w)
assert_equal(1, ex.message.scan(w).size, "same #{w.inspect} warning should be just once")
end
=begin
def test_past_scope_variable
assert_warning(/past scope/) {catch {|tag| eval("BEGIN{throw tag}; tap {a = 1}; a")}}

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.5.8"
#define RUBY_RELEASE_DATE "2020-03-31"
#define RUBY_PATCHLEVEL 217
#define RUBY_PATCHLEVEL 218
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 3