From 2292ea6a8ff6347493f7dd8b2d9b57f13a49afdb Mon Sep 17 00:00:00 2001
From: naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 21 Feb 2018 05:42:42 +0000
Subject: [PATCH] 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
---
 parse.y                 | 14 ++++----------
 test/ruby/test_parse.rb |  6 ++++++
 version.h               |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/parse.y b/parse.y
index 61fa1aa6a2..c2a8be996b 100644
--- a/parse.y
+++ b/parse.y
@@ -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
diff --git a/version.h b/version.h
index dea01d82cd..e14ef19638 100644
--- a/version.h
+++ b/version.h
@@ -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