summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--parse.y2
-rw-r--r--test/ruby/test_rubyoptions.rb11
-rw-r--r--version.h2
3 files changed, 13 insertions, 2 deletions
diff --git a/parse.y b/parse.y
index 3a2cff1941..c38bfe2508 100644
--- a/parse.y
+++ b/parse.y
@@ -7234,6 +7234,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;
@@ -7253,7 +7254,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);
}
#define IS_ARG() IS_lex_state(EXPR_ARG_ANY)
diff --git a/test/ruby/test_rubyoptions.rb b/test/ruby/test_rubyoptions.rb
index fb637dd5be..1ea1115aa5 100644
--- a/test/ruby/test_rubyoptions.rb
+++ b/test/ruby/test_rubyoptions.rb
@@ -443,6 +443,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
diff --git a/version.h b/version.h
index b46da12a78..e8dd5b68f4 100644
--- a/version.h
+++ b/version.h
@@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-07"
-#define RUBY_PATCHLEVEL 253
+#define RUBY_PATCHLEVEL 254
#define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3