diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 22:23:38 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-09-07 22:23:38 +0000 |
| commit | ba6ae341bab83dfc7a624c5bf20d8d162dacaff9 (patch) | |
| tree | 540581a54cefcdc817577f646f09372f7e9936d1 /lib/rdoc/parser | |
| parent | bf51c067b92361007a57909c539591d3d00cdbd8 (diff) | |
* 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
Diffstat (limited to 'lib/rdoc/parser')
| -rw-r--r-- | lib/rdoc/parser/ruby.rb | 5 | ||||
| -rw-r--r-- | lib/rdoc/parser/simple.rb | 3 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/rdoc/parser/ruby.rb b/lib/rdoc/parser/ruby.rb index ac7094f488..c30dbf0f4e 100644 --- a/lib/rdoc/parser/ruby.rb +++ b/lib/rdoc/parser/ruby.rb @@ -170,9 +170,7 @@ class RDoc::Parser::Ruby < RDoc::Parser @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 @@ class RDoc::Parser::Ruby < RDoc::Parser end end - diff --git a/lib/rdoc/parser/simple.rb b/lib/rdoc/parser/simple.rb index 73bb7bdffb..f2ab27a92e 100644 --- a/lib/rdoc/parser/simple.rb +++ b/lib/rdoc/parser/simple.rb @@ -52,11 +52,10 @@ class RDoc::Parser::Simple < RDoc::Parser 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 - |