* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta1

  This version is mostly same as r56072. It contains to remove code
  for Ruby 1.8

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56079 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

10 files changed, 67 insertions, 56 deletions

diff --git a/ChangeLog b/ChangeLog
index afbecc775c..81f0157e5e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Sep  7 11:51:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
+
+	* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta1
+	  This version is mostly same as r56072. It contains to remove code
+	  for Ruby 1.8
+
 Tue Sep  6 09:23:06 2016  SHIBATA Hiroshi  <hsbt@ruby-lang.org>
 
 	* lib/rdoc/rdoc.gemspec: partly reverted for default gem installer.
diff --git a/lib/rdoc.rb b/lib/rdoc.rb
index 494d5d9f4a..43da573d26 100644
--- a/lib/rdoc.rb
+++ b/lib/rdoc.rb
@@ -65,7 +65,7 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '4.2.3'
+  VERSION = '5.0.0.beta1'
 
   ##
   # Method visibilities
@@ -185,4 +185,3 @@ module RDoc
   autoload :Require,        'rdoc/require'
 
 end
-
diff --git a/lib/rdoc/markdown.rb b/lib/rdoc/markdown.rb
index 596856dac1..06fe8cf4d4 100644
--- a/lib/rdoc/markdown.rb
+++ b/lib/rdoc/markdown.rb
@@ -526,11 +526,7 @@ class RDoc::Markdown
   require 'rdoc/markup/to_joined_paragraph'
   require 'rdoc/markdown/entities'
 
-  if RUBY_VERSION > '1.9' then
-    require 'rdoc/markdown/literals_1_9'
-  else
-    require 'rdoc/markdown/literals_1_8'
-  end
+  require 'rdoc/markdown/literals'
 
   ##
   # Supported extensions
diff --git a/lib/rdoc/markdown/literals_1_9.rb b/lib/rdoc/markdown/literals.rb
index d7a27f12b1..cde761a2f7 100644
--- a/lib/rdoc/markdown/literals_1_9.rb
+++ b/lib/rdoc/markdown/literals.rb
@@ -289,8 +289,6 @@ class RDoc::Markdown::Literals
         else
           return ans
         end
-
-        return ans
       end
     end
 
@@ -323,8 +321,6 @@ class RDoc::Markdown::Literals
         else
           return ans
         end
-
-        return ans
       end
     end
 
diff --git a/lib/rdoc/markup/formatter_test_case.rb b/lib/rdoc/markup/formatter_test_case.rb
index 776fe00537..a5b4933de4 100644
--- a/lib/rdoc/markup/formatter_test_case.rb
+++ b/lib/rdoc/markup/formatter_test_case.rb
@@ -177,9 +177,6 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
       # Calls accept_heading_3 with a level 3 RDoc::Markup::Heading
 
       def test_accept_heading_3
-        # HACK this doesn't belong here
-        skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
-
         @to.start_accepting
 
         @to.accept_heading @RM::Heading.new(3, 'Hello')
@@ -765,4 +762,3 @@ class RDoc::Markup::FormatterTestCase < RDoc::TestCase
   end
 
 end
-
diff --git a/lib/rdoc/rdoc.gemspec b/lib/rdoc/rdoc.gemspec
index 9c2609b434..606021f8b1 100644
--- a/lib/rdoc/rdoc.gemspec
+++ b/lib/rdoc/rdoc.gemspec
@@ -1,7 +1,60 @@
+# -*- encoding: utf-8 -*-
+$:.unshift File.expand_path("../lib", __FILE__)
+require 'rdoc'
+
 Gem::Specification.new do |s|
   s.name = "rdoc"
-  s.version = "4.2.3"
-  s.summary = "This rdoc is bundled with Ruby"
+  s.version = RDoc::VERSION
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 1.3") if
+    s.respond_to? :required_rubygems_version=
+
+  s.require_paths = ["lib"]
+  s.authors = [
+    "Eric Hodel",
+    "Dave Thomas",
+    "Phil Hagelberg",
+    "Tony Strauss",
+    "Zachary Scott",
+    "Hiroshi SHIBATA"
+  ]
+
+  s.description = <<-DESCRIPTION
+RDoc produces HTML and command-line documentation for Ruby projects.
+RDoc includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line.
+  DESCRIPTION
+
+  s.email = ["drbrain@segment7.net", "mail@zzak.io", "hsbt@ruby-lang.org"]
+
+  s.bindir = "exe"
   s.executables = ["rdoc", "ri"]
-  s.files = ["rdoc.rb", "rdoc/alias.rb", "rdoc/anon_class.rb", "rdoc/any_method.rb", "rdoc/attr.rb", "rdoc/class_module.rb", "rdoc/code_object.rb", "rdoc/code_objects.rb", "rdoc/comment.rb", "rdoc/constant.rb", "rdoc/context.rb", "rdoc/context/section.rb", "rdoc/cross_reference.rb", "rdoc/encoding.rb", "rdoc/erb_partial.rb", "rdoc/erbio.rb", "rdoc/extend.rb", "rdoc/generator.rb", "rdoc/generator/darkfish.rb", "rdoc/generator/json_index.rb", "rdoc/generator/markup.rb", "rdoc/generator/pot.rb", "rdoc/generator/pot/message_extractor.rb", "rdoc/generator/pot/po.rb", "rdoc/generator/pot/po_entry.rb", "rdoc/generator/ri.rb", "rdoc/ghost_method.rb", "rdoc/i18n.rb", "rdoc/i18n/locale.rb", "rdoc/i18n/text.rb", "rdoc/include.rb", "rdoc/known_classes.rb", "rdoc/markdown.rb", "rdoc/markdown/entities.rb", "rdoc/markdown/literals_1_9.rb", "rdoc/markup.rb", "rdoc/markup/attr_changer.rb", "rdoc/markup/attr_span.rb", "rdoc/markup/attribute_manager.rb", "rdoc/markup/attributes.rb", "rdoc/markup/blank_line.rb", "rdoc/markup/block_quote.rb", "rdoc/markup/document.rb", "rdoc/markup/formatter.rb", "rdoc/markup/formatter_test_case.rb", "rdoc/markup/hard_break.rb", "rdoc/markup/heading.rb", "rdoc/markup/include.rb", "rdoc/markup/indented_paragraph.rb", "rdoc/markup/inline.rb", "rdoc/markup/list.rb", "rdoc/markup/list_item.rb", "rdoc/markup/paragraph.rb", "rdoc/markup/parser.rb", "rdoc/markup/pre_process.rb", "rdoc/markup/raw.rb", "rdoc/markup/rule.rb", "rdoc/markup/special.rb", "rdoc/markup/text_formatter_test_case.rb", "rdoc/markup/to_ansi.rb", "rdoc/markup/to_bs.rb", "rdoc/markup/to_html.rb", "rdoc/markup/to_html_crossref.rb", "rdoc/markup/to_html_snippet.rb", "rdoc/markup/to_joined_paragraph.rb", "rdoc/markup/to_label.rb", "rdoc/markup/to_markdown.rb", "rdoc/markup/to_rdoc.rb", "rdoc/markup/to_table_of_contents.rb", "rdoc/markup/to_test.rb", "rdoc/markup/to_tt_only.rb", "rdoc/markup/verbatim.rb", "rdoc/meta_method.rb", "rdoc/method_attr.rb", "rdoc/mixin.rb", "rdoc/normal_class.rb", "rdoc/normal_module.rb", "rdoc/options.rb", "rdoc/parser.rb", "rdoc/parser/c.rb", "rdoc/parser/changelog.rb", "rdoc/parser/markdown.rb", "rdoc/parser/rd.rb", "rdoc/parser/ruby.rb", "rdoc/parser/ruby_tools.rb", "rdoc/parser/simple.rb", "rdoc/parser/text.rb", "rdoc/rd.rb", "rdoc/rd/block_parser.rb", "rdoc/rd/inline.rb", "rdoc/rd/inline_parser.rb", "rdoc/rdoc.rb", "rdoc/require.rb", "rdoc/ri.rb", "rdoc/ri/driver.rb", "rdoc/ri/formatter.rb", "rdoc/ri/paths.rb", "rdoc/ri/store.rb", "rdoc/ri/task.rb", "rdoc/ruby_lex.rb", "rdoc/ruby_token.rb", "rdoc/rubygems_hook.rb", "rdoc/servlet.rb", "rdoc/single_class.rb", "rdoc/stats.rb", "rdoc/stats/normal.rb", "rdoc/stats/quiet.rb", "rdoc/stats/verbose.rb", "rdoc/store.rb", "rdoc/task.rb", "rdoc/test_case.rb", "rdoc/text.rb", "rdoc/token_stream.rb", "rdoc/tom_doc.rb", "rdoc/top_level.rb"]
+
+  s.extra_rdoc_files += %w[
+    CVE-2013-0256.rdoc
+    CONTRIBUTING.rdoc
+    ExampleMarkdown.md
+    ExampleRDoc.rdoc
+    History.rdoc
+    LEGAL.rdoc
+    LICENSE.rdoc
+    README.rdoc
+    RI.rdoc
+    TODO.rdoc
+  ]
+
+  s.files = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+  s.files << "lib/rdoc/rd/block_parser.rb" << "lib/rdoc/rd/inline_parser.rb" << "lib/rdoc/markdown.rb"
+
+  s.homepage = "http://docs.seattlerb.org/rdoc"
+  s.licenses = ["Ruby"]
+
+  s.rdoc_options = ["--main", "README.rdoc"]
+  s.required_ruby_version = Gem::Requirement.new(">= 1.9.3")
+  s.rubygems_version = "2.5.2"
+  s.summary = "RDoc produces HTML and command-line documentation for Ruby projects"
+
+  s.add_development_dependency("rake", "~> 10.5")
+  s.add_development_dependency("racc", "~> 1.4", "> 1.4.10")
+  s.add_development_dependency("kpeg", "~> 0.9")
+  s.add_development_dependency("minitest", "~> 4")
 end
diff --git a/lib/rdoc/ruby_lex.rb b/lib/rdoc/ruby_lex.rb
index 11ac8da85c..25788b6a29 100644
--- a/lib/rdoc/ruby_lex.rb
+++ b/lib/rdoc/ruby_lex.rb
@@ -1180,10 +1180,8 @@ class RDoc::RubyLex
 
     str = if ltype == quoted and %w[" ' /].include? ltype then
             ltype.dup
-          elsif RUBY_VERSION > '1.9' then
-            "%#{type or PERCENT_LTYPE.key ltype}#{PERCENT_PAREN_REV[quoted]||quoted}"
           else
-            "%#{type or PERCENT_LTYPE.index ltype}#{PERCENT_PAREN_REV[quoted]||quoted}"
+            "%#{type or PERCENT_LTYPE.key ltype}#{PERCENT_PAREN_REV[quoted]||quoted}"
           end
 
     subtype = nil
@@ -1371,4 +1369,3 @@ class RDoc::RubyLex
 end
 
 #RDoc::RubyLex.debug_level = 1
-
diff --git a/lib/rdoc/store.rb b/lib/rdoc/store.rb
index 3f91f05824..37bf03fc24 100644
--- a/lib/rdoc/store.rb
+++ b/lib/rdoc/store.rb
@@ -450,18 +450,12 @@ class RDoc::Store
   # inherit from Object, we have the above wrong inheritance.
   #
   # We fix BasicObject right away if we are running in a Ruby
-  # version >= 1.9. If not, we may be documenting 1.9 source
-  # while running under 1.8: we search the files of BasicObject
-  # for "object.c", and fix the inheritance if we find it.
+  # version >= 1.9.
 
   def fix_basic_object_inheritance
     basic = classes_hash['BasicObject']
     return unless basic
-    if RUBY_VERSION >= '1.9'
-      basic.superclass = nil
-    elsif basic.in_files.any? { |f| File.basename(f.full_name) == 'object.c' }
-      basic.superclass = nil
-    end
+    basic.superclass = nil
   end
 
   ##
@@ -977,4 +971,3 @@ class RDoc::Store
   end
 
 end
-
diff --git a/lib/rdoc/test_case.rb b/lib/rdoc/test_case.rb
index 1d5469bc19..3b928f2f3d 100644
--- a/lib/rdoc/test_case.rb
+++ b/lib/rdoc/test_case.rb
@@ -177,8 +177,6 @@ class RDoc::TestCase < MiniTest::Unit::TestCase
   # Depends upon Dir.mktmpdir
 
   def temp_dir
-    skip "No Dir::mktmpdir, upgrade your ruby" unless Dir.respond_to? :mktmpdir
-
     Dir.mktmpdir do |temp_dir|
       Dir.chdir temp_dir do
         yield temp_dir
@@ -208,11 +206,3 @@ class RDoc::TestCase < MiniTest::Unit::TestCase
     end
   end
 end
-
-# This hack allows autoload to work when Dir.pwd is changed for Ruby 1.8 since
-# -I paths are not expanded.
-$LOAD_PATH.each do |load_path|
-  break if load_path[0] == ?/
-  load_path.replace File.expand_path load_path
-end if RUBY_VERSION < '1.9'
-
diff --git a/test/rdoc/test_rdoc_markup_to_bs.rb b/test/rdoc/test_rdoc_markup_to_bs.rb
index 33d274a97f..153a121d78 100644
--- a/test/rdoc/test_rdoc_markup_to_bs.rb
+++ b/test/rdoc/test_rdoc_markup_to_bs.rb
@@ -25,7 +25,6 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
   end
 
   def accept_heading
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "===== H\bHe\bel\bll\blo\bo\n", @to.res.join
   end
 
@@ -216,37 +215,30 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
   end
 
   def accept_heading_1
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
   end
 
   def accept_heading_2
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
   end
 
   def accept_heading_3
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "=== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
   end
 
   def accept_heading_4
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "==== H\bHe\bel\bll\blo\bo\n", @to.end_accepting
   end
 
   def accept_heading_indent
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "   = H\bHe\bel\bll\blo\bo\n", @to.end_accepting
   end
 
   def accept_heading_b
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
   end
 
   def accept_heading_suppressed_crossref
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "= H\bHe\bel\bll\blo\bo\n", @to.end_accepting
   end
 
@@ -264,24 +256,20 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
   end
 
   def accept_paragraph_b
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "reg b\bbo\bol\bld\bd \b w\bwo\bor\brd\bds\bs reg\n",
                  @to.end_accepting
   end
 
   def accept_paragraph_br
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "one\ntwo\n", @to.end_accepting
   end
 
   def accept_paragraph_break
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "hello\nworld\n",
                  @to.end_accepting
   end
 
   def accept_paragraph_i
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc_\b _\bw_\bo_\br_\bd_\bs reg\n",
                  @to.end_accepting
   end
@@ -301,12 +289,10 @@ class TestRDocMarkupToBs < RDoc::Markup::TextFormatterTestCase
   end
 
   def accept_paragraph_star
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "reg b\bbo\bol\bld\bd reg\n", @to.end_accepting
   end
 
   def accept_paragraph_underscore
-    skip "No String#chars, upgrade your ruby" unless ''.respond_to? :chars
     assert_equal "reg _\bi_\bt_\ba_\bl_\bi_\bc reg\n", @to.end_accepting
   end
 
@@ -364,4 +350,3 @@ words words words words
   end
 
 end
-