byteslice is always defined on Ruby 1.9

Author: hsbt

lib/rdoc/markup/parser.rb

@@ -80,7 +80,6 @@ def initialize
     @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 +323,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 +421,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 +542,3 @@ def unget
   end
 
 end
-

test/test_rdoc_markup_parser.rb

@@ -8,8 +8,6 @@ class TestRDocMarkupParser < RDoc::TestCase
   def setup
     super
 
-    @have_byteslice = ''.respond_to? :byteslice
-
     @RMP = @RM::Parser
   end
 
@@ -30,7 +28,7 @@ def test_char_pos
 
     s.scan(/\S+/)
 
-    if @have_byteslice or @have_encoding then
+    if @have_encoding then
       assert_equal 3, parser.char_pos(s.pos)
     else
       assert_equal 4, parser.char_pos(s.pos)
@@ -1626,7 +1624,7 @@ def test_token_pos
 
     s.scan(/\S+/)
 
-    if @have_encoding or @have_byteslice then
+    if @have_encoding then
       assert_equal [3, 0], parser.token_pos(s.pos)
     else
       assert_equal [4, 0], parser.token_pos(s.pos)
@@ -1678,4 +1676,3 @@ def util_parser
   end
 
 end
-