rdoc 8.0.0 → 8.1.0

data/lib/rdoc/parser.rb

@@ -1,288 +1,296 @@
 # -*- coding: us-ascii -*-
 # frozen_string_literal: true
 
-##
-# A parser is simple a class that subclasses RDoc::Parser and implements #scan
-# to fill in an RDoc::TopLevel with parsed data.
-#
-# The initialize method takes an RDoc::TopLevel to fill with parsed content,
-# the name of the file to be parsed, the content of the file, an RDoc::Options
-# object and an RDoc::Stats object to inform the user of parsed items.  The
-# scan method is then called to parse the file and must return the
-# RDoc::TopLevel object.  By calling super these items will be set for you.
-#
-# In order to be used by RDoc the parser needs to register the file extensions
-# it can parse.  Use ::parse_files_matching to register extensions.
-#
-#   require 'rdoc'
-#
-#   class RDoc::Parser::Xyz < RDoc::Parser
-#     parse_files_matching /\.xyz$/
-#
-#     def initialize top_level, file_name, content, options, stats
-#       super
-#
-#       # extra initialization if needed
-#     end
-#
-#     def scan
-#       # parse file and fill in @top_level
-#     end
-#   end
-
-class RDoc::Parser
-
-  @parsers = []
-
-  class << self
+module RDoc
+  ##
+  # A parser is simple a class that subclasses RDoc::Parser and implements #scan
+  # to fill in an RDoc::TopLevel with parsed data.
+  #
+  # The initialize method takes an RDoc::TopLevel to fill with parsed content,
+  # the name of the file to be parsed, the content of the file, an RDoc::Options
+  # object and an RDoc::Stats object to inform the user of parsed items.  The
+  # scan method is then called to parse the file and must return the
+  # RDoc::TopLevel object.  By calling super these items will be set for you.
+  #
+  # In order to be used by RDoc the parser needs to register the file extensions
+  # it can parse.  Use ::parse_files_matching to register extensions.
+  #
+  #   require 'rdoc'
+  #
+  #   class RDoc::Parser::Xyz < RDoc::Parser
+  #     parse_files_matching /\.xyz$/
+  #
+  #     def initialize top_level, file_name, content, options, stats
+  #       super
+  #
+  #       # extra initialization if needed
+  #     end
+  #
+  #     def scan
+  #       # parse file and fill in @top_level
+  #     end
+  #   end
 
-    ##
-    # An Array of arrays that maps file extension (or name) regular
-    # expressions to parser classes that will parse matching filenames.
-    #
-    # Use parse_files_matching to register a parser's file extensions.
+  class Parser
 
-    attr_reader :parsers
+    @parsers = []
 
-  end
+    class << self
 
-  ##
-  # The name of the file being parsed
+      ##
+      # An Array of arrays that maps file extension (or name) regular
+      # expressions to parser classes that will parse matching filenames.
+      #
+      # Use parse_files_matching to register a parser's file extensions.
 
-  attr_reader :file_name
+      attr_reader :parsers
 
-  ##
-  # Alias an extension to another extension. After this call, files ending
-  # "new_ext" will be parsed using the same parser as "old_ext"
+    end
 
-  def self.alias_extension(old_ext, new_ext)
-    old_ext = old_ext.sub(/^\.(.*)/, '\1')
-    new_ext = new_ext.sub(/^\.(.*)/, '\1')
+    ##
+    # The name of the file being parsed
 
-    parser = can_parse_by_name "xxx.#{old_ext}"
-    return false unless parser
+    attr_reader :file_name
 
-    RDoc::Parser.parsers.unshift [/\.#{new_ext}$/, parser]
+    ##
+    # Alias an extension to another extension. After this call, files ending
+    # "new_ext" will be parsed using the same parser as "old_ext"
 
-    true
-  end
+    def self.alias_extension(old_ext, new_ext)
+      old_ext = old_ext.sub(/^\.(.*)/, '\1')
+      new_ext = new_ext.sub(/^\.(.*)/, '\1')
 
-  ##
-  # Determines if the file is a "binary" file which basically means it has
-  # content that an RDoc parser shouldn't try to consume.
+      parser = can_parse_by_name "xxx.#{old_ext}"
+      return false unless parser
 
-  def self.binary?(file)
-    return false if file =~ /\.(rdoc|txt)$/
+      Parser.parsers.unshift [/\.#{new_ext}$/, parser]
 
-    s = File.read(file, 1024) or return false
+      true
+    end
 
-    return true if s[0, 2] == Marshal.dump('')[0, 2] or s.index("\x00")
+    ##
+    # Determines if the file is a "binary" file which basically means it has
+    # content that an RDoc parser shouldn't try to consume.
 
-    mode = 'r:utf-8' # default source encoding has been changed to utf-8
-    s.sub!(/\A#!.*\n/, '')     # assume shebang line isn't longer than 1024.
-    encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*([^\s;]+?)(?:-\*-|[\s;])/, 1]
-    mode = "rb:#{encoding}" if encoding
-    s = File.open(file, mode) {|f| f.gets(nil, 1024)}
+    def self.binary?(file)
+      return false if file =~ /\.(rdoc|txt)$/
 
-    not s.valid_encoding?
-  end
+      s = File.read(file, 1024) or return false
 
-  ##
-  # Checks if +file+ is a zip file in disguise.  Signatures from
-  # http://www.garykessler.net/library/file_sigs.html
+      return true if s[0, 2] == Marshal.dump('')[0, 2] or s.index("\x00")
 
-  def self.zip?(file)
-    zip_signature = File.read file, 4
+      mode = 'r:utf-8' # default source encoding has been changed to utf-8
+      s.sub!(/\A#!.*\n/, '')     # assume shebang line isn't longer than 1024.
+      encoding = s[/^\s*\#\s*(?:-\*-\s*)?(?:en)?coding:\s*([^\s;]+?)(?:-\*-|[\s;])/, 1]
+      mode = "rb:#{encoding}" if encoding
+      s = File.open(file, mode) {|f| f.gets(nil, 1024)}
 
-    zip_signature == "PK\x03\x04" or
-      zip_signature == "PK\x05\x06" or
-      zip_signature == "PK\x07\x08"
-  rescue
-    false
-  end
+      not s.valid_encoding?
+    end
 
-  ##
-  # Return a parser that can handle a particular extension
+    ##
+    # Checks if +file+ is a zip file in disguise.  Signatures from
+    # http://www.garykessler.net/library/file_sigs.html
 
-  def self.can_parse(file_name)
-    parser = can_parse_by_name file_name
+    def self.zip?(file)
+      zip_signature = File.read file, 4
 
-    # HACK Selenium hides a jar file using a .txt extension
-    return if parser == RDoc::Parser::Simple and zip? file_name
+      zip_signature == "PK\x03\x04" or
+        zip_signature == "PK\x05\x06" or
+        zip_signature == "PK\x07\x08"
+    rescue
+      false
+    end
 
-    parser
-  end
+    ##
+    # Return a parser that can handle a particular extension
 
-  ##
-  # Returns a parser that can handle the extension for +file_name+.  This does
-  # not depend upon the file being readable.
+    def self.can_parse(file_name)
+      parser = can_parse_by_name file_name
 
-  def self.can_parse_by_name(file_name)
-    _, parser = RDoc::Parser.parsers.find { |regexp,| regexp =~ file_name }
+      # HACK Selenium hides a jar file using a .txt extension
+      return if parser == Parser::Simple and zip? file_name
 
-    # The default parser must not parse binary files
-    ext_name = File.extname file_name
-    return parser if ext_name.empty?
+      parser
+    end
 
-    if parser == RDoc::Parser::Simple and ext_name !~ /txt|rdoc/ then
-      case mode = check_modeline(file_name)
-      when nil, 'rdoc' then # continue
-      else
-        RDoc::Parser.parsers.find { |_, p| return p if mode.casecmp?(p.name[/\w+\z/]) }
-        return nil
+    ##
+    # Returns a parser that can handle the extension for +file_name+.  This does
+    # not depend upon the file being readable.
+
+    def self.can_parse_by_name(file_name)
+      _, parser = Parser.parsers.find { |regexp,| regexp =~ file_name }
+
+      # The default parser must not parse binary files
+      ext_name = File.extname file_name
+      return parser if ext_name.empty?
+
+      if parser == Parser::Simple and ext_name !~ /txt|rdoc/
+        case mode = check_modeline(file_name)
+        when nil, 'rdoc' # continue
+        else
+          Parser.parsers.find { |_, p| return p if mode.casecmp?(p.name[/\w+\z/]) }
+          return nil
+        end
       end
-    end
 
-    parser
-  rescue Errno::EACCES
-  end
+      parser
+    rescue Errno::EACCES
+    end
 
-  ##
-  # Returns the file type from the modeline in +file_name+
+    ##
+    # Returns the file type from the modeline in +file_name+
 
-  def self.check_modeline(file_name)
-    line = File.open file_name do |io|
-      io.gets
-    end
+    def self.check_modeline(file_name)
+      line = File.open file_name do |io|
+        io.gets
+      end
 
-    /-\*-\s*(.*?\S)\s*-\*-/ =~ line
+      /-\*-\s*(.*?\S)\s*-\*-/ =~ line
 
-    return nil unless type = $1
+      return nil unless type = $1
 
-    if /;/ =~ type then
-      return nil unless /(?:\s|\A)mode:\s*([^\s;]+)/i =~ type
-      type = $1
-    end
+      if /;/ =~ type
+        return nil unless /(?:\s|\A)mode:\s*([^\s;]+)/i =~ type
+        type = $1
+      end
 
-    return nil if /coding:/i =~ type
+      return nil if /coding:/i =~ type
 
-    type.downcase
-  rescue ArgumentError
-  rescue Encoding::InvalidByteSequenceError # invalid byte sequence
+      type.downcase
+    rescue ArgumentError
+    rescue ::Encoding::InvalidByteSequenceError # invalid byte sequence
 
-  end
+    end
 
-  ##
-  # Finds and instantiates the correct parser for the given +file_name+ and
-  # +content+.
+    ##
+    # Finds and instantiates the correct parser for the given +file_name+ and
+    # +content+.
 
-  def self.for(top_level, content, options, stats)
-    file_name = top_level.absolute_name
-    return if binary? file_name
+    def self.for(top_level, content, options, stats)
+      file_name = top_level.absolute_name
+      return if binary? file_name
 
-    parser = use_markup content
+      parser = use_markup content
 
-    unless parser then
-      parse_name = file_name
+      unless parser
+        parse_name = file_name
 
-      # If no extension, look for shebang
-      if file_name !~ /\.\w+$/ && content =~ %r{\A#!(.+)} then
-        shebang = $1
-        case shebang
-        when %r{env\s+ruby}, %r{/ruby}
-          parse_name = 'dummy.rb'
+        # If no extension, look for shebang
+        if file_name !~ /\.\w+$/ && content =~ %r{\A#!(.+)}
+          shebang = $1
+          case shebang
+          when %r{env\s+ruby}, %r{/ruby}
+            parse_name = 'dummy.rb'
+          end
         end
+
+        parser = can_parse parse_name
       end
 
-      parser = can_parse parse_name
-    end
+      return unless parser
 
-    return unless parser
+      content = remove_modeline content
 
-    content = remove_modeline content
+      parser.new top_level, content, options, stats
+    rescue SystemCallError
+      nil
+    end
 
-    parser.new top_level, content, options, stats
-  rescue SystemCallError
-    nil
-  end
+    ##
+    # Record which file types this parser can understand.
+    #
+    # It is ok to call this multiple times.
 
-  ##
-  # Record which file types this parser can understand.
-  #
-  # It is ok to call this multiple times.
+    def self.parse_files_matching(regexp)
+      Parser.parsers.unshift [regexp, self]
+    end
 
-  def self.parse_files_matching(regexp)
-    RDoc::Parser.parsers.unshift [regexp, self]
-  end
+    ##
+    # Removes an emacs-style modeline from the first line of the document
 
-  ##
-  # Removes an emacs-style modeline from the first line of the document
+    def self.remove_modeline(content)
+      content.sub(/\A.*-\*-\s*(.*?\S)\s*-\*-.*\r?\n/, '')
+    end
 
-  def self.remove_modeline(content)
-    content.sub(/\A.*-\*-\s*(.*?\S)\s*-\*-.*\r?\n/, '')
-  end
+    ##
+    # If there is a <tt>markup: parser_name</tt> comment at the front of the
+    # file, use it to determine the parser.  For example:
+    #
+    #   # markup: rdoc
+    #   # Class comment can go here
+    #
+    #   class C
+    #   end
+    #
+    # The comment should appear as the first line of the +content+.
+    #
+    # If the content contains a shebang or editor modeline the comment may
+    # appear on the second or third line.
+    #
+    # Any comment style may be used to hide the markup comment.
+    #
+    # The +tomdoc+ and +markdown+ markups name comment formats rather than
+    # parsers, so no parser is selected for them and RDoc::Parser.for picks one
+    # from the file name instead.
 
-  ##
-  # If there is a <tt>markup: parser_name</tt> comment at the front of the
-  # file, use it to determine the parser.  For example:
-  #
-  #   # markup: rdoc
-  #   # Class comment can go here
-  #
-  #   class C
-  #   end
-  #
-  # The comment should appear as the first line of the +content+.
-  #
-  # If the content contains a shebang or editor modeline the comment may
-  # appear on the second or third line.
-  #
-  # Any comment style may be used to hide the markup comment.
+    def self.use_markup(content)
+      markup = content.lines.first(3).grep(/markup:\s+(\w+)/) { $1 }.first
 
-  def self.use_markup(content)
-    markup = content.lines.first(3).grep(/markup:\s+(\w+)/) { $1 }.first
+      return unless markup
 
-    return unless markup
+      # tomdoc and markdown name a comment format, not a parser.  Skipping them
+      # keeps the search below from matching RDoc::Parser::Markdown for a file
+      # that is not markdown.
+      return if %w[tomdoc markdown].include? markup
 
-    # TODO Ruby should be returned only when the filename is correct
-    return RDoc::Parser::Ruby if %w[tomdoc markdown].include? markup
+      markup = Regexp.escape markup
 
-    markup = Regexp.escape markup
+      _, selected = Parser.parsers.find do |_, parser|
+        /^#{markup}$/i =~ parser.name.sub(/.*:/, '')
+      end
 
-    _, selected = RDoc::Parser.parsers.find do |_, parser|
-      /^#{markup}$/i =~ parser.name.sub(/.*:/, '')
+      selected
     end
 
-    selected
-  end
-
-  ##
-  # Creates a new Parser storing +top_level+, +file_name+, +content+,
-  # +options+ and +stats+ in instance variables.  In +@preprocess+ an
-  # RDoc::Markup::PreProcess object is created which allows processing of
-  # directives.
-
-  def initialize(top_level, content, options, stats)
-    @top_level = top_level
-    @top_level.parser = self.class
-    @store = @top_level.store
-
-    @file_name = top_level.absolute_name
-    @content = content
-    @options = options
-    @stats = stats
-
-    @preprocess = RDoc::Markup::PreProcess.new @file_name, @options.rdoc_include
-    @preprocess.options = @options
-  end
+    ##
+    # Creates a new Parser storing +top_level+, +file_name+, +content+,
+    # +options+ and +stats+ in instance variables.  In +@preprocess+ an
+    # RDoc::Markup::PreProcess object is created which allows processing of
+    # directives.
+
+    def initialize(top_level, content, options, stats)
+      @top_level = top_level
+      @top_level.parser = self.class
+      @store = @top_level.store
+
+      @file_name = top_level.absolute_name
+      @content = content
+      @options = options
+      @stats = stats
+
+      @preprocess = Markup::PreProcess.new @file_name, @options.rdoc_include
+      @preprocess.options = @options
+    end
 
-  autoload :Text, "#{__dir__}/parser/text"
+    autoload :Text, "#{__dir__}/parser/text"
 
-  ##
-  # Normalizes tabs in +body+
-
-  def handle_tab_width(body)
-    if /\t/ =~ body
-      tab_width = @options.tab_width
-      body.split(/\n/).map do |line|
-        1 while line.gsub!(/\t+/) do
-          b, e = $~.offset(0)
-          ' ' * (tab_width * (e-b) - b % tab_width)
-        end
-        line
-      end.join "\n"
-    else
-      body
+    ##
+    # Normalizes tabs in +body+
+
+    def handle_tab_width(body)
+      if /\t/ =~ body
+        tab_width = @options.tab_width
+        body.split(/\n/).map do |line|
+          1 while line.gsub!(/\t+/) do
+            b, e = $~.offset(0)
+            ' ' * (tab_width * (e-b) - b % tab_width)
+          end
+          line
+        end.join "\n"
+      else
+        body
+      end
     end
   end
 end

data/lib/rdoc/rbs_helper.rb

@@ -122,7 +122,7 @@ module RDoc
           start_in_escaped = prefix.length
           end_in_escaped = start_in_escaped + escaped_name.length
 
-          href = ERB::Util.html_escape(::RDoc::Markup::Formatter.gen_relative_url(from_path, target_path))
+          href = ERB::Util.html_escape(Markup::Formatter.gen_relative_url(from_path, target_path))
           result[start_in_escaped...end_in_escaped] =
             "<a href=\"#{href}\" class=\"rbs-type\">#{escaped_name}</a>"
         end

data/lib/rdoc/rd/inline.rb

@@ -1,71 +1,75 @@
 # frozen_string_literal: true
-##
-# Inline keeps track of markup and labels to create proper links.
+module RDoc
+  class RD
+    ##
+    # Inline keeps track of markup and labels to create proper links.
 
-class RDoc::RD::Inline
+    class Inline
 
-  ##
-  # The text of the reference
+      ##
+      # The text of the reference
 
-  attr_reader :reference
+      attr_reader :reference
 
-  ##
-  # The markup of this reference in RDoc format
+      ##
+      # The markup of this reference in RDoc format
 
-  attr_reader :rdoc
+      attr_reader :rdoc
 
-  ##
-  # Creates a new Inline for +rdoc+ and +reference+.
-  #
-  # +rdoc+ may be another Inline or a String.  If +reference+ is not given it
-  # will use the text from +rdoc+.
+      ##
+      # Creates a new Inline for +rdoc+ and +reference+.
+      #
+      # +rdoc+ may be another Inline or a String.  If +reference+ is not given it
+      # will use the text from +rdoc+.
 
-  def self.new(rdoc, reference = rdoc)
-    if self === rdoc and reference.equal? rdoc then
-      rdoc
-    else
-      super
-    end
-  end
+      def self.new(rdoc, reference = rdoc)
+        if self === rdoc and reference.equal? rdoc
+          rdoc
+        else
+          super
+        end
+      end
 
-  ##
-  # Initializes the Inline with +rdoc+ and +inline+
+      ##
+      # Initializes the Inline with +rdoc+ and +inline+
 
-  def initialize(rdoc, reference) # :not-new:
-    @reference = reference.equal?(rdoc) ? reference.dup : reference
+      def initialize(rdoc, reference) # :not-new:
+        @reference = reference.equal?(rdoc) ? reference.dup : reference
 
-    # unpack
-    @reference = @reference.reference if self.class === @reference
-    @rdoc      = rdoc
-  end
+        # unpack
+        @reference = @reference.reference if self.class === @reference
+        @rdoc      = rdoc
+      end
 
-  def ==(other) # :nodoc:
-    self.class === other and
-      @reference == other.reference and @rdoc == other.rdoc
-  end
+      def ==(other) # :nodoc:
+        self.class === other and
+          @reference == other.reference and @rdoc == other.rdoc
+      end
 
-  ##
-  # Appends +more+ to this inline.  +more+ may be a String or another Inline.
-
-  def append(more)
-    case more
-    when String then
-      @reference += more
-      @rdoc      += more
-    when RDoc::RD::Inline then
-      @reference += more.reference
-      @rdoc      += more.rdoc
-    else
-      raise "unknown thingy #{more}"
-    end
+      ##
+      # Appends +more+ to this inline.  +more+ may be a String or another Inline.
 
-    self
-  end
+      def append(more)
+        case more
+        when String
+          @reference += more
+          @rdoc      += more
+        when RD::Inline
+          @reference += more.reference
+          @rdoc      += more.rdoc
+        else
+          raise "unknown thingy #{more}"
+        end
 
-  def inspect # :nodoc:
-    "(inline: #{self})"
-  end
+        self
+      end
+
+      def inspect # :nodoc:
+        "(inline: #{self})"
+      end
 
-  alias to_s rdoc # :nodoc:
+      alias to_s rdoc # :nodoc:
 
+    end
+  end
 end