diff options
| -rw-r--r-- | parse.y | 14 | ||||
| -rw-r--r-- | test/ruby/test_parse.rb | 6 | ||||
| -rw-r--r-- | version.h | 2 |
3 files changed, 11 insertions, 11 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 } diff --git a/test/ruby/test_parse.rb b/test/ruby/test_parse.rb index e26bcdc07e..15c6245bac 100644 --- a/test/ruby/test_parse.rb +++ b/test/ruby/test_parse.rb @@ -746,6 +746,12 @@ x = __ENCODING__ end END end + assert_raise(SyntaxError) do + eval "#{<<~"begin;"}\n#{<<~'end;'}", nil, __FILE__, __LINE__+1 + begin; + x, true + end; + end end def test_block_dup @@ -1,6 +1,6 @@ #define RUBY_VERSION "2.5.0" #define RUBY_RELEASE_DATE "2018-02-21" -#define RUBY_PATCHLEVEL 26 +#define RUBY_PATCHLEVEL 27 #define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_MONTH 2 |