1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow simple R-assign in endless def

Browse Source
This commit is contained in:
Nobuyoshi Nakada 2020-04-13 18:44:33 +09:00
parent 5dc6080cb8
commit 67bcac879a
Notes: git 2020-04-13 21:52:05 +09:00 
Merged: https://github.com/ruby/ruby/pull/3025
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
parse.y
View File

@ -1104,7 +1104,7 @@ static int looking_at_eol_p(struct parser_params *p);
%type <node> string_contents xstring_contents regexp_contents string_content %type <node> string_contents xstring_contents regexp_contents string_content
%type <node> words symbols symbol_list qwords qsymbols word_list qword_list qsym_list word %type <node> words symbols symbol_list qwords qsymbols word_list qword_list qsym_list word
%type <node> literal numeric simple_numeric ssym dsym symbol cpath def_name defn_head defs_head %type <node> literal numeric simple_numeric ssym dsym symbol cpath def_name defn_head defs_head
%type <node> top_compstmt top_stmts top_stmt begin_block rassign %type <node> top_compstmt top_stmts top_stmt begin_block rassign arg_rassign
%type <node> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call %type <node> bodystmt compstmt stmts stmt_or_begin stmt expr arg primary command command_call method_call
%type <node> expr_value expr_value_do arg_value primary_value fcall rel_expr %type <node> expr_value expr_value_do arg_value primary_value fcall rel_expr
%type <node> if_tail opt_else case_body case_args cases opt_rescue exc_list exc_var opt_ensure %type <node> if_tail opt_else case_body case_args cases opt_rescue exc_list exc_var opt_ensure
@ -1195,6 +1195,7 @@ static int looking_at_eol_p(struct parser_params *p);
%nonassoc tLOWEST %nonassoc tLOWEST
%nonassoc tLBRACE_ARG %nonassoc tLBRACE_ARG
%left tASSOC
%nonassoc modifier_if modifier_unless modifier_while modifier_until keyword_in %nonassoc modifier_if modifier_unless modifier_while modifier_until keyword_in
%left keyword_or keyword_and %left keyword_or keyword_and
@ -1536,6 +1537,19 @@ rassign : arg_value tASSOC lhs
} }
; ;
arg_rassign : arg tASSOC lhs %prec tLOWEST
{
/*%%%*/
$$ = node_assign(p, $3, $1, &@$);
/*% %*/
/*% ripper: assign!($3, $1) %*/
}
| arg %prec tLOWEST
{
$$ = $1;
}
;
command_asgn : lhs '=' command_rhs command_asgn : lhs '=' command_rhs
{ {
/*%%%*/ /*%%%*/
@ -2449,7 +2463,7 @@ arg : lhs '=' arg_rhs
/*% %*/ /*% %*/
/*% ripper: ifop!($1, $3, $6) %*/ /*% ripper: ifop!($1, $3, $6) %*/
} }
| defn_head f_arglist_opt '=' arg | defn_head f_arglist_opt '=' arg_rassign
{ {
restore_defun(p, $<node>1->nd_defn); restore_defun(p, $<node>1->nd_defn);
/*%%%*/ /*%%%*/
@ -2458,7 +2472,7 @@ arg : lhs '=' arg_rhs
/*% ripper: def!(get_value($1), $2, $4) %*/ /*% ripper: def!(get_value($1), $2, $4) %*/
local_pop(p); local_pop(p);
} }
| defs_head f_arglist_opt '=' arg | defs_head f_arglist_opt '=' arg_rassign
{ {
restore_defun(p, $<node>1->nd_defn); restore_defun(p, $<node>1->nd_defn);
/*%%%*/ /*%%%*/

1
test/ruby/test_syntax.rb
View File

@ -1419,6 +1419,7 @@ eom
assert_valid_syntax('private def inc(x) = x + 1') assert_valid_syntax('private def inc(x) = x + 1')
assert_valid_syntax('private def obj.foo = 42') assert_valid_syntax('private def obj.foo = 42')
assert_valid_syntax('private def obj.inc(x) = x + 1') assert_valid_syntax('private def obj.inc(x) = x + 1')
assert_valid_syntax('private def obj.inc(x) = x + 1 => @x')
end end
def test_methoddef_in_cond def test_methoddef_in_cond