rdoc 4.2.1 → 6.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9ada5f8d7d6785b7b03e29cb5bf37c4082bfec08
-  data.tar.gz: 95e96b167a1425de8c96d777758c127e618efb55
+SHA256:
+  metadata.gz: 327e6414793206350f148388b0df495ff2c748c1d4bb129ef320a442e4084619
+  data.tar.gz: 44c884a1eb18506c90af82fefa6f7686973ab32e1ceb42c6616b0ffbf88ac868
 SHA512:
-  metadata.gz: f5f1a961017517cc742b37f7c2316ac26e5919c4cd94f9309c65547eedd2d9edaaa03028a9c4701dd1af4a28eb63fa37d06553390fac4395a4910ea58dc6d4c1
-  data.tar.gz: 17f551f6edd7d4f0b7dde1e465081a90139bafa15bfc142aa98a41aabfb4013a3df031c58a2f3452326fb0166bb51a667e60f41f4600e63d5ddeabd102dbcadb
+  metadata.gz: 8691cde93b42f6c4ff77f6212e40c5c15c408b1953e58cf14f17cef142970ff79564bf7fe12b7f072067267fd67ad62920241e54e7a6d592487545bd19a82311
+  data.tar.gz: 3adbda517d389982d0d67ccd92478d0b0912c156c2988a26089715ff77e998025d6f2d8eafd44cdbd66daa2c647bd2201d1c0f57c5731bac19c45aea3014ae4c

data/CONTRIBUTING.rdoc

@@ -8,7 +8,7 @@ classes for each feature.
 == Bugs
 
 If you think you found a bug, file a ticket on the {issues
-tracker}[https://github.com/rdoc/rdoc/issues] on github.
+tracker}[https://github.com/ruby/rdoc/issues] on github.
 
 If your bug involves an error RDoc produced please include a sample file that
 illustrates the problem or link to the repository or gem that is associated
@@ -17,14 +17,16 @@ with the bug.
 Please include steps to reproduce the issue.  Here are some examples of good
 issues:
 
-* https://github.com/rdoc/rdoc/issues/55
-* https://github.com/rdoc/rdoc/issues/61
+* https://github.com/ruby/rdoc/issues/55
+* https://github.com/ruby/rdoc/issues/61
 
 == Developer Quick Start
 
-RDoc uses hoe for development.  To get ready to work on RDoc run:
+RDoc uses bundler for development.  To get ready to work on RDoc run:
 
-  $ gem install hoe
+  $ gem install bundler
+  [...]
+  $ bundle install
   [...]
   $ rake
   [...]
@@ -33,7 +35,7 @@ This will install all the necessary dependencies for development with rake,
 generate documentation and run the tests for the first time.
 
 If the tests don't pass on the first run check the {Travis CI page for
-RDoc}[https://travis-ci.org/rdoc/rdoc] to see if there are any known failures
+RDoc}[https://travis-ci.org/ruby/rdoc] to see if there are any known failures
 (there shouldn't be).
 
 You can now use `rake` and `autotest` to run the tests.
@@ -216,4 +218,3 @@ To register the parser with rdoc, add the markup type's name and class to the
 RDoc::Text::MARKUP_FORMAT hash like:
 
   RDoc::Text::MARKUP_FORMAT['rdoc'] = RDoc::Markup
-

data/Gemfile

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :development do
+  gem "rake"
+  gem "racc", "> 1.4.10"
+  gem "kpeg"
+  gem "test-unit"
+  gem "minitest" # for test_rdoc_rubygems_hook.rb
+  gem "rubocop"
+end

data/History.rdoc

@@ -1,7 +1,51 @@
-=== 4.2.1
+=== 5.1.0 / 2017-02-24
 
 * Bug fixes
-  * Fixed infinite loop with CR #339
+  * Fix an issue that rdoc fails when running on Windows with RUBYOPT=-U.
+    PR #430 by Toshihiko Ichida
+
+* Minor enhancements
+  * Parse ruby 2.1 <visibility> def. PR #436 by Akira Matsuda.
+  * Suppress warnings in eval. PR #440 by Nobuyoshi Nakada.
+
+=== 5.0.0 / 2016-11-05
+
+* Major enhancements
+  * Cleanup deprecated code targeted Ruby 1.8
+
+* Bug fixes
+  * Ensure badge data is included in result of JsonIndex template.
+  * Ensure items in the nil section are displayed in HTML output.  Issue #399
+    by Daniel Svensson.
+  * Parse rb_intern_const correctly in C.  PR #381 by Sho Hashimoto.
+  * Fix broken assets caused by #335 when serving ri.  PR #360 by Alex Wood.
+  * Don't try to parse svg files.  Issue #350 by Sigurd Svela.
+
+* Minor enhancements
+  * Improve class name expansion/resolution in ri.  PR #400 by NARUSE, Yui
+  * Improve performance of document generation. PR #397 by Yusuke Endoh.
+
+=== 4.3.0 / 2016-11-04
+
+* Minor enhancements
+  * Removed json dependency for Ruby 2.4.0
+  * End to support Ruby 1.8.x
+
+=== 4.2.2 / 2016-02-09
+
+* Bug fixes
+  * Include lib/rdoc/generator/pot/* in built gem
+
+
+=== 4.2.1 / 2015-12-22
+
+* Bug fixes
+  * Fixed infinite loop with CR #339 by @nobu
+  * Allow rdoc run with --disable-gems #340  by @luizluca
+  * Don't store full path in GZipped js files #341 by @voxik
+  * Fix relative path names for drive letters #367 by @nobu
+  * Fix for valid syntax `class C end` parsing #368 by @nobu
+
 
 === 4.2.0 / 2014-12-06
 
@@ -33,7 +77,7 @@
 * Bug fixes
   * Fixed HTML labels for cross-browser compatibility.  This breaks existing
     links but enables cross-browser compatibility.  Pull request #330 by Jens
-    Wille.
+    Will.
   * RDoc handles ASCII-incompatible encodings now.  An encoding hint may need
     to be added to the file for RDoc to produce correct output, though.
     Issue #288 by Manuel Meurer.
@@ -677,7 +721,7 @@ Changes since RDoc 4.0.0.rc.2:
 
 * Major enhancements
   * RDoc HTML output has been improved:
-    * The search from Володя Колесников's (Vladimir Kolesnikov) Sdoc has been
+    * The search from Володя Колесников's (Vladimir Kolesnikov) SDoc has been
       integrated.
 
       The search index generation is a reusable component through

data/LEGAL.rdoc

@@ -14,7 +14,7 @@ Darkfish::
   * lib/rdoc/generator/template/darkfish/*
   * lib/rdoc/generator/template/darkfish/images
 
-Sdoc::
+SDoc::
   Portions of SDoc by (Володя Колесников) Vladimir Kolesnikov are included
   under the MIT license as RDoc::Generator::JsonIndex.  See
   lib/rdoc/generator/json_index.rb for license information.
@@ -23,7 +23,7 @@ Sdoc::
   * lib/rdoc/generator/template/json_index/*
   * The +#search_index+ methods on RDoc::CodeObject subclasses were derived
     from sdoc.
-  * RDoc::ClassModule#document_self_or_methods comes from Sdoc.
+  * RDoc::ClassModule#document_self_or_methods comes from SDoc.
 
 peg-markdown::
   RDoc's Markdown support is derived from peg-markdown by John MacFarlane.  It

data/README.rdoc

@@ -1,9 +1,9 @@
 = \RDoc - Ruby Documentation System
 
-home :: https://github.com/rdoc/rdoc
-rdoc :: http://docs.seattlerb.org/rdoc
-bugs :: https://github.com/rdoc/rdoc/issues
-code quality :: {<img src="https://codeclimate.com/badge.png" alt="code climate">}[https://codeclimate.com/github/rdoc/rdoc]
+home :: https://github.com/ruby/rdoc
+rdoc :: https://ruby.github.io/rdoc
+bugs :: https://github.com/ruby/rdoc/issues
+code quality :: {<img src="https://codeclimate.com/github/ruby/rdoc/badges/gpa.svg" alt="Code Climate">}[https://codeclimate.com/github/ruby/rdoc]
 
 == Description
 
@@ -46,7 +46,7 @@ contain just Markup-style markup (with or without leading '#' comment
 markers).  If directory names are passed to RDoc, they are scanned
 recursively for C and Ruby source files only.
 
-To generate documentation using +rake+ see RDoc::Task[http://docs.seattlerb.org/rdoc/RDocTask.html].
+To generate documentation using +rake+ see RDoc::Task[https://ruby.github.io/rdoc/RDocTask.html].
 
 To generate documentation programmatically:
 

data/Rakefile

@@ -1,183 +1,101 @@
 $:.unshift File.expand_path 'lib'
-require 'rdoc'
-require 'hoe'
-
-ENV['BENCHMARK'] = 'yes'
+require 'rdoc/task'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
 
 task :docs    => :generate
-task :test    => :generate
+task :test    => [:normal_test, :rubygems_test]
 
 PARSER_FILES = %w[
-  lib/rdoc/rd/block_parser.rb
-  lib/rdoc/rd/inline_parser.rb
-  lib/rdoc/markdown.rb
-  lib/rdoc/markdown/literals_1_8.rb
-  lib/rdoc/markdown/literals_1_9.rb
+  lib/rdoc/rd/block_parser.ry
+  lib/rdoc/rd/inline_parser.ry
+  lib/rdoc/markdown.kpeg
+  lib/rdoc/markdown/literals.kpeg
 ]
 
-Hoe.plugin :git
-Hoe.plugin :kpeg
-Hoe.plugin :minitest
-Hoe.plugin :travis
-
 $rdoc_rakefile = true
 
-hoe = Hoe.spec 'rdoc' do
-  developer 'Eric Hodel', 'drbrain@segment7.net'
-  developer 'Dave Thomas', ''
-  developer 'Phil Hagelberg', 'technomancy@gmail.com'
-  developer 'Tony Strauss', 'tony.strauss@designingpatterns.com'
-
-  self.rsync_args = '-avz'
-  rdoc_locations << 'docs.seattlerb.org:/data/www/docs.seattlerb.org/rdoc/'
-  rdoc_locations << 'drbrain@rubyforge.org:/var/www/gforge-projects/rdoc/'
-
-  spec_extras[:post_install_message] = <<-MESSAGE
-Depending on your version of ruby, you may need to install ruby rdoc/ri data:
-
-<= 1.8.6 : unsupported
- = 1.8.7 : gem install rdoc-data; rdoc-data --install
- = 1.9.1 : gem install rdoc-data; rdoc-data --install
->= 1.9.2 : nothing to do! Yay!
-  MESSAGE
-
-  self.licenses << 'Ruby'
-  self.readme_file  = 'README.rdoc'
-  self.history_file = 'History.rdoc'
-  self.testlib = :minitest
-  self.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
-  ]
-
-  self.clean_globs += PARSER_FILES
-  self.kpeg_flags = '-fsv' if self.respond_to? :kpeg_flags= # no plugin
-
-  require_ruby_version '>= 1.8.7'
-  extra_deps     << ['json',     '~> 1.4']
-  extra_dev_deps << ['racc',     '~> 1.4', '> 1.4.10']
-  extra_dev_deps << ['minitest', '~> 4']
-
-  extra_rdoc_files << 'Rakefile'
-  spec_extras['required_rubygems_version'] = '>= 1.3'
-  spec_extras['homepage'] = 'http://docs.seattlerb.org/rdoc'
-end
-
-hoe.test_prelude = 'gem "minitest", "~> 4.0"'
+task :default => :test
 
-def rake(*args)
-  sh $0, *args
+RDoc::Task.new do |doc|
+  doc.main = 'README.rdoc'
+  doc.title = "rdoc #{RDoc::VERSION} Documentation"
+  doc.rdoc_dir = 'html'
+  doc.rdoc_files = FileList.new %w[lib/**/*.rb *.rdoc] - PARSER_FILES
 end
 
-need_racc = PARSER_FILES.any? do |rb_file|
-  ry_file = rb_file.gsub(/\.rb\z/, ".ry")
-  not File.exist?(rb_file) or
-    (File.exist?(ry_file) and File.mtime(rb_file) < File.mtime(ry_file))
+task ghpages: :rdoc do
+  `git checkout gh-pages`
+  require "fileutils"
+  FileUtils.rm_rf "/tmp/html"
+  FileUtils.mv "html", "/tmp"
+  FileUtils.rm_rf "*"
+  FileUtils.cp_r Dir.glob("/tmp/html/*"), "."
 end
 
-if need_racc
-  Rake::Task["default"].prerequisites.clear
-  task :default do
-    rake "check_extra_deps"
-    rake "install_plugins"
-    rake "newb"
-  end
+Rake::TestTask.new(:normal_test) do |t|
+  t.libs << "test/rdoc"
+  t.verbose = true
+  t.deps = :generate
+  t.test_files = FileList["test/**/test_*.rb"].exclude("test/rdoc/test_rdoc_rubygems_hook.rb")
 end
 
-Rake::Task['docs'].actions.clear
-task :docs do
-  $LOAD_PATH.unshift 'lib'
-  require 'rdoc'
-
-  options = RDoc::Options.new
-  options.title = "rdoc #{RDoc::VERSION} Documentation"
-  options.op_dir = 'doc'
-  options.main_page = 'README.rdoc'
-  options.files = hoe.spec.extra_rdoc_files + %w[lib]
-  options.setup_generator 'darkfish'
-
-  RDoc::RDoc.new.document options
-end
-
-# requires ruby 1.8 and ruby 1.8 to build
-hoe.clean_globs -= PARSER_FILES.grep(/literals_/)
-
-task :generate => :isolate
-task :generate => PARSER_FILES
-task :check_manifest => :generate
-
-rule '.rb' => '.ry' do |t|
-  racc = Gem.bin_path 'racc', 'racc'
-
-  ruby "-rubygems #{racc} -l -o #{t.name} #{t.source}"
+Rake::TestTask.new(:rubygems_test) do |t|
+  t.libs << "test/rdoc"
+  t.verbose = true
+  t.deps = :generate
+  t.pattern = "test/rdoc/test_rdoc_rubygems_hook.rb"
 end
 
-path = "pkg/#{hoe.spec.full_name}"
+path = "pkg/#{Bundler::GemHelper.gemspec.full_name}"
 
 package_parser_files = PARSER_FILES.map do |parser_file|
-  package_parser_file = "#{path}/#{parser_file}"
-  file package_parser_file => parser_file # ensure copy runs before racc
-  package_parser_file
-end
+  name = File.basename(parser_file, File.extname(parser_file))
+  _path = File.dirname(parser_file)
+  package_parser_file = "#{path}/#{name}.rb"
+  parsed_file = "#{_path}/#{name}.rb"
 
-task "#{path}.gem" => package_parser_files
+  file package_parser_file => parsed_file # ensure copy runs before racc
 
-# These tasks expect to have the following directory structure:
-#
-#   git/git.rubini.us/code # Rubinius git HEAD checkout
-#   svn/ruby/trunk         # ruby subversion HEAD checkout
-#   svn/rdoc/trunk         # RDoc subversion HEAD checkout
-#
-# If you don't have this directory structure, set RUBY_PATH and/or
-# RUBINIUS_PATH.
-
-diff_options = "-urpN --exclude '*svn*' --exclude '*swp' --exclude '*rbc'"
-rsync_options = "-avP --exclude '*svn*' --exclude '*swp' --exclude '*rbc' --exclude '*.rej' --exclude '*.orig' --exclude '*.kpeg' --exclude '*.ry' --exclude 'literals_1_8.rb' --exclude 'gauntlet_rdoc.rb'"
-
-rubinius_dir = ENV['RUBINIUS_PATH'] || '../../../git/git.rubini.us/code'
-ruby_dir = ENV['RUBY_PATH'] || '../../svn/ruby/trunk'
-
-desc "Updates Ruby HEAD with the currently checked-out copy of RDoc."
-task :update_ruby do
-  sh "rsync #{rsync_options} bin/rdoc #{ruby_dir}/bin/rdoc"
-  sh "rsync #{rsync_options} bin/ri #{ruby_dir}/bin/ri"
-  sh "rsync #{rsync_options} lib/ #{ruby_dir}/lib"
-  sh "rsync #{rsync_options} test/ #{ruby_dir}/test/rdoc"
+  package_parser_file
 end
 
-desc "Diffs Ruby HEAD with the currently checked-out copy of RDoc."
-task :diff_ruby do
-  options = "-urpN --exclude '*svn*' --exclude '*swp' --exclude '*rbc'"
-
-  sh "diff #{diff_options} bin/rdoc #{ruby_dir}/bin/rdoc; true"
-  sh "diff #{diff_options} bin/ri #{ruby_dir}/bin/ri; true"
-  sh "diff #{diff_options} lib/rdoc.rb #{ruby_dir}/lib/rdoc.rb; true"
-  sh "diff #{diff_options} lib/rdoc #{ruby_dir}/lib/rdoc; true"
-  sh "diff #{diff_options} test #{ruby_dir}/test/rdoc; true"
-end
+parsed_files = PARSER_FILES.map do |parser_file|
+  ext = File.extname(parser_file)
+  parsed_file = "#{parser_file.chomp(ext)}.rb"
+
+  file parsed_file => parser_file do |t|
+    puts "Generating #{parsed_file}..."
+    case ext
+    when '.ry' # need racc
+      racc = Gem.bin_path 'racc', 'racc'
+      rb_file = parser_file.gsub(/\.ry\z/, ".rb")
+      ruby "#{racc} -l -o #{rb_file} #{parser_file}"
+      open(rb_file, 'r+') do |f|
+        newtext = "# frozen_string_literal: true\n#{f.read}"
+        f.rewind
+        f.write newtext
+      end
+    when '.kpeg' # need kpeg
+      kpeg = Gem.bin_path 'kpeg', 'kpeg'
+      rb_file = parser_file.gsub(/\.kpeg\z/, ".rb")
+      ruby "#{kpeg} -fsv -o #{rb_file} #{parser_file}"
+    end
+  end
 
-desc "Updates Rubinius HEAD with the currently checked-out copy of RDoc."
-task :update_rubinius do
-  sh "rsync #{rsync_options} bin/rdoc #{rubinius_dir}/lib/bin/rdoc.rb"
-  sh "rsync #{rsync_options} bin/ri #{rubinius_dir}/lib/bin/ri.rb"
-  sh "rsync #{rsync_options} lib/ #{rubinius_dir}/lib"
-  sh "rsync #{rsync_options} test/ #{rubinius_dir}/test/rdoc"
+  parsed_file
 end
 
-desc "Diffs Rubinius HEAD with the currently checked-out copy of RDoc."
-task :diff_rubinius do
-  sh "diff #{diff_options} bin/rdoc #{rubinius_dir}/lib/bin/rdoc.rb; true"
-  sh "diff #{diff_options} bin/ri #{rubinius_dir}/lib/bin/ri.rb; true"
-  sh "diff #{diff_options} lib/rdoc.rb #{rubinius_dir}/lib/rdoc.rb; true"
-  sh "diff #{diff_options} lib/rdoc #{rubinius_dir}/lib/rdoc; true"
-  sh "diff #{diff_options} test #{rubinius_dir}/test/rdoc; true"
+task "#{path}.gem" => package_parser_files
+desc "Generate all files used racc and kpeg"
+task :generate => parsed_files
+
+begin
+  require 'rubocop/rake_task'
+rescue LoadError
+else
+  RuboCop::RakeTask.new(:rubocop) do |t|
+    t.options = [*parsed_files]
+  end
+  task :build => [:generate, "rubocop:auto_correct"]
 end
-

data/bin/console

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+require "bundler/setup"
+require "rdoc"
+
+require "irb"
+IRB.start

data/bin/setup

@@ -0,0 +1,6 @@
+#!/usr/bin/env bash
+set -euo pipefail
+IFS=$'\n\t'
+set -vx
+
+bundle install

data/lib/rdoc/alias.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Represent an alias, which is an old_name/new_name pair associated with a
 # particular context

data/lib/rdoc/anon_class.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # An anonymous class like:
 #

data/lib/rdoc/any_method.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # AnyMethod is the base class for objects representing methods
 
@@ -25,12 +26,6 @@ class RDoc::AnyMethod < RDoc::MethodAttr
 
   attr_accessor :c_function
 
-  ##
-  # Different ways to call this method
-
-  attr_reader :call_seq
-
-  ##
   # Parameters for this method
 
   attr_accessor :params
@@ -92,6 +87,19 @@ class RDoc::AnyMethod < RDoc::MethodAttr
     end
   end
 
+  ##
+  # Different ways to call this method
+
+  def call_seq
+    unless call_seq = _call_seq
+      call_seq = is_alias_for._call_seq if is_alias_for
+    end
+
+    return unless call_seq
+
+    deduplicate_call_seq(call_seq)
+  end
+
   ##
   # Sets the different ways you can call this method.  If an empty +call_seq+
   # is given nil is assumed.
@@ -243,9 +251,9 @@ class RDoc::AnyMethod < RDoc::MethodAttr
     if @block_params then
       # If this method has explicit block parameters, remove any explicit
       # &block
-      params.sub!(/,?\s*&\w+/, '')
+      params = params.sub(/,?\s*&\w+/, '')
     else
-      params.sub!(/\&(\w+)/, '\1')
+      params = params.sub(/\&(\w+)/, '\1')
     end
 
     params = params.gsub(/\s+/, '').split(',').reject(&:empty?)
@@ -264,7 +272,7 @@ class RDoc::AnyMethod < RDoc::MethodAttr
       params = params.sub(/(\|[^|]+\|)\s*\.\.\.\s*(end|\})/, '\1 \2')
     elsif @params then
       params = @params.gsub(/\s*\#.*/, '')
-      params = params.tr("\n", " ").squeeze(" ")
+      params = params.tr_s("\n ", " ")
       params = "(#{params})" unless params[0] == ?(
     else
       params = ''
@@ -273,12 +281,11 @@ class RDoc::AnyMethod < RDoc::MethodAttr
     if @block_params then
       # If this method has explicit block parameters, remove any explicit
       # &block
-      params.sub!(/,?\s*&\w+/, '')
+      params = params.sub(/,?\s*&\w+/, '')
 
-      block = @block_params.gsub(/\s*\#.*/, '')
-      block = block.tr("\n", " ").squeeze(" ")
+      block = @block_params.tr_s("\n ", " ")
       if block[0] == ?(
-        block.sub!(/^\(/, '').sub!(/\)/, '')
+        block = block.sub(/^\(/, '').sub(/\)/, '')
       end
       params << " { |#{block}| ... }"
     end
@@ -312,5 +319,43 @@ class RDoc::AnyMethod < RDoc::MethodAttr
     @superclass_method
   end
 
-end
+  protected
+
+  ##
+  # call_seq without deduplication and alias lookup.
+
+  def _call_seq
+    @call_seq if defined?(@call_seq) && @call_seq
+  end
+
+  private
+
+  ##
+  # call_seq with alias examples information removed, if this
+  # method is an alias method.
+
+  def deduplicate_call_seq(call_seq)
+    return call_seq unless is_alias_for || !aliases.empty?
+
+    method_name = self.name
+    method_name = method_name[0, 1] if method_name =~ /\A\[/
 
+    entries = call_seq.split "\n"
+
+    ignore = aliases.map(&:name)
+    if is_alias_for
+      ignore << is_alias_for.name
+      ignore.concat is_alias_for.aliases.map(&:name)
+    end
+    ignore.map! { |n| n =~ /\A\[/ ? n[0, 1] : n}
+    ignore.delete(method_name)
+    ignore = Regexp.union(ignore)
+
+    matching = entries.reject do |entry|
+      entry =~ /^\w*\.?#{ignore}/ or
+        entry =~ /\s#{ignore}\s/
+    end
+
+    matching.join "\n"
+  end
+end

data/lib/rdoc/attr.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # An attribute created by \#attr, \#attr_reader, \#attr_writer or
 # \#attr_accessor

data/lib/rdoc/class_module.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # ClassModule is the base class for objects representing either a class or a
 # module.
@@ -135,7 +136,9 @@ class RDoc::ClassModule < RDoc::Context
                 normalize_comment comment
               end
 
-    @comment_location.delete_if { |(_, l)| l == location }
+    if location.parser == RDoc::Parser::C
+      @comment_location.delete_if { |(_, l)| l == location }
+    end
 
     @comment_location << [comment, location]
 
@@ -207,7 +210,7 @@ class RDoc::ClassModule < RDoc::Context
                 normalize_comment comment
               end
 
-    comment = "#{@comment}\n---\n#{comment}" unless @comment.empty?
+    comment = "#{@comment.to_s}\n---\n#{comment.to_s}" unless @comment.empty?
 
     super comment
   end

data/lib/rdoc/code_object.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 ##
 # Base class for the RDoc code tree.
 #
@@ -68,13 +69,6 @@ class RDoc::CodeObject
 
   attr_reader :metadata
 
-  ##
-  # Offset in #file where this CodeObject was defined
-  #--
-  # TODO character or byte?
-
-  attr_accessor :offset
-
   ##
   # Sets the parent CodeObject
 
@@ -149,9 +143,8 @@ class RDoc::CodeObject
                  else
                    # HACK correct fix is to have #initialize create @comment
                    #      with the correct encoding
-                   if String === @comment and
-                      Object.const_defined? :Encoding and @comment.empty? then
-                     @comment.force_encoding comment.encoding
+                   if String === @comment and @comment.empty? then
+                     @comment = RDoc::Encoding.change_encoding @comment, comment.encoding
                    end
                    @comment
                  end
@@ -426,4 +419,3 @@ class RDoc::CodeObject
   end
 
 end
-

data/lib/rdoc/code_objects.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 # This file was used to load all the RDoc::CodeObject subclasses at once.  Now
 # autoload handles this.