archive/ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2025-09-16 17:14:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

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

Browse source 
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_4@62691 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nagachika 2018-03-07 14:26:14 +00:00
parent 2921521e92
commit 4e9537bf33
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
parse.y
View file

@ -7234,6 +7234,7 @@ static void
parser_prepare(struct parser_params *parser) parser_prepare(struct parser_params *parser)
{ {
int c = nextc(); int c = nextc();
parser->token_info_enabled = !compile_for_eval && RTEST(ruby_verbose);
switch (c) { switch (c) {
case '#': case '#':
if (peek('!')) parser->has_shebang = 1; if (peek('!')) parser->has_shebang = 1;
@ -7253,7 +7254,6 @@ parser_prepare(struct parser_params *parser)
} }
pushback(c); pushback(c);
parser->enc = rb_enc_get(lex_lastline); 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) #define IS_ARG() IS_lex_state(EXPR_ARG_ANY)

11
test/ruby/test_rubyoptions.rb
View file

@ -443,6 +443,17 @@ class TestRubyOptions < Test::Unit::TestCase
t.flush t.flush
assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]') assert_in_out_err(["-w", t.path], "", [], [], '[ruby-core:25442]')
end 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 end
end end

2
version.h
View file

@ -1,6 +1,6 @@
#define RUBY_VERSION "2.4.4" #define RUBY_VERSION "2.4.4"
#define RUBY_RELEASE_DATE "2018-03-07" #define RUBY_RELEASE_DATE "2018-03-07"
#define RUBY_PATCHLEVEL 253 #define RUBY_PATCHLEVEL 254
#define RUBY_RELEASE_YEAR 2018 #define RUBY_RELEASE_YEAR 2018
#define RUBY_RELEASE_MONTH 3 #define RUBY_RELEASE_MONTH 3