diff options
author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-21 05:42:42 +0000 |
---|---|---|
committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2018-02-21 05:42:42 +0000 |
commit | 2292ea6a8ff6347493f7dd8b2d9b57f13a49afdb (patch) | |
tree | 59941b9daec40678b7f397eedd902c4846aeb768 /parse.y | |
parent | aa58701dee09d609b792d1414a092d9e662f37da (diff) |
merge revision(s) 61523: [Backport #14261]
parse.y: assignable_error
* parse.y (assignable_gen): should return valid NODE always even
on errors. [ruby-core:84565] [Bug #14261]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_5@62509 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'parse.y')
-rw-r--r-- | parse.y | 14 |
1 files changed, 4 insertions, 10 deletions
@@ -1983,18 +1983,10 @@ mlhs_node : user_variable lhs : user_variable { $$ = assignable(var_field($1), 0, &@$); - /*%%%*/ - if (!$$) $$ = new_begin(0, &@$); - /*% - %*/ } | keyword_variable { $$ = assignable(var_field($1), 0, &@$); - /*%%%*/ - if (!$$) $$ = new_begin(0, &@$); - /*% - %*/ } | primary_value '[' opt_call_args rbracket { @@ -9957,11 +9949,13 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val, const YYLTYPE *lo #ifdef RIPPER ID id = get_id(lhs); # define assignable_result(x) (lhs) +# define assignable_error() (lhs) # define parser_yyerror(parser, x) (lhs = assign_error_gen(parser, lhs)) #else # define assignable_result(x) assignable_result0(x, location) +# define assignable_error() new_begin(0, location) #endif - if (!id) return assignable_result(0); + if (!id) return assignable_error(); switch (id) { case keyword_self: yyerror0("Can't change the value of self"); @@ -10024,7 +10018,7 @@ assignable_gen(struct parser_params *parser, ID id, NODE *val, const YYLTYPE *lo compile_error(PARSER_ARG "identifier %"PRIsVALUE" is not valid to set", rb_id2str(id)); } error: - return assignable_result(0); + return assignable_error(); #undef assignable_result #undef parser_yyerror } |