From 72c96011ea9251e1f2bf9e4fc1edfd1a9e9f1a56 Mon Sep 17 00:00:00 2001 From: nobu Date: Wed, 11 Oct 2017 05:34:24 +0000 Subject: [PATCH] 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/trunk@60160 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- parse.y | 2 +- test/ruby/test_rubyoptions.rb | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/parse.y b/parse.y index 678e7575c3..94b268bfb9 100644 --- a/parse.y +++ b/parse.y @@ -7148,6 +7148,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; @@ -7167,7 +7168,6 @@ parser_prepare(struct parser_params *parser) } pushback(c); parser->enc = rb_enc_get(lex_lastline); - parser->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose); } #ifndef RIPPER diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb index 6b598162d8..f927af2f2d 100644 --- a/test/ruby/test_rubyoptions.rb +++ b/test/ruby/test_rubyoptions.rb @@ -450,6 +450,17 @@ class TestRubyOptions < Test::Unit::TestCase t.flush assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]') end + + a.for("BOM with #{b}") do + err = ["#{t.path}:2: warning: mismatched indentations at '#{e}' with '#{k}' at 1"] + t.rewind + t.truncate(0) + t.print "\u{feff}" + t.puts src + t.flush + assert_in_out_err(["-w", t.path], "", [], err) + assert_in_out_err(["-wr", t.path, "-e", ""], "", [], err) + end end end end