Merge pull request #421 from rdoc/removed-ruby18-code

Removed code for Ruby 1.8

Author: hsbt

lib/rdoc/code_object.rb

@@ -150,8 +150,7 @@ def comment=(comment)
                  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
+                   if String === @comment and @comment.empty? then
                      @comment.force_encoding comment.encoding
                    end
                    @comment
@@ -427,4 +426,3 @@ def suppressed?
   end
 
 end
-

lib/rdoc/comment.rb

@@ -200,7 +200,7 @@ def parse
   def remove_private
     # Workaround for gsub encoding for Ruby 1.9.2 and earlier
     empty = ''
-    empty.force_encoding @text.encoding if Object.const_defined? :Encoding
+    empty.force_encoding @text.encoding
 
     @text = @text.gsub(%r%^\s*([#*]?)--.*?^\s*(\1)\+\+\n?%m, empty)
     @text = @text.sub(%r%^\s*[#*]?--.*%m, '')
@@ -227,4 +227,3 @@ def tomdoc?
   end
 
 end
-

lib/rdoc/encoding.rb

@@ -25,43 +25,41 @@ def self.read_file filename, encoding, force_transcode = false
 
     RDoc::Encoding.set_encoding content
 
-    if Object.const_defined? :Encoding then
-      begin
-        encoding ||= Encoding.default_external
-        orig_encoding = content.encoding
-
-        if not orig_encoding.ascii_compatible? then
-          content.encode! encoding
-        elsif utf8 then
-          content.force_encoding Encoding::UTF_8
-          content.encode! encoding
-        else
-          # assume the content is in our output encoding
-          content.force_encoding encoding
-        end
-
-        unless content.valid_encoding? then
-          # revert and try to transcode
-          content.force_encoding orig_encoding
-          content.encode! encoding
-        end
-
-        unless content.valid_encoding? then
-          warn "unable to convert #{filename} to #{encoding}, skipping"
-          content = nil
-        end
-      rescue Encoding::InvalidByteSequenceError,
-             Encoding::UndefinedConversionError => e
-        if force_transcode then
-          content.force_encoding orig_encoding
-          content.encode!(encoding,
-                          :invalid => :replace, :undef => :replace,
-                          :replace => '?')
-          return content
-        else
-          warn "unable to convert #{e.message} for #{filename}, skipping"
-          return nil
-        end
+    begin
+      encoding ||= Encoding.default_external
+      orig_encoding = content.encoding
+
+      if not orig_encoding.ascii_compatible? then
+        content.encode! encoding
+      elsif utf8 then
+        content.force_encoding Encoding::UTF_8
+        content.encode! encoding
+      else
+        # assume the content is in our output encoding
+        content.force_encoding encoding
+      end
+
+      unless content.valid_encoding? then
+        # revert and try to transcode
+        content.force_encoding orig_encoding
+        content.encode! encoding
+      end
+
+      unless content.valid_encoding? then
+        warn "unable to convert #{filename} to #{encoding}, skipping"
+        content = nil
+      end
+    rescue Encoding::InvalidByteSequenceError,
+           Encoding::UndefinedConversionError => e
+      if force_transcode then
+        content.force_encoding orig_encoding
+        content.encode!(encoding,
+                        :invalid => :replace, :undef => :replace,
+                        :replace => '?')
+        return content
+      else
+        warn "unable to convert #{e.message} for #{filename}, skipping"
+        return nil
       end
     end
 
@@ -103,11 +101,8 @@ def self.set_encoding string
 
     remove_frozen_string_literal string
 
-    return unless Object.const_defined? :Encoding
-
     enc = Encoding.find name
     string.force_encoding enc if enc
   end
 
 end
-

lib/rdoc/generator/darkfish.rb

@@ -698,7 +698,7 @@ def render_template template_file, out_file = nil # :yield: io
 
       out_file.dirname.mkpath
       out_file.open 'w', 0644 do |io|
-        io.set_encoding @options.encoding if Object.const_defined? :Encoding
+        io.set_encoding @options.encoding
 
         @context = yield io
 
@@ -744,8 +744,7 @@ def template_for file, page = true, klass = ERB
       erbout = 'io'
     else
       template = file.read
-      template = template.encode @options.encoding if
-        Object.const_defined? :Encoding
+      template = template.encode @options.encoding
 
       file_var = File.basename(file).sub(/\..*/, '')
 
@@ -758,4 +757,3 @@ def template_for file, page = true, klass = ERB
   end
 
 end
-

lib/rdoc/generator/json_index.rb

@@ -142,7 +142,7 @@ def generate
     FileUtils.mkdir_p index_file.dirname, :verbose => $DEBUG_RDOC
 
     index_file.open 'w', 0644 do |io|
-      io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
+      io.set_encoding Encoding::UTF_8
       io.write 'var search_data = '
 
       JSON.dump data, io, 0
@@ -295,4 +295,3 @@ def search_string string
   end
 
 end
-

lib/rdoc/markup/parser.rb

@@ -79,8 +79,6 @@ def initialize
     @binary_input   = nil
     @current_token  = nil
     @debug          = false
-    @have_encoding  = Object.const_defined? :Encoding
-    @have_byteslice = ''.respond_to? :byteslice
     @input          = nil
     @input_encoding = nil
     @line           = 0
@@ -324,15 +322,7 @@ def build_verbatim margin
   # The character offset for the input string at the given +byte_offset+
 
   def char_pos byte_offset
-    if @have_byteslice then
-      @input.byteslice(0, byte_offset).length
-    elsif @have_encoding then
-      matched = @binary_input[0, byte_offset]
-      matched.force_encoding @input_encoding
-      matched.length
-    else
-      byte_offset
-    end
+    @input.byteslice(0, byte_offset).length
   end
 
   ##
@@ -430,11 +420,6 @@ def setup_scanner input
     @line_pos = 0
     @input    = input.dup
 
-    if @have_encoding and not @have_byteslice then
-      @input_encoding = @input.encoding
-      @binary_input   = @input.force_encoding Encoding::BINARY
-    end
-
     @s = StringScanner.new input
   end
 
@@ -556,4 +541,3 @@ def unget
   end
 
 end
-

lib/rdoc/options.rb

@@ -379,23 +379,15 @@ def init_ivars # :nodoc:
     @visibility = :protected
     @webcvs = nil
     @write_options = false
-
-    if Object.const_defined? :Encoding then
-      @encoding = Encoding::UTF_8
-      @charset = @encoding.name
-    else
-      @encoding = nil
-      @charset = 'UTF-8'
-    end
+    @encoding = Encoding::UTF_8
+    @charset = @encoding.name
   end
 
   def init_with map # :nodoc:
     init_ivars
 
     encoding = map['encoding']
-    @encoding = if Object.const_defined? :Encoding then
-                  encoding ? Encoding.find(encoding) : encoding
-                end
+    @encoding = encoding ? Encoding.find(encoding) : encoding
 
     @charset        = map['charset']
     @exclude        = map['exclude']
@@ -689,19 +681,16 @@ def parse argv
       opt.separator "Parsing options:"
       opt.separator nil
 
-      if Object.const_defined? :Encoding then
-        opt.on("--encoding=ENCODING", "-e", Encoding.list.map { |e| e.name },
-               "Specifies the output encoding.  All files",
-               "read will be converted to this encoding.",
-               "The default encoding is UTF-8.",
-               "--encoding is preferred over --charset") do |value|
-                 @encoding = Encoding.find value
-                 @charset = @encoding.name # may not be valid value
-               end
-
-        opt.separator nil
-      end
+      opt.on("--encoding=ENCODING", "-e", Encoding.list.map { |e| e.name },
+             "Specifies the output encoding.  All files",
+             "read will be converted to this encoding.",
+             "The default encoding is UTF-8.",
+             "--encoding is preferred over --charset") do |value|
+               @encoding = Encoding.find value
+               @charset = @encoding.name # may not be valid value
+             end
 
+      opt.separator nil
 
       opt.on("--locale=NAME",
              "Specifies the output locale.") do |value|
@@ -1242,11 +1231,10 @@ def write_options
     RDoc.load_yaml
 
     open '.rdoc_options', 'w' do |io|
-      io.set_encoding Encoding::UTF_8 if Object.const_defined? :Encoding
+      io.set_encoding Encoding::UTF_8
 
       YAML.dump self, io
     end
   end
 
 end
-

lib/rdoc/parser/ruby.rb

@@ -170,9 +170,7 @@ def initialize(top_level, file_name, content, options, stats)
     @prev_seek = nil
     @markup = @options.markup
     @track_visibility = :nodoc != @options.visibility
-
-    @encoding = nil
-    @encoding = @options.encoding if Object.const_defined? :Encoding
+    @encoding = @options.encoding
 
     reset
   end
@@ -2158,4 +2156,3 @@ def warn message
   end
 
 end
-

lib/rdoc/parser/simple.rb

@@ -52,11 +52,10 @@ def remove_coding_comment text
   def remove_private_comment comment
     # Workaround for gsub encoding for Ruby 1.9.2 and earlier
     empty = ''
-    empty.force_encoding comment.encoding if Object.const_defined? :Encoding
+    empty.force_encoding comment.encoding
 
     comment = comment.gsub(%r%^--\n.*?^\+\+\n?%m, empty)
     comment.sub(%r%^--\n.*%m, empty)
   end
 
 end
-

lib/rdoc/rdoc.rb

@@ -340,10 +340,8 @@ def list_files_in_directory dir
   # Parses +filename+ and returns an RDoc::TopLevel
 
   def parse_file filename
-    if Object.const_defined? :Encoding then
-      encoding = @options.encoding
-      filename = filename.encode encoding
-    end
+    encoding = @options.encoding
+    filename = filename.encode encoding
 
     @stats.add_file filename