From 09af9d7f7ffe1bde891040e0232038130266ccbc Mon Sep 17 00:00:00 2001
From: drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 29 Nov 2012 23:34:29 +0000
Subject: 	* lib/rdoc/generator/darkfish.rb:  Silenced warning 	*
 test/rdoc/test_rdoc_rdoc.rb:  ditto

	* lib/rdoc/markup/parser.rb:  Use byteslice when available for
	  performance
	* test/rdoc/test_rdoc_markup_parser.rb:  Test for above
	* lib/rdoc/test_case.rb:  ditto

	* lib/rdoc/parser/ruby.rb:  Fixed bug parsing yield({})
	* test/rdoc/test_rdoc_parser_ruby.rb (end):

	* lib/rdoc/rubygems_hook.rb:  Skip default gems.  Display generator
	  name properly.
	* test/rdoc/test_rdoc_rubygems_hook.rb:  Test for above

	* lib/rdoc/servlet.rb:  Fixed typo.



git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/rdoc/generator/darkfish.rb |  5 +++--
 lib/rdoc/markup/parser.rb      | 13 +++++++++----
 lib/rdoc/parser/ruby.rb        |  2 +-
 lib/rdoc/rubygems_hook.rb      |  7 ++++++-
 lib/rdoc/servlet.rb            |  2 +-
 lib/rdoc/test_case.rb          |  2 ++
 6 files changed, 22 insertions(+), 9 deletions(-)

(limited to 'lib/rdoc')

diff --git a/lib/rdoc/generator/darkfish.rb b/lib/rdoc/generator/darkfish.rb
index b69d14855a..103a244a25 100644
--- a/lib/rdoc/generator/darkfish.rb
+++ b/lib/rdoc/generator/darkfish.rb
@@ -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
+    rel_prefix = '.'
+    asset_rel_prefix = rel_prefix
+    search_index_rel_prefix = asset_rel_prefix
     search_index_rel_prefix += @asset_rel_path if @file_output
 
     @title = 'Local RDoc Documentation'
diff --git a/lib/rdoc/markup/parser.rb b/lib/rdoc/markup/parser.rb
index ca384d0639..3fce2b4c3b 100644
--- a/lib/rdoc/markup/parser.rb
+++ b/lib/rdoc/markup/parser.rb
@@ -79,6 +79,8 @@ class RDoc::Markup::Parser
     @current_token  = nil
     @debug          = false
     @have_encoding  = Object.const_defined? :Encoding
+    @have_byteslice = ''.respond_to? :byteslice
+    @input          = nil
     @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
+    if @have_byteslice then
+      @input.byteslice(0, byte_offset).length
+    elsif @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
+    @input    = input.dup
 
-    if @have_encoding then
-      @input_encoding = input.encoding
-      @binary_input   = input.dup.force_encoding Encoding::BINARY
+    if @have_encoding and not @have_byteslice then
+      @input_encoding = @input.encoding
+      @binary_input   = @input.force_encoding Encoding::BINARY
     end
 
     @s = StringScanner.new input
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb
index 0e1e012650..fe461ff389 100644
--- a/lib/rdoc/parser/ruby.rb
+++ b/lib/rdoc/parser/ruby.rb
@@ -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
+          break if nest <= 0
         else
           break unless @scanner.continue
         end
diff --git a/lib/rdoc/rubygems_hook.rb b/lib/rdoc/rubygems_hook.rb
index 51c564ea46..9fcb783425 100644
--- a/lib/rdoc/rubygems_hook.rb
+++ b/lib/rdoc/rubygems_hook.rb
@@ -103,6 +103,8 @@ class RDoc::RubygemsHook
   # Documentation will be generated into +destination+
 
   def document generator, options, destination
+    generator_name = generator
+
     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}"
+    say "Installing #{generator_name} 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 if @spec.default_gem?
     return unless @generate_ri or @generate_rdoc
 
     setup
@@ -166,6 +169,8 @@ class RDoc::RubygemsHook
 
     @rdoc.store = RDoc::Store.new
 
+    say "Parsing documentation for #{@spec.full_name}"
+
     Dir.chdir @spec.full_gem_path do
       @rdoc.parse_files options.files
     end
diff --git a/lib/rdoc/servlet.rb b/lib/rdoc/servlet.rb
index d308288029..3df366b967 100644
--- a/lib/rdoc/servlet.rb
+++ b/lib/rdoc/servlet.rb
@@ -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">
+<link type="text/css" media="screen" href="#{@mount_path}/rdoc.css" rel="stylesheet">
 </head>
 <body>
 <h1>Error</h1>
diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb
index e5b7288e5a..c69e3c7cc6 100644
--- a/lib/rdoc/test_case.rb
+++ b/lib/rdoc/test_case.rb
@@ -33,6 +33,8 @@ class RDoc::TestCase < MiniTest::Unit::TestCase
 
     @top_level = nil
 
+    @have_encoding = Object.const_defined? :Encoding
+
     @RM = RDoc::Markup
 
     RDoc::Markup::PreProcess.reset
-- 
cgit v1.2.3