rdoc 4.2.0 → 4.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8caf92d9ae213ea0a9a9eff7f7433ba487af357f
-  data.tar.gz: 06f1871ad30883d2ce68b5e9392a6988bcce57d5
+  metadata.gz: 9ada5f8d7d6785b7b03e29cb5bf37c4082bfec08
+  data.tar.gz: 95e96b167a1425de8c96d777758c127e618efb55
 SHA512:
-  metadata.gz: 4013603b560a950d86b326be9826294bf10f6bd5d08039f28fe8424b868d25e1a8d5d9abfba424e97e6a3ab37388c7f4f86948c43de1230d66a2189f140cb26d
-  data.tar.gz: 26e8921920c1de21a5fff069274c82f7fb2e8b333e9cfa48762d58313f2b2ed9e4168ba20ae794763566ec4a06a428e37ce762ec2400403c5f6863b1ff644ab4
+  metadata.gz: f5f1a961017517cc742b37f7c2316ac26e5919c4cd94f9309c65547eedd2d9edaaa03028a9c4701dd1af4a28eb63fa37d06553390fac4395a4910ea58dc6d4c1
+  data.tar.gz: 17f551f6edd7d4f0b7dde1e465081a90139bafa15bfc142aa98a41aabfb4013a3df031c58a2f3452326fb0166bb51a667e60f41f4600e63d5ddeabd102dbcadb

data/History.rdoc

@@ -1,3 +1,8 @@
+=== 4.2.1
+
+* Bug fixes
+  * Fixed infinite loop with CR #339
+
 === 4.2.0 / 2014-12-06
 
 * Major enhancements

data/Manifest.txt

@@ -100,6 +100,9 @@ lib/rdoc/generator/template/json_index/.document
 lib/rdoc/generator/template/json_index/js/navigation.js
 lib/rdoc/generator/template/json_index/js/searcher.js
 lib/rdoc/ghost_method.rb
+lib/rdoc/i18n.rb
+lib/rdoc/i18n/locale.rb
+lib/rdoc/i18n/text.rb
 lib/rdoc/include.rb
 lib/rdoc/known_classes.rb
 lib/rdoc/markdown.kpeg
@@ -238,6 +241,8 @@ test/test_rdoc_generator_ri.rb
 test/test_rdoc_generator_pot.rb
 test/test_rdoc_generator_pot_po.rb
 test/test_rdoc_generator_pot_po_entry.rb
+test/test_rdoc_i18n_locale.rb
+test/test_rdoc_i18n_text.rb
 test/test_rdoc_include.rb
 test/test_rdoc_markdown.rb
 test/test_rdoc_markdown_test.rb

data/README.rdoc

@@ -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.
+To generate documentation using +rake+ see RDoc::Task[http://docs.seattlerb.org/rdoc/RDocTask.html].
 
 To generate documentation programmatically:
 

data/lib/rdoc.rb

@@ -64,7 +64,7 @@ module RDoc
   ##
   # RDoc version you are using
 
-  VERSION = '4.2.0'
+  VERSION = '4.2.1'
 
   ##
   # Method visibilities
@@ -109,6 +109,8 @@ module RDoc
   def self.load_yaml
     begin
       gem 'psych'
+    rescue NameError => e # --disable-gems
+      raise unless e.name == :gem
     rescue Gem::LoadError
     end
 

data/lib/rdoc/generator/json_index.rb

@@ -1,5 +1,8 @@
 require 'json'
-require 'zlib'
+begin
+  require 'zlib'
+rescue LoadError
+end
 
 ##
 # The JsonIndex generator is designed to complement an HTML generator and
@@ -157,6 +160,8 @@ class RDoc::Generator::JsonIndex
   # Compress the search_index.js file using gzip
 
   def generate_gzipped
+    return unless defined?(Zlib)
+
     debug_msg "Compressing generated JSON index"
     out_dir = @base_dir + @options.op_dir
 
@@ -170,7 +175,7 @@ class RDoc::Generator::JsonIndex
 
     Zlib::GzipWriter.open(outfile) do |gz|
       gz.mtime = File.mtime(search_index_file)
-      gz.orig_name = search_index_file.to_s
+      gz.orig_name = search_index_file.basename.to_s
       gz.write search_index
       gz.close
     end
@@ -188,7 +193,7 @@ class RDoc::Generator::JsonIndex
 
         Zlib::GzipWriter.open(outfile) do |gz|
           gz.mtime = File.mtime(dest)
-          gz.orig_name = dest.to_s
+          gz.orig_name = dest.basename.to_s
           gz.write data
           gz.close
         end

data/lib/rdoc/generator/template/json_index/js/searcher.js

@@ -52,13 +52,13 @@ Searcher.prototype = new function() {
   /*  ----- Utilities ------  */
   function splitQuery(query) {
     return jQuery.grep(query.split(/(\s+|::?|\(\)?)/), function(string) {
-      return string.match(/\S/)
+      return string.match(/\S/);
     });
   }
 
   function buildRegexps(queries) {
     return jQuery.map(queries, function(query) {
-      return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i')
+      return new RegExp(query.replace(/(.)/g, '([$1])([^$1]*?)'), 'i');
     });
   }
 

data/lib/rdoc/i18n.rb

@@ -0,0 +1,9 @@
+##
+# This module provides i18n realated features.
+
+module RDoc::I18n
+
+  autoload :Locale, 'rdoc/i18n/locale'
+  autoload :Text,   'rdoc/i18n/text'
+
+end

data/lib/rdoc/i18n/locale.rb

@@ -0,0 +1,101 @@
+##
+# A message container for a locale.
+#
+# This object provides the following two features:
+#
+#   * Loads translated messages from .po file.
+#   * Translates a message into the locale.
+
+class RDoc::I18n::Locale
+
+  @@locales = {} # :nodoc:
+
+  class << self
+
+    ##
+    # Returns the locale object for +locale_name+.
+
+    def [](locale_name)
+      @@locales[locale_name] ||= new(locale_name)
+    end
+
+    ##
+    # Sets the locale object for +locale_name+.
+    #
+    # Normally, this method is not used. This method is useful for
+    # testing.
+
+    def []=(locale_name, locale)
+      @@locales[locale_name] = locale
+    end
+
+  end
+
+  ##
+  # The name of the locale. It uses IETF language tag format
+  # +[language[_territory][.codeset][@modifier]]+.
+  #
+  # See also {BCP 47 - Tags for Identifying
+  # Languages}[http://tools.ietf.org/rfc/bcp/bcp47.txt].
+
+  attr_reader :name
+
+  ##
+  # Creates a new locale object for +name+ locale. +name+ must
+  # follow IETF language tag format.
+
+  def initialize(name)
+    @name = name
+    @messages = {}
+  end
+
+  ##
+  # Loads translation messages from +locale_directory+/+@name+/rdoc.po
+  # or +locale_directory+/+@name+.po. The former has high priority.
+  #
+  # This method requires gettext gem for parsing .po file. If you
+  # don't have gettext gem, this method doesn't load .po file. This
+  # method warns and returns +false+.
+  #
+  # Returns +true+ if succeeded, +false+ otherwise.
+
+  def load(locale_directory)
+    return false if @name.nil?
+
+    po_file_candidates = [
+      File.join(locale_directory, @name, 'rdoc.po'),
+      File.join(locale_directory, "#{@name}.po"),
+    ]
+    po_file = po_file_candidates.find do |po_file_candidate|
+      File.exist?(po_file_candidate)
+    end
+    return false unless po_file
+
+    begin
+      require 'gettext/po_parser'
+      require 'gettext/mo'
+    rescue LoadError
+      warn('Need gettext gem for i18n feature:')
+      warn('  gem install gettext')
+      return false
+    end
+
+    po_parser = GetText::POParser.new
+    messages = GetText::MO.new
+    po_parser.report_warning = false
+    po_parser.parse_file(po_file, messages)
+
+    @messages.merge!(messages)
+
+    true
+  end
+
+  ##
+  # Translates the +message+ into locale. If there is no tranlsation
+  # messages for +message+ in locale, +message+ itself is returned.
+
+  def translate(message)
+    @messages[message] || message
+  end
+
+end

data/lib/rdoc/i18n/text.rb

@@ -0,0 +1,125 @@
+##
+# An i18n supported text.
+#
+# This object provides the following two features:
+#
+#   * Extracts translation messages from wrapped raw text.
+#   * Translates wrapped raw text in specified locale.
+#
+# Wrapped raw text is one of String, RDoc::Comment or Array of them.
+
+class RDoc::I18n::Text
+
+  ##
+  # Creates a new i18n supported text for +raw+ text.
+
+  def initialize(raw)
+    @raw = raw
+  end
+
+  ##
+  # Extracts translation target messages and yields each message.
+  #
+  # Each yielded message is a Hash. It consists of the followings:
+  #
+  # :type      :: :paragraph
+  # :paragraph :: String (The translation target message itself.)
+  # :line_no   :: Integer (The line number of the :paragraph is started.)
+  #
+  # The above content may be added in the future.
+
+  def extract_messages
+    parse do |part|
+      case part[:type]
+      when :empty_line
+        # ignore
+      when :paragraph
+        yield(part)
+      end
+    end
+  end
+
+  # Translates raw text into +locale+.
+  def translate(locale)
+    translated_text = ''
+    parse do |part|
+      case part[:type]
+      when :paragraph
+        translated_text << locale.translate(part[:paragraph])
+      when :empty_line
+        translated_text << part[:line]
+      else
+        raise "should not reach here: unexpected type: #{type}"
+      end
+    end
+    translated_text
+  end
+
+  private
+  def parse(&block)
+    paragraph = ''
+    paragraph_start_line = 0
+    line_no = 0
+
+    each_line(@raw) do |line|
+      line_no += 1
+      case line
+      when /\A\s*\z/
+        if paragraph.empty?
+          emit_empty_line_event(line, line_no, &block)
+        else
+          paragraph << line
+          emit_paragraph_event(paragraph, paragraph_start_line, line_no,
+                               &block)
+          paragraph = ''
+        end
+      else
+        paragraph_start_line = line_no if paragraph.empty?
+        paragraph << line
+      end
+    end
+
+    unless paragraph.empty?
+      emit_paragraph_event(paragraph, paragraph_start_line, line_no, &block)
+    end
+  end
+
+  def each_line(raw, &block)
+    case raw
+    when RDoc::Comment
+      raw.text.each_line(&block)
+    when Array
+      raw.each do |comment, location|
+        each_line(comment, &block)
+      end
+    else
+      raw.each_line(&block)
+    end
+  end
+
+  def emit_empty_line_event(line, line_no)
+    part = {
+      :type => :empty_line,
+      :line => line,
+      :line_no => line_no,
+    }
+    yield(part)
+  end
+
+  def emit_paragraph_event(paragraph, paragraph_start_line, line_no, &block)
+    paragraph_part = {
+      :type => :paragraph,
+      :line_no => paragraph_start_line,
+    }
+    match_data = /(\s*)\z/.match(paragraph)
+    if match_data
+      paragraph_part[:paragraph] = match_data.pre_match
+      yield(paragraph_part)
+      emit_empty_line_event(match_data[1], line_no, &block)
+    else
+      paragraph_part[:paragraph] = paragraph
+      yield(paragraph_part)
+    end
+  end
+
+end

data/lib/rdoc/known_classes.rb

@@ -59,7 +59,6 @@ module RDoc
     "rb_eZeroDivError"     => "ZeroDivError",
 
     "rb_mComparable"       => "Comparable",
-    "rb_mDL"               => "DL",
     "rb_mEnumerable"       => "Enumerable",
     "rb_mErrno"            => "Errno",
     "rb_mFConst"           => "File::Constants",

data/lib/rdoc/rd/block_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -418,53 +418,53 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    34,    35,    30,    33,    14,    73,    38,    33,    76,    15,
-    88,    34,    35,    30,    33,    40,    34,    35,    30,    33,
-    40,    65,    34,    35,    30,    33,    14,    73,    77,    14,
-    54,    15,    34,    35,    30,    33,    14,     9,    10,    11,
-    12,    15,    34,    35,    30,    33,    14,    73,    81,    54,
-    38,    15,    34,    35,    30,    33,    14,    73,    40,    67,
-    83,    15,    34,    35,    30,    33,    14,    73,    54,    30,
-    35,    15,    34,    35,    30,    33,    34,    47,    36,    14,
-    59,    15,    34,    35,    30,    33,    14,    73,    38,   nil,
-   nil,    15,    34,    35,    30,    33,   nil,    47,   nil,   nil,
+    34,    35,    30,    33,    40,    34,    35,    30,    33,    40,
+    65,    34,    35,    30,    33,    14,    73,    36,    38,    34,
+    15,    88,    34,    35,    30,    33,    14,     9,    10,    11,
+    12,    15,    34,    35,    30,    33,    14,     9,    10,    11,
+    12,    15,    34,    35,    30,    33,    35,    47,    30,    54,
+    33,    15,    34,    35,    30,    33,    54,    47,    14,    14,
+    59,    15,    34,    35,    30,    33,    14,    73,    67,    76,
+    77,    15,    34,    35,    30,    33,    14,    73,    54,    81,
+    38,    15,    34,    35,    30,    33,    14,    73,    38,    40,
+    83,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
+   nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
+   nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
    nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
    nil,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
-   nil,    15,    34,    35,    30,    33,    14,     9,    10,    11,
-    12,    15,    34,    35,    30,    33,    14,    73,   nil,   nil,
    nil,    15,    34,    35,    30,    33,    14,    73,    61,    63,
-   nil,    15,   nil,    62,    60,    61,    63,    61,    63,    14,
-    62,    87,    62,   nil,    79,    34,    35,    30,    33 ]
+   nil,    15,    14,    62,    60,    61,    63,    79,    61,    63,
+    62,    87,   nil,    62,    34,    35,    30,    33 ]
 
 racc_action_check = [
-    86,    86,    86,    86,    86,    86,    57,    31,    49,    86,
-    86,    41,    41,    41,    41,    41,    15,    15,    15,    15,
-    15,    41,    45,    45,    45,    45,    45,    45,    51,    34,
-    54,    45,     0,     0,     0,     0,     0,     0,     0,     0,
-     0,     0,    85,    85,    85,    85,    85,    85,    56,    33,
-    58,    85,    79,    79,    79,    79,    79,    79,    62,    44,
-    66,    79,    78,    78,    78,    78,    78,    78,    30,    28,
-    25,    78,    24,    24,    24,    24,    22,    24,     1,    35,
-    36,    24,    75,    75,    75,    75,    75,    75,    13,   nil,
-   nil,    75,    27,    27,    27,    27,   nil,    27,   nil,   nil,
-   nil,    27,    74,    74,    74,    74,    74,    74,   nil,   nil,
-   nil,    74,    68,    68,    68,    68,    68,    68,   nil,   nil,
-   nil,    68,     2,     2,     2,     2,     2,     2,     2,     2,
-     2,     2,    46,    46,    46,    46,    46,    46,   nil,   nil,
-   nil,    46,    47,    47,    47,    47,    47,    47,    39,    39,
-   nil,    47,   nil,    39,    39,    82,    82,    64,    64,    52,
-    82,    82,    64,   nil,    52,    20,    20,    20,    20 ]
+    41,    41,    41,    41,    41,    15,    15,    15,    15,    15,
+    41,    86,    86,    86,    86,    86,    86,     1,    13,    22,
+    86,    86,     0,     0,     0,     0,     0,     0,     0,     0,
+     0,     0,     2,     2,     2,     2,     2,     2,     2,     2,
+     2,     2,    24,    24,    24,    24,    25,    24,    28,    30,
+    31,    24,    27,    27,    27,    27,    33,    27,    34,    35,
+    36,    27,    45,    45,    45,    45,    45,    45,    44,    49,
+    51,    45,    46,    46,    46,    46,    46,    46,    54,    56,
+    57,    46,    47,    47,    47,    47,    47,    47,    58,    62,
+    66,    47,    68,    68,    68,    68,    68,    68,   nil,   nil,
+   nil,    68,    74,    74,    74,    74,    74,    74,   nil,   nil,
+   nil,    74,    75,    75,    75,    75,    75,    75,   nil,   nil,
+   nil,    75,    78,    78,    78,    78,    78,    78,   nil,   nil,
+   nil,    78,    79,    79,    79,    79,    79,    79,   nil,   nil,
+   nil,    79,    85,    85,    85,    85,    85,    85,    39,    39,
+   nil,    85,    52,    39,    39,    82,    82,    52,    64,    64,
+    82,    82,   nil,    64,    20,    20,    20,    20 ]
 
 racc_action_pointer = [
-    29,    78,   119,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,    81,   nil,    13,   nil,   nil,   nil,   nil,
-   162,   nil,    73,   nil,    69,    66,   nil,    89,    64,   nil,
-    60,     1,   nil,    41,    22,    72,    80,   nil,   nil,   141,
-   nil,     8,   nil,   nil,    46,    19,   129,   139,   nil,    -5,
-   nil,    15,   152,   nil,    22,   nil,    35,    -1,    43,   nil,
-   nil,   nil,    51,   nil,   150,   nil,    47,   nil,   109,   nil,
-   nil,   nil,   nil,   nil,    99,    79,   nil,   nil,    59,    49,
-   nil,   nil,   148,   nil,   nil,    39,    -3,   nil,   nil ]
+    19,    17,    29,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,    11,   nil,     2,   nil,   nil,   nil,   nil,
+   161,   nil,    16,   nil,    39,    42,   nil,    49,    43,   nil,
+    41,    44,   nil,    48,    51,    52,    60,   nil,   nil,   141,
+   nil,    -3,   nil,   nil,    55,    59,    69,    79,   nil,    56,
+   nil,    57,   145,   nil,    70,   nil,    66,    73,    81,   nil,
+   nil,   nil,    82,   nil,   151,   nil,    77,   nil,    89,   nil,
+   nil,   nil,   nil,   nil,    99,   109,   nil,   nil,   119,   129,
+   nil,   nil,   148,   nil,   nil,   139,     8,   nil,   nil ]
 
 racc_action_default = [
     -2,   -73,    -1,    -4,    -5,    -6,    -7,    -8,    -9,   -10,
@@ -479,24 +479,24 @@ racc_action_default = [
 
 racc_goto_table = [
      4,    39,     4,    68,    74,    75,     5,     6,     5,     6,
-    51,    42,    44,    56,     3,    49,    37,    57,    58,    41,
-    43,    48,    84,    50,    66,    55,     1,    64,    84,    84,
-    45,    46,    42,    45,    46,     2,    85,    86,    80,    84,
+    44,    42,    51,    49,     3,    56,    37,    57,    58,     1,
+     2,    66,    84,    41,    43,    48,    50,    64,    84,    84,
+    45,    46,    42,    45,    46,    55,    85,    86,    80,    84,
     84,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    82,   nil,
    nil,   nil,    78 ]
 
 racc_goto_check = [
      4,    10,     4,    31,    31,    31,     5,     6,     5,     6,
-    27,    12,    21,    27,     3,    21,     3,     9,     9,    17,
-    19,    23,    32,    26,    11,    29,     1,    10,    32,    32,
-     5,     6,    12,     5,     6,     2,    31,    31,    33,    32,
+    21,    12,    27,    21,     3,    27,     3,     9,     9,     1,
+     2,    11,    32,    17,    19,    23,    26,    10,    32,    32,
+     5,     6,    12,     5,     6,    29,    31,    31,    33,    32,
     32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    10,   nil,
    nil,   nil,     4 ]
 
 racc_goto_pointer = [
-   nil,    26,    35,    14,     0,     6,     7,   nil,   nil,   -17,
-   -14,   -17,    -9,   nil,   nil,   nil,   nil,     4,   nil,    -2,
-   nil,   -12,   nil,    -4,   nil,   nil,    -5,   -20,   nil,    -6,
+   nil,    19,    20,    14,     0,     6,     7,   nil,   nil,   -17,
+   -14,   -20,    -9,   nil,   nil,   nil,   nil,     8,   nil,     2,
+   nil,   -14,   nil,     0,   nil,   nil,    -2,   -18,   nil,     4,
    nil,   -42,   -46,   -16 ]
 
 racc_goto_default = [

data/lib/rdoc/rd/inline_parser.rb

@@ -1,6 +1,6 @@
 #
 # DO NOT MODIFY!!!!
-# This file is automatically generated by Racc 1.4.12
+# This file is automatically generated by Racc 1.4.14
 # from Racc grammer file "".
 #
 
@@ -243,152 +243,152 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    63,    64,    65,   153,    81,    62,    76,    78,    79,    87,
-    66,    67,    68,    69,    70,    71,    72,    73,    74,    75,
-    77,    80,   152,    63,    64,    65,    61,    81,    62,    76,
-    78,    79,   124,    66,    67,    68,    69,    70,    71,    72,
-    73,    74,    75,    77,    80,   149,   104,   103,   102,   100,
-   101,    99,   115,   116,   117,   164,   105,   106,   107,   108,
-   109,   110,   111,   112,   113,   114,    96,   118,   119,   104,
-   103,   102,   100,   101,    99,   115,   116,   117,    89,   105,
+   104,   103,   102,   100,   101,    99,   115,   116,   117,    29,
+   105,   106,   107,   108,   109,   110,   111,   112,   113,   114,
+    84,   118,   119,    63,    64,    65,    61,    81,    62,    76,
+    78,    79,    85,    66,    67,    68,    69,    70,    71,    72,
+    73,    74,    75,    77,    80,   149,    63,    64,    65,   153,
+    81,    62,    76,    78,    79,    86,    66,    67,    68,    69,
+    70,    71,    72,    73,    74,    75,    77,    80,   152,   104,
+   103,   102,   100,   101,    99,   115,   116,   117,    87,   105,
    106,   107,   108,   109,   110,   111,   112,   113,   114,    88,
    118,   119,   104,   103,   102,   100,   101,    99,   115,   116,
-   117,   161,   105,   106,   107,   108,   109,   110,   111,   112,
-   113,   114,    86,   118,   119,   104,   103,   102,   100,   101,
-    99,   115,   116,   117,    85,   105,   106,   107,   108,   109,
-   110,   111,   112,   113,   114,   137,   118,   119,    63,    64,
-    65,    61,    81,    62,    76,    78,    79,    84,    66,    67,
-    68,    69,    70,    71,    72,    73,    74,    75,    77,    80,
-    22,    23,    24,    25,    26,    21,    18,    19,   176,   177,
-    13,   173,    14,   154,    15,   175,    16,   137,    17,    42,
-   148,    20,    54,    38,    53,    55,    56,    57,    29,    13,
-   177,    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,
+   117,    89,   105,   106,   107,   108,   109,   110,   111,   112,
+   113,   114,    96,   118,   119,   104,   103,   102,   100,   101,
+    99,   115,   116,   117,   124,   105,   106,   107,   108,   109,
+   110,   111,   112,   113,   114,   137,   118,   119,    22,    23,
+    24,    25,    26,    21,    18,    19,   176,   177,    13,   148,
+    14,   154,    15,   137,    16,   161,    17,   164,   173,    20,
+    22,    23,    24,    25,    26,    21,    18,    19,   175,   177,
+    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,
+   nil,    20,    22,    23,    24,    25,    26,    21,    18,    19,
+   nil,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
+    17,   nil,   nil,    20,    22,    23,    24,    25,    26,    21,
+    18,    19,   nil,   nil,    13,   nil,    14,   nil,    15,   nil,
+    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,
+    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,
+    15,   nil,    16,   nil,    17,   nil,   nil,    20,    22,    23,
+    24,    25,    26,    21,    18,    19,   nil,   nil,    13,   nil,
+    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,    20,
+    22,    23,    24,    25,    26,    21,    18,    19,   nil,   nil,
+    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,    42,
+   nil,    20,    54,    38,    53,    55,    56,    57,   nil,    13,
+   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,
     20,    22,    23,    24,    25,    26,    21,    18,    19,   nil,
    nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,
-   nil,   nil,    20,    22,    23,    24,    25,    26,    21,    18,
-    19,   nil,   nil,    13,   nil,    14,   nil,    15,   nil,    16,
-   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,    26,
-    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,    15,
+   nil,   nil,    20,    63,    64,    65,    61,    81,    62,    76,
+    78,    79,   nil,    66,    67,    68,    69,    70,    71,    72,
+    73,    74,    75,    77,    80,   122,   nil,   nil,    54,   nil,
+    53,    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,
    nil,    16,   nil,    17,   145,   nil,    20,    54,   133,    53,
     55,    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,
-    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,
-    15,   nil,    16,   nil,    17,   145,   nil,    20,    54,   133,
-    53,    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,
-   nil,    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,
-    25,    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,
-   nil,    15,   nil,    16,   nil,    17,   145,   nil,    20,    54,
-   133,    53,    55,    56,    57,   nil,    13,   nil,    14,   nil,
-    15,   nil,    16,   nil,    17,   145,   nil,    20,    54,   133,
-    53,    55,    56,    57,   nil,    13,   nil,    14,   nil,    15,
-   nil,    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,
-    25,    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,
-   nil,    15,   nil,    16,   122,    17,   nil,    54,    20,    53,
+    16,   nil,    17,   145,   nil,    20,    54,   133,    53,    55,
+    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,
+   nil,    17,   145,   nil,    20,    54,   133,    53,    55,    56,
+    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
+    17,   145,   nil,    20,    54,   133,    53,    55,    56,    57,
+   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,    17,
+   nil,   nil,    20,   135,   136,    54,   133,    53,    55,    56,
+    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,   nil,
+    17,   nil,   nil,    20,   135,   136,    54,   133,    53,    55,
+    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,    16,
+   nil,    17,   nil,   nil,    20,   135,   136,    54,   133,    53,
     55,    56,    57,   nil,    13,   nil,    14,   nil,    15,   nil,
-    16,   nil,    17,   nil,   nil,    20,    22,    23,    24,    25,
-    26,    21,    18,    19,   nil,   nil,    13,   nil,    14,   nil,
-    15,   nil,    16,   nil,    17,   nil,   nil,    20,   135,   136,
-    54,   133,    53,    55,    56,    57,   nil,    13,   nil,    14,
-   nil,    15,   nil,    16,   nil,    17,   nil,   nil,    20,   135,
-   136,    54,   133,    53,    55,    56,    57,   nil,    13,   nil,
-    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,    20,
-   135,   136,    54,   133,    53,    55,    56,    57,   nil,    13,
-   nil,    14,   nil,    15,   nil,    16,   nil,    17,   nil,   nil,
-    20,   172,   135,   136,    54,   133,    53,    55,    56,    57,
-   165,   135,   136,    54,   133,    53,    55,    56,    57,    95,
-   nil,   nil,    54,    91,    53,    55,    56,    57,   174,   135,
-   136,    54,   133,    53,    55,    56,    57,   158,   nil,   nil,
-    54,   nil,    53,    55,    56,    57,   178,   135,   136,    54,
-   133,    53,    55,    56,    57,   145,   nil,   nil,    54,   133,
-    53,    55,    56,    57,   145,   nil,   nil,    54,   133,    53,
+    16,   nil,    17,    95,   nil,    20,    54,    91,    53,    55,
+    56,    57,   145,   nil,   nil,    54,   133,    53,    55,    56,
+    57,   158,   nil,   nil,    54,   nil,    53,    55,    56,    57,
+   165,   135,   136,    54,   133,    53,    55,    56,    57,   145,
+   nil,   nil,    54,   133,    53,    55,    56,    57,   172,   135,
+   136,    54,   133,    53,    55,    56,    57,   174,   135,   136,
+    54,   133,    53,    55,    56,    57,   178,   135,   136,    54,
+   133,    53,    55,    56,    57,   135,   136,    54,   133,    53,
     55,    56,    57,   135,   136,    54,   133,    53,    55,    56,
-    57,   135,   136,    54,   133,    53,    55,    56,    57,   135,
-   136,    54,   133,    53,    55,    56,    57,    22,    23,    24,
-    25,    26,    21 ]
+    57,   135,   136,    54,   133,    53,    55,    56,    57,    22,
+    23,    24,    25,    26,    21 ]
 
 racc_action_check = [
-    61,    61,    61,    61,    61,    61,    61,    61,    61,    33,
-    61,    61,    61,    61,    61,    61,    61,    61,    61,    61,
-    61,    61,    61,    59,    59,    59,    59,    59,    59,    59,
-    59,    59,    41,    59,    59,    59,    59,    59,    59,    59,
-    59,    59,    59,    59,    59,    59,    97,    97,    97,    97,
-    97,    97,    97,    97,    97,   125,    97,    97,    97,    97,
-    97,    97,    97,    97,    97,    97,    37,    97,    97,    38,
-    38,    38,    38,    38,    38,    38,    38,    38,    35,    38,
-    38,    38,    38,    38,    38,    38,    38,    38,    38,    34,
-    38,    38,   155,   155,   155,   155,   155,   155,   155,   155,
-   155,   100,   155,   155,   155,   155,   155,   155,   155,   155,
-   155,   155,    32,   155,   155,    91,    91,    91,    91,    91,
-    91,    91,    91,    91,    31,    91,    91,    91,    91,    91,
-    91,    91,    91,    91,    91,    43,    91,    91,    20,    20,
-    20,    20,    20,    20,    20,    20,    20,    29,    20,    20,
-    20,    20,    20,    20,    20,    20,    20,    20,    20,    20,
-    17,    17,    17,    17,    17,    17,    17,    17,   165,   165,
-    17,   162,    17,    90,    17,   164,    17,    94,    17,    18,
-    58,    17,    18,    18,    18,    18,    18,    18,     1,    18,
-   172,    18,   nil,    18,   nil,    18,   nil,    18,   nil,   nil,
+    38,    38,    38,    38,    38,    38,    38,    38,    38,     1,
+    38,    38,    38,    38,    38,    38,    38,    38,    38,    38,
+    29,    38,    38,    59,    59,    59,    59,    59,    59,    59,
+    59,    59,    31,    59,    59,    59,    59,    59,    59,    59,
+    59,    59,    59,    59,    59,    59,    61,    61,    61,    61,
+    61,    61,    61,    61,    61,    32,    61,    61,    61,    61,
+    61,    61,    61,    61,    61,    61,    61,    61,    61,    91,
+    91,    91,    91,    91,    91,    91,    91,    91,    33,    91,
+    91,    91,    91,    91,    91,    91,    91,    91,    91,    34,
+    91,    91,    97,    97,    97,    97,    97,    97,    97,    97,
+    97,    35,    97,    97,    97,    97,    97,    97,    97,    97,
+    97,    97,    37,    97,    97,   155,   155,   155,   155,   155,
+   155,   155,   155,   155,    41,   155,   155,   155,   155,   155,
+   155,   155,   155,   155,   155,    43,   155,   155,     0,     0,
+     0,     0,     0,     0,     0,     0,   165,   165,     0,    58,
+     0,    90,     0,    94,     0,   100,     0,   125,   162,     0,
+     2,     2,     2,     2,     2,     2,     2,     2,   164,   172,
+     2,   nil,     2,   nil,     2,   nil,     2,   nil,     2,   nil,
+   nil,     2,    13,    13,    13,    13,    13,    13,    13,    13,
+   nil,   nil,    13,   nil,    13,   nil,    13,   nil,    13,   nil,
+    13,   nil,   nil,    13,    14,    14,    14,    14,    14,    14,
+    14,    14,   nil,   nil,    14,   nil,    14,   nil,    14,   nil,
+    14,   nil,    14,   nil,   nil,    14,    15,    15,    15,    15,
+    15,    15,    15,    15,   nil,   nil,    15,   nil,    15,   nil,
+    15,   nil,    15,   nil,    15,   nil,   nil,    15,    16,    16,
+    16,    16,    16,    16,    16,    16,   nil,   nil,    16,   nil,
+    16,   nil,    16,   nil,    16,   nil,    16,   nil,   nil,    16,
+    17,    17,    17,    17,    17,    17,    17,    17,   nil,   nil,
+    17,   nil,    17,   nil,    17,   nil,    17,   nil,    17,    18,
+   nil,    17,    18,    18,    18,    18,    18,    18,   nil,    18,
+   nil,    18,   nil,    18,   nil,    18,   nil,    18,   nil,   nil,
     18,    19,    19,    19,    19,    19,    19,    19,    19,   nil,
    nil,    19,   nil,    19,   nil,    19,   nil,    19,   nil,    19,
-   nil,   nil,    19,    16,    16,    16,    16,    16,    16,    16,
-    16,   nil,   nil,    16,   nil,    16,   nil,    16,   nil,    16,
-   nil,    16,   nil,   nil,    16,    15,    15,    15,    15,    15,
-    15,    15,    15,   nil,   nil,    15,   nil,    15,   nil,    15,
-   nil,    15,   nil,    15,    45,   nil,    15,    45,    45,    45,
-    45,    45,    45,   nil,    45,   nil,    45,   nil,    45,   nil,
-    45,   nil,    45,   nil,   nil,    45,    14,    14,    14,    14,
-    14,    14,    14,    14,   nil,   nil,    14,   nil,    14,   nil,
-    14,   nil,    14,   nil,    14,   146,   nil,    14,   146,   146,
-   146,   146,   146,   146,   nil,   146,   nil,   146,   nil,   146,
-   nil,   146,   nil,   146,   nil,   nil,   146,    13,    13,    13,
-    13,    13,    13,    13,    13,   nil,   nil,    13,   nil,    13,
-   nil,    13,   nil,    13,   nil,    13,   138,   nil,    13,   138,
-   138,   138,   138,   138,   138,   nil,   138,   nil,   138,   nil,
-   138,   nil,   138,   nil,   138,    44,   nil,   138,    44,    44,
-    44,    44,    44,    44,   nil,    44,   nil,    44,   nil,    44,
-   nil,    44,   nil,    44,   nil,   nil,    44,     2,     2,     2,
-     2,     2,     2,     2,     2,   nil,   nil,     2,   nil,     2,
-   nil,     2,   nil,     2,    39,     2,   nil,    39,     2,    39,
-    39,    39,    39,   nil,    39,   nil,    39,   nil,    39,   nil,
-    39,   nil,    39,   nil,   nil,    39,     0,     0,     0,     0,
-     0,     0,     0,     0,   nil,   nil,     0,   nil,     0,   nil,
-     0,   nil,     0,   nil,     0,   nil,   nil,     0,   122,   122,
-   122,   122,   122,   122,   122,   122,   nil,   122,   nil,   122,
-   nil,   122,   nil,   122,   nil,   122,   nil,   nil,   122,   127,
-   127,   127,   127,   127,   127,   127,   127,   nil,   127,   nil,
-   127,   nil,   127,   nil,   127,   nil,   127,   nil,   nil,   127,
-    42,    42,    42,    42,    42,    42,    42,    42,   nil,    42,
-   nil,    42,   nil,    42,   nil,    42,   nil,    42,   nil,   nil,
-    42,   159,   159,   159,   159,   159,   159,   159,   159,   159,
-   126,   126,   126,   126,   126,   126,   126,   126,   126,    36,
-   nil,   nil,    36,    36,    36,    36,    36,    36,   163,   163,
-   163,   163,   163,   163,   163,   163,   163,    92,   nil,   nil,
-    92,   nil,    92,    92,    92,    92,   171,   171,   171,   171,
-   171,   171,   171,   171,   171,   142,   nil,   nil,   142,   142,
-   142,   142,   142,   142,    52,   nil,   nil,    52,    52,    52,
-    52,    52,    52,    95,    95,    95,    95,    95,    95,    95,
-    95,   168,   168,   168,   168,   168,   168,   168,   168,   158,
-   158,   158,   158,   158,   158,   158,   158,    27,    27,    27,
-    27,    27,    27 ]
+   nil,   nil,    19,    20,    20,    20,    20,    20,    20,    20,
+    20,    20,   nil,    20,    20,    20,    20,    20,    20,    20,
+    20,    20,    20,    20,    20,    39,   nil,   nil,    39,   nil,
+    39,    39,    39,    39,   nil,    39,   nil,    39,   nil,    39,
+   nil,    39,   nil,    39,    44,   nil,    39,    44,    44,    44,
+    44,    44,    44,   nil,    44,   nil,    44,   nil,    44,   nil,
+    44,   nil,    44,    45,   nil,    44,    45,    45,    45,    45,
+    45,    45,   nil,    45,   nil,    45,   nil,    45,   nil,    45,
+   nil,    45,   138,   nil,    45,   138,   138,   138,   138,   138,
+   138,   nil,   138,   nil,   138,   nil,   138,   nil,   138,   nil,
+   138,   146,   nil,   138,   146,   146,   146,   146,   146,   146,
+   nil,   146,   nil,   146,   nil,   146,   nil,   146,   nil,   146,
+   nil,   nil,   146,    42,    42,    42,    42,    42,    42,    42,
+    42,   nil,    42,   nil,    42,   nil,    42,   nil,    42,   nil,
+    42,   nil,   nil,    42,   122,   122,   122,   122,   122,   122,
+   122,   122,   nil,   122,   nil,   122,   nil,   122,   nil,   122,
+   nil,   122,   nil,   nil,   122,   127,   127,   127,   127,   127,
+   127,   127,   127,   nil,   127,   nil,   127,   nil,   127,   nil,
+   127,   nil,   127,    36,   nil,   127,    36,    36,    36,    36,
+    36,    36,    52,   nil,   nil,    52,    52,    52,    52,    52,
+    52,    92,   nil,   nil,    92,   nil,    92,    92,    92,    92,
+   126,   126,   126,   126,   126,   126,   126,   126,   126,   142,
+   nil,   nil,   142,   142,   142,   142,   142,   142,   159,   159,
+   159,   159,   159,   159,   159,   159,   159,   163,   163,   163,
+   163,   163,   163,   163,   163,   163,   171,   171,   171,   171,
+   171,   171,   171,   171,   171,    95,    95,    95,    95,    95,
+    95,    95,    95,   158,   158,   158,   158,   158,   158,   158,
+   158,   168,   168,   168,   168,   168,   168,   168,   168,    27,
+    27,    27,    27,    27,    27 ]
 
 racc_action_pointer = [
-   423,   188,   384,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   324,   283,   242,   220,   157,   176,   198,
-   135,   nil,   nil,   nil,   nil,   nil,   nil,   604,   nil,   147,
-   nil,   110,    96,    -9,    69,    56,   526,    43,    66,   401,
-   nil,    28,   486,   130,   362,   261,   nil,   nil,   nil,   nil,
-   nil,   nil,   571,   nil,   nil,   nil,   nil,   nil,   169,    20,
-   nil,    -3,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   135,     9,   157,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   179,   201,   223,   245,   267,   286,   308,
+   330,   nil,   nil,   nil,   nil,   nil,   nil,   606,   nil,    20,
+   nil,    18,    39,    60,    69,    79,   510,    89,    -3,   352,
+   nil,   120,   449,   130,   371,   390,   nil,   nil,   nil,   nil,
+   nil,   nil,   519,   nil,   nil,   nil,   nil,   nil,   138,    20,
+   nil,    43,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   150,   112,   544,   nil,   172,   579,   nil,    43,   nil,   nil,
-    95,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   128,    66,   528,   nil,   148,   581,   nil,    89,   nil,   nil,
+   149,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   444,   nil,   nil,    52,   517,   465,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   343,   nil,
-   nil,   nil,   562,   nil,   nil,   nil,   302,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,    89,   nil,   nil,   595,   508,
-   nil,   nil,   168,   535,   171,   164,   nil,   nil,   587,   nil,
-   nil,   553,   185,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   470,   nil,   nil,   154,   537,   491,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   409,   nil,
+   nil,   nil,   546,   nil,   nil,   nil,   428,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil,   nil,   112,   nil,   nil,   589,   555,
+   nil,   nil,   155,   564,   164,   142,   nil,   nil,   597,   nil,
+   nil,   573,   164,   nil,   nil,   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
   -138,  -138,    -1,    -3,    -4,    -5,    -6,    -7,    -8,    -9,
@@ -412,45 +412,45 @@ racc_action_default = [
 
 racc_goto_table = [
    126,    44,   125,    43,   144,   144,   160,    93,    97,    52,
-   166,    82,   144,    41,    40,    39,   138,   146,   169,   147,
-   167,    94,    44,     1,   123,   129,   169,    52,    36,    37,
-    52,    90,    59,    92,   121,   120,    31,    32,    33,    34,
-    35,   170,    58,   166,    83,    30,   170,   166,   151,   nil,
-   150,   nil,   166,   159,     8,   166,     8,   nil,   nil,   nil,
-   nil,   155,   nil,   156,   160,   nil,   nil,     8,     8,     8,
-     8,     8,   nil,     8,     4,   nil,     4,   157,   nil,   nil,
-   163,   nil,   162,    52,   nil,   168,   nil,     4,     4,     4,
-     4,     4,   nil,     4,   nil,   nil,   nil,   nil,   144,   nil,
-   nil,   nil,   144,   nil,   nil,   129,   144,   144,   nil,     5,
-   129,     5,   nil,   nil,   nil,   nil,   171,     6,   nil,     6,
-   nil,   nil,     5,     5,     5,     5,     5,    11,     5,    11,
-     6,     6,     6,     6,     6,     7,     6,     7,   nil,   nil,
-    11,    11,    11,    11,    11,   nil,    11,   nil,     7,     7,
-     7,     7,     7,   nil,     7 ]
+   166,    82,   144,    40,    41,    39,   138,   146,   169,    30,
+    36,    94,    44,     1,   123,   129,   169,    52,    90,    37,
+    52,   167,   147,    92,   120,   121,    31,    32,    33,    34,
+    35,   170,    58,   166,    59,    83,   170,   166,   151,   nil,
+   150,   nil,   166,   159,     4,   166,     4,   nil,   nil,   nil,
+   nil,   155,   nil,   156,   160,   nil,   nil,     4,     4,     4,
+     4,     4,   nil,     4,     5,   nil,     5,   157,   nil,   nil,
+   163,   nil,   162,    52,   nil,   168,   nil,     5,     5,     5,
+     5,     5,   nil,     5,   nil,   nil,   nil,   nil,   144,   nil,
+   nil,   nil,   144,   nil,   nil,   129,   144,   144,   nil,     6,
+   129,     6,   nil,   nil,   nil,   nil,   171,     7,   nil,     7,
+   nil,   nil,     6,     6,     6,     6,     6,     8,     6,     8,
+     7,     7,     7,     7,     7,    11,     7,    11,   nil,   nil,
+     8,     8,     8,     8,     8,   nil,     8,   nil,    11,    11,
+    11,    11,    11,   nil,    11 ]
 
 racc_goto_check = [
     22,    24,    21,    23,    36,    36,    37,    18,    16,    34,
-    35,    41,    36,    20,    19,    17,    25,    25,    28,    32,
-    29,    23,    24,     1,    23,    24,    28,    34,    13,    15,
-    34,    14,    38,    17,    20,    19,     1,     1,     1,     1,
-     1,    33,     1,    35,    39,     3,    33,    35,    42,   nil,
-    41,   nil,    35,    22,     8,    35,     8,   nil,   nil,   nil,
-   nil,    16,   nil,    18,    37,   nil,   nil,     8,     8,     8,
-     8,     8,   nil,     8,     4,   nil,     4,    23,   nil,   nil,
-    22,   nil,    21,    34,   nil,    22,   nil,     4,     4,     4,
-     4,     4,   nil,     4,   nil,   nil,   nil,   nil,    36,   nil,
-   nil,   nil,    36,   nil,   nil,    24,    36,    36,   nil,     5,
-    24,     5,   nil,   nil,   nil,   nil,    22,     6,   nil,     6,
-   nil,   nil,     5,     5,     5,     5,     5,    11,     5,    11,
-     6,     6,     6,     6,     6,     7,     6,     7,   nil,   nil,
-    11,    11,    11,    11,    11,   nil,    11,   nil,     7,     7,
-     7,     7,     7,   nil,     7 ]
+    35,    41,    36,    19,    20,    17,    25,    25,    28,     3,
+    13,    23,    24,     1,    23,    24,    28,    34,    14,    15,
+    34,    29,    32,    17,    19,    20,     1,     1,     1,     1,
+     1,    33,     1,    35,    38,    39,    33,    35,    42,   nil,
+    41,   nil,    35,    22,     4,    35,     4,   nil,   nil,   nil,
+   nil,    16,   nil,    18,    37,   nil,   nil,     4,     4,     4,
+     4,     4,   nil,     4,     5,   nil,     5,    23,   nil,   nil,
+    22,   nil,    21,    34,   nil,    22,   nil,     5,     5,     5,
+     5,     5,   nil,     5,   nil,   nil,   nil,   nil,    36,   nil,
+   nil,   nil,    36,   nil,   nil,    24,    36,    36,   nil,     6,
+    24,     6,   nil,   nil,   nil,   nil,    22,     7,   nil,     7,
+   nil,   nil,     6,     6,     6,     6,     6,     8,     6,     8,
+     7,     7,     7,     7,     7,    11,     7,    11,   nil,   nil,
+     8,     8,     8,     8,     8,   nil,     8,   nil,    11,    11,
+    11,    11,    11,   nil,    11 ]
 
 racc_goto_pointer = [
-   nil,    23,   nil,    43,    74,   109,   117,   135,    54,   nil,
-   nil,   127,   nil,    10,    -5,    11,   -30,    -3,   -29,    -4,
-    -5,   -40,   -42,   -15,   -17,   -28,   nil,   nil,  -120,  -107,
-   nil,   nil,   -33,  -101,    -9,  -116,   -40,   -91,    12,    17,
+   nil,    23,   nil,    17,    54,    74,   109,   117,   127,   nil,
+   nil,   135,   nil,     2,    -8,    11,   -30,    -3,   -29,    -5,
+    -4,   -40,   -42,   -15,   -17,   -28,   nil,   nil,  -120,   -96,
+   nil,   nil,   -20,  -101,    -9,  -116,   -40,   -91,    24,    18,
    nil,    -9,   -13 ]
 
 racc_goto_default = [

data/lib/rdoc/rdoc.rb

@@ -353,7 +353,11 @@ option)
     return unless content
 
     filename_path = Pathname(filename).expand_path
-    relative_path = filename_path.relative_path_from @options.root
+    begin
+      relative_path = filename_path.relative_path_from @options.root
+    rescue ArgumentError
+      relative_path = filename_path
+    end
 
     if @options.page_dir and
        relative_path.to_s.start_with? @options.page_dir.to_s then

data/lib/rdoc/servlet.rb

@@ -1,5 +1,6 @@
 require 'rdoc'
 require 'time'
+require 'json'
 require 'webrick'
 
 ##
@@ -438,4 +439,3 @@ version.  If you're viewing Ruby's documentation, include the version of ruby.
   end
 
 end
-

data/lib/rdoc/text.rb

@@ -10,11 +10,11 @@ require 'strscan'
 
 begin
   gem 'json'
+rescue NameError => e # --disable-gems
+  raise unless e.name == :gem
 rescue Gem::LoadError
 end
 
-require 'json'
-
 ##
 # Methods for manipulating comment text
 
@@ -68,11 +68,11 @@ module RDoc::Text
     expanded = []
 
     text.each_line do |line|
-      line.gsub!(/^((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
+      nil while line.gsub!(/(?:\G|\r)((?:.{8})*?)([^\t\r\n]{0,7})\t/) do
         r = "#{$1}#{$2}#{' ' * (8 - $2.size)}"
         r.force_encoding text.encoding if Object.const_defined? :Encoding
         r
-      end until line !~ /\t/
+      end
 
       expanded << line
     end
@@ -321,4 +321,3 @@ module RDoc::Text
   end
 
 end
-

data/test/test_rdoc_generator_json_index.rb

@@ -137,7 +137,11 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
   end
 
   def test_generate_gzipped
-    require 'zlib'
+    begin
+      require 'zlib'
+    rescue LoadError
+      skip "no zlib"
+    end
     @g.generate
     @g.generate_gzipped
 
@@ -148,8 +152,9 @@ class TestRDocGeneratorJsonIndex < RDoc::TestCase
     assert_file 'js/search_index.js'
     assert_file 'js/search_index.js.gz'
 
-    gzip = File.open 'js/search_index.js.gz'
-    json = Zlib::GzipReader.new(gzip).read
+    json = File.open('js/search_index.js.gz') {|gzip|
+      Zlib::GzipReader.new(gzip).read
+    }
 
     json =~ /\Avar search_data = /
 

data/test/test_rdoc_markup_to_html.rb

@@ -629,7 +629,6 @@ class TestRDocMarkupToHtml < RDoc::Markup::FormatterTestCase
     ]
     invalid_syntax = [
       'def x end',
-      'class C end',
       'class C < end',
       'module M < C end',
       'a=># blah',

data/test/test_rdoc_servlet.rb

@@ -185,7 +185,7 @@ class TestRDocServlet < RDoc::TestCase
 
     @s.do_GET @req, @res
 
-    assert_equal 'application/javascript', @res.content_type
+    assert_equal 'application/javascript', @res.content_type, @res.body
   end
 
   def test_documentation_page_class
@@ -532,4 +532,3 @@ class TestRDocServlet < RDoc::TestCase
   end
 
 end
-

data/test/test_rdoc_task.rb

@@ -1,5 +1,8 @@
 require 'rdoc/test_case'
-require 'rake'
+begin
+  require 'rake'
+rescue LoadError
+end
 
 class TestRDocTask < RDoc::TestCase
 
@@ -166,5 +169,5 @@ class TestRDocTask < RDoc::TestCase
     assert_equal %w[-o html] << "--title" << "Test Title Option", rdoc_task.option_list
   end
 
-end
+end if defined?(Rake::Task)
 

data/test/test_rdoc_text.rb

@@ -56,6 +56,9 @@ class TestRDocText < RDoc::TestCase
 
     assert_equal('.               .',
                  expand_tabs(".\t\t."), 'dot tab tab dot')
+
+    assert_equal('a       a',
+                 Timeout.timeout(1) {expand_tabs("\ra\ta")}, "carriage return")
   end
 
   def test_expand_tabs_encoding

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rdoc
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.2.1
 platform: ruby
 authors:
 - Eric Hodel
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-07 00:00:00.000000000 Z
+date: 2015-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -47,14 +47,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.4'
+        version: '5.8'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -95,14 +95,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.13'
+        version: '3.14'
 description: |-
   RDoc produces HTML and command-line documentation for Ruby projects.  RDoc
   includes the +rdoc+ and +ri+ tools for generating and displaying documentation
@@ -132,7 +132,6 @@ extra_rdoc_files:
 files:
 - ".autotest"
 - ".document"
-- ".gemtest"
 - CONTRIBUTING.rdoc
 - CVE-2013-0256.rdoc
 - ExampleMarkdown.md
@@ -233,6 +232,9 @@ files:
 - lib/rdoc/generator/template/json_index/js/navigation.js
 - lib/rdoc/generator/template/json_index/js/searcher.js
 - lib/rdoc/ghost_method.rb
+- lib/rdoc/i18n.rb
+- lib/rdoc/i18n/locale.rb
+- lib/rdoc/i18n/text.rb
 - lib/rdoc/include.rb
 - lib/rdoc/known_classes.rb
 - lib/rdoc/markdown.kpeg
@@ -462,88 +464,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '1.3'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: RDoc produces HTML and command-line documentation for Ruby projects
-test_files:
-- test/test_rdoc_alias.rb
-- test/test_rdoc_any_method.rb
-- test/test_rdoc_attr.rb
-- test/test_rdoc_class_module.rb
-- test/test_rdoc_code_object.rb
-- test/test_rdoc_comment.rb
-- test/test_rdoc_constant.rb
-- test/test_rdoc_context.rb
-- test/test_rdoc_context_section.rb
-- test/test_rdoc_cross_reference.rb
-- test/test_rdoc_encoding.rb
-- test/test_rdoc_extend.rb
-- test/test_rdoc_generator_darkfish.rb
-- test/test_rdoc_generator_json_index.rb
-- test/test_rdoc_generator_markup.rb
-- test/test_rdoc_generator_pot.rb
-- test/test_rdoc_generator_pot_po.rb
-- test/test_rdoc_generator_pot_po_entry.rb
-- test/test_rdoc_generator_ri.rb
-- test/test_rdoc_i18n_locale.rb
-- test/test_rdoc_i18n_text.rb
-- test/test_rdoc_include.rb
-- test/test_rdoc_markdown.rb
-- test/test_rdoc_markdown_test.rb
-- test/test_rdoc_markup.rb
-- test/test_rdoc_markup_attribute_manager.rb
-- test/test_rdoc_markup_attributes.rb
-- test/test_rdoc_markup_document.rb
-- test/test_rdoc_markup_formatter.rb
-- test/test_rdoc_markup_hard_break.rb
-- test/test_rdoc_markup_heading.rb
-- test/test_rdoc_markup_include.rb
-- test/test_rdoc_markup_indented_paragraph.rb
-- test/test_rdoc_markup_paragraph.rb
-- test/test_rdoc_markup_parser.rb
-- test/test_rdoc_markup_pre_process.rb
-- test/test_rdoc_markup_raw.rb
-- test/test_rdoc_markup_to_ansi.rb
-- test/test_rdoc_markup_to_bs.rb
-- test/test_rdoc_markup_to_html.rb
-- test/test_rdoc_markup_to_html_crossref.rb
-- test/test_rdoc_markup_to_html_snippet.rb
-- test/test_rdoc_markup_to_joined_paragraph.rb
-- test/test_rdoc_markup_to_label.rb
-- test/test_rdoc_markup_to_markdown.rb
-- test/test_rdoc_markup_to_rdoc.rb
-- test/test_rdoc_markup_to_table_of_contents.rb
-- test/test_rdoc_markup_to_tt_only.rb
-- test/test_rdoc_markup_verbatim.rb
-- test/test_rdoc_method_attr.rb
-- test/test_rdoc_normal_class.rb
-- test/test_rdoc_normal_module.rb
-- test/test_rdoc_options.rb
-- test/test_rdoc_parser.rb
-- test/test_rdoc_parser_c.rb
-- test/test_rdoc_parser_changelog.rb
-- test/test_rdoc_parser_markdown.rb
-- test/test_rdoc_parser_rd.rb
-- test/test_rdoc_parser_ruby.rb
-- test/test_rdoc_parser_simple.rb
-- test/test_rdoc_rd.rb
-- test/test_rdoc_rd_block_parser.rb
-- test/test_rdoc_rd_inline.rb
-- test/test_rdoc_rd_inline_parser.rb
-- test/test_rdoc_rdoc.rb
-- test/test_rdoc_require.rb
-- test/test_rdoc_ri_driver.rb
-- test/test_rdoc_ri_paths.rb
-- test/test_rdoc_ruby_lex.rb
-- test/test_rdoc_ruby_token.rb
-- test/test_rdoc_rubygems_hook.rb
-- test/test_rdoc_servlet.rb
-- test/test_rdoc_single_class.rb
-- test/test_rdoc_stats.rb
-- test/test_rdoc_store.rb
-- test/test_rdoc_task.rb
-- test/test_rdoc_text.rb
-- test/test_rdoc_token_stream.rb
-- test/test_rdoc_tom_doc.rb
-- test/test_rdoc_top_level.rb
+test_files: []