mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* lib/rdoc/*, test/rdoc/*: Update rdoc-5.0.0.beta2
Fixed ri parse defect with left-hand matched classes. https://github.com/rdoc/rdoc/pull/420 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@56097 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
bf51c067b9
commit
ba6ae341ba
37 changed files with 100 additions and 274 deletions
|
@ -79,8 +79,6 @@ class RDoc::Markup::Parser
|
|||
@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 @@ class RDoc::Markup::Parser
|
|||
# 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 @@ class RDoc::Markup::Parser
|
|||
@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 @@ class RDoc::Markup::Parser
|
|||
end
|
||||
|
||||
end
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue