11 files changed, 71 insertions, 17 deletions
@@ -1,3 +1,22 @@
 Fri Nov 30 08:09:56 2012 Narihiro Nakamura <[email protected]>
 * gc.c : remove a unused function.
@@ -484,8 +484,9 @@ class RDoc::Generator::Darkfish
 debug_msg 'Rendering the servlet root page...'
- rel_prefix = asset_rel_prefix = '.'
- search_index_rel_prefix = rel_prefix
 search_index_rel_prefix += @asset_rel_path if @file_output
 @title = 'Local RDoc Documentation'
@@ -79,6 +79,8 @@ class RDoc::Markup::Parser
 @current_token = nil
 @debug = false
 @have_encoding = Object.const_defined? :Encoding
 @input_encoding = nil
 @line = 0
 @line_pos = 0
@@ -321,7 +323,9 @@ class RDoc::Markup::Parser
 # The character offset for the input string at the given +byte_offset+
 def char_pos byte_offset
- if @have_encoding then
 matched = @binary_input[0, byte_offset]
 matched.force_encoding @input_encoding
 matched.length
@@ -416,10 +420,11 @@ class RDoc::Markup::Parser
 def setup_scanner input
 @line = 0
 @line_pos = 0
- if @have_encoding then
- @input_encoding = input.encoding
- @binary_input = input.dup.force_encoding Encoding::BINARY
 end
 @s = StringScanner.new input
@@ -1250,7 +1250,7 @@ class RDoc::Parser::Ruby < RDoc::Parser
 when end_token then
 if end_token == TkRPAREN
 nest -= 1
- break if @scanner.lex_state == EXPR_END and nest <= 0
 else
 break unless @scanner.continue
 end
@@ -103,6 +103,8 @@ class RDoc::RubygemsHook
 # Documentation will be generated into +destination+
 def document generator, options, destination
 options = options.dup
 options.exclude ||= [] # TODO maybe move to RDoc::Options#finish
 options.setup_generator generator
@@ -114,7 +116,7 @@ class RDoc::RubygemsHook
 @rdoc.options = options
 @rdoc.generator = generator
- say "Installing #{generator} documentation for #{@spec.full_name}"
 FileUtils.mkdir_p options.op_dir
@@ -132,6 +134,7 @@ class RDoc::RubygemsHook
 # Generates RDoc and ri data
 def generate
 return unless @generate_ri or @generate_rdoc
 setup
@@ -166,6 +169,8 @@ class RDoc::RubygemsHook
 @rdoc.store = RDoc::Store.new
 Dir.chdir @spec.full_gem_path do
 @rdoc.parse_files options.files
 end
@@ -132,7 +132,7 @@ class RDoc::Servlet < WEBrick::HTTPServlet::AbstractServlet
 <title>Error - #{ERB::Util.html_escape e.class}</title>
-<link type="text/css" media="screen" href="#{@mouth_path}/rdoc.css" rel="stylesheet">
 </head>
 <body>
 <h1>Error</h1>
@@ -33,6 +33,8 @@ class RDoc::TestCase < MiniTest::Unit::TestCase
 @top_level = nil
 @RM = RDoc::Markup
 RDoc::Markup::PreProcess.reset
@@ -7,13 +7,15 @@ class TestRDocMarkupParser < RDoc::TestCase
 def setup
 super
 @RMP = @RM::Parser
 end
 def mu_pp(obj)
 s = ''
 s = PP.pp obj, s
- s = s.force_encoding(Encoding.default_external) if defined? Encoding
 s.chomp
 end
@@ -34,7 +36,7 @@ class TestRDocMarkupParser < RDoc::TestCase
 s.scan(/\S+/)
- if Object.const_defined? :Encoding then
 assert_equal 3, parser.char_pos(s.pos)
 else
 assert_equal 4, parser.char_pos(s.pos)
@@ -1364,7 +1366,7 @@ cat::
 end
 def test_tokenize_note_utf_8
- skip 'Encoding not implemented' unless Object.const_defined? :Encoding
 str = <<-STR
 cät:: l1a
@@ -1630,7 +1632,7 @@ Example heading:
 s.scan(/\S+/)
- if Object.const_defined? :Encoding then
 assert_equal [3, 0], parser.token_pos(s.pos)
 else
 assert_equal [4, 0], parser.token_pos(s.pos)
@@ -1684,6 +1684,16 @@ end
 assert_equal "def \317\211", omega.text
 end
 def test_parse_statements_class_if
 util_parser <<-CODE
 module Foo
@@ -142,8 +142,6 @@ class TestRDocRDoc < RDoc::TestCase
 end
 def test_parse_file
- pwd = Dir.pwd
-
 @rdoc.store = RDoc::Store.new
 temp_dir do |dir|
@@ -153,8 +151,6 @@ class TestRDocRDoc < RDoc::TestCase
 io.puts 'hi'
 end
- test_txt = File.join dir, 'test.txt'
-
 top_level = @rdoc.parse_file 'test.txt'
 assert_equal 'test.txt', top_level.absolute_name
@@ -100,6 +100,20 @@ class TestRDocRubygemsHook < Gem::TestCase
 assert rdoc.options.hyperlink_all
 end
 def test_generate_disabled
 @hook.generate_rdoc = false
 @hook.generate_ri = false