merge revision(s) 60160: [Backport #13998]

	parse.y: token info with BOM

	* parse.y (parser_prepare): set token_info_enabled flag first,
	  before returning at BOM.  [ruby-dev:50288] [Bug #13998]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@62822 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 19 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index d62f7a5f27..6ac2d4a62e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 19 00:16:28 2018  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	parse.y: token info with BOM
+
+	* parse.y (parser_prepare): set token_info_enabled flag first, before
+	  returning at BOM. [Bug #13998]
+
 Mon Mar 19 00:06:43 2018  Hiroshi Shirosaki  <h.shirosaki@gmail.com>
 
 	io.c: fix segfault with closing socket on Windows
diff --git a/parse.y b/parse.y
index 365b5a9ad0..ba3d683da0 100644
--- a/parse.y
+++ b/parse.y
@@ -7364,6 +7364,7 @@ static void
 parser_prepare(struct parser_params *parser)
 {
     int c = nextc();
+    parser->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
     switch (c) {
       case '#':
 	if (peek('!')) parser->has_shebang = 1;
@@ -7384,7 +7385,6 @@ parser_prepare(struct parser_params *parser)
     pushback(c);
     parser->enc = rb_enc_get(lex_lastline);
     deferred_nodes = 0;
-    parser->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
 }
 
 #define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index 4495e1e4ea..6f4ecc8d77 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -406,6 +406,16 @@ class TestRubyOptions < Test::Unit::TestCase
       t.puts " end"
       t.flush
       assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]')
+
+      err = ["#{t.path}:2: warning: mismatched indentations at 'end' with 'begin' at 1"]
+      t.rewind
+      t.truncate(0)
+      t.print "\u{feff}"
+      t.puts "begin"
+      t.puts " end"
+      t.flush
+      assert_in_out_err(["-w", t.path], "", [], err)
+      assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err)
     }
   end
 
diff --git a/version.h b/version.h
index 7c51f9d53b..076b7d56a2 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
 #define RUBY_VERSION "2.3.7"
 #define RUBY_RELEASE_DATE "2018-03-19"
-#define RUBY_PATCHLEVEL 422
+#define RUBY_PATCHLEVEL 423
 
 #define RUBY_RELEASE_YEAR 2018
 #define RUBY_RELEASE_MONTH 3