1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* lib/rdoc/parser.rb (RDoc.binary?): fix wrong regexp.

Browse Source 
[ruby-core:44798] [Bug #6393]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35534 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
naruse 2012-05-03 22:20:26 +00:00
parent c327407bdc
commit 8109c530b2
3 changed files with 9 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Fri May 4 07:19:02 2012 NARUSE, Yui <naruse@ruby-lang.org>
* lib/rdoc/parser.rb (RDoc.binary?): fix wrong regexp.
[ruby-core:44798] [Bug #6393]
Fri May 4 01:33:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> Fri May 4 01:33:20 2012 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/rdoc/parser.rb (RDoc.alias_extension): a real file is irrelevant * lib/rdoc/parser.rb (RDoc.alias_extension): a real file is irrelevant

2
lib/rdoc/parser.rb
View File

@ -85,7 +85,7 @@ class RDoc::Parser
if have_encoding then if have_encoding then
mode = "r" mode = "r"
s.sub!(/\A#!.*\n/, '') # assume shebang line isn't longer than 1024. s.sub!(/\A#!.*\n/, '') # assume shebang line isn't longer than 1024.
encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*\([^\s;]+?\)(?:-\*-)?/, 1] encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*([^\s;]+?)(?:-\*-|[\s;])/, 1]
mode = "r:#{encoding}" if encoding mode = "r:#{encoding}" if encoding
s = File.open(file, mode) {|f| f.gets(nil, 1024)} s = File.open(file, mode) {|f| f.gets(nil, 1024)}

3
test/rdoc/test_rdoc_parser.rb
View File

@ -29,8 +29,11 @@ class TestRDocParser < MiniTest::Unit::TestCase
end end
def test_class_binary_large_japanese_rdoc def test_class_binary_large_japanese_rdoc
extenc, Encoding.default_external = Encoding.default_external, Encoding::US_ASCII
file_name = File.expand_path '../test.ja.largedoc', __FILE__ file_name = File.expand_path '../test.ja.largedoc', __FILE__
assert !@RP.binary?(file_name) assert !@RP.binary?(file_name)
ensure
Encoding.default_external = extenc
end end
def test_class_binary_japanese_rdoc def test_class_binary_japanese_rdoc