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

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_6@67839 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2020-03-07 09:44:38 +00:00
parent ca74f62a3a
commit 773b45bcc8
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

@ -1211,7 +1211,6 @@ stmt : keyword_alias fitem {SET_LEX_STATE(EXPR_FNAME|EXPR_FITEM);} fitem
command_asgn : lhs '=' command_rhs
{
/*%%%*/
value_expr($3);
$$ = node_assign(p, $1, $3, &@$);
/*% %*/
/*% ripper: assign!($1, $3) %*/
@ -1219,7 +1218,6 @@ command_asgn : lhs '=' command_rhs
| var_lhs tOP_ASGN command_rhs
{
/*%%%*/
value_expr($3);
$$ = new_op_assign(p, $1, $2, $3, &@$);
/*% %*/
/*% ripper: opassign!($1, $2, $3) %*/
@ -1227,7 +1225,6 @@ command_asgn : lhs '=' command_rhs
| primary_value '[' opt_call_args rbracket tOP_ASGN command_rhs
{
/*%%%*/
value_expr($6);
$$ = new_ary_op_assign(p, $1, $3, $5, $6, &@3, &@$);
/*% %*/
/*% ripper: opassign!(aref_field!($1, escape_Qundef($3)), $5, $6) %*/
@ -1236,7 +1233,6 @@ command_asgn : lhs '=' command_rhs
| primary_value call_op tIDENTIFIER tOP_ASGN command_rhs
{
/*%%%*/
value_expr($5);
$$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$);
/*% %*/
/*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/
@ -1244,7 +1240,6 @@ command_asgn : lhs '=' command_rhs
| primary_value call_op tCONSTANT tOP_ASGN command_rhs
{
/*%%%*/
value_expr($5);
$$ = new_attr_op_assign(p, $1, $2, $3, $4, $5, &@$);
/*% %*/
/*% ripper: opassign!(field!($1, $2, $3), $4, $5) %*/
@ -1260,7 +1255,6 @@ command_asgn : lhs '=' command_rhs
| primary_value tCOLON2 tIDENTIFIER tOP_ASGN command_rhs
{
/*%%%*/
value_expr($5);
$$ = new_attr_op_assign(p, $1, ID2VAL(idCOLON2), $3, $4, $5, &@$);
/*% %*/
/*% ripper: opassign!(field!($1, ID2VAL(idCOLON2), $3), $4, $5) %*/

6
test/ruby/test_parse.rb
View file

@ -1198,6 +1198,12 @@ x = __ENCODING__
assert_valid_syntax('let () { m(a) do; 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.6.6"
#define RUBY_RELEASE_DATE RUBY_RELEASE_YEAR_STR"-"RUBY_RELEASE_MONTH_STR"-"RUBY_RELEASE_DAY_STR
#define RUBY_PATCHLEVEL 126
#define RUBY_PATCHLEVEL 127
#define RUBY_RELEASE_YEAR 2020
#define RUBY_RELEASE_MONTH 3