diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-03 00:42:49 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-12-03 00:42:49 +0000 |
| commit | f462cdb5d98a31a83f277189c41faa7f47dbbc67 (patch) | |
| tree | f77213d7e79827d5f2702d0b9403d62ccb979cce /lib/rdoc | |
| parent | ff9f9c6d844cc966fc33090d1eac9e7121c4a445 (diff) | |
| download | ruby-f462cdb5d98a31a83f277189c41faa7f47dbbc67.tar.gz | |
* lib/rdoc: Update to RDoc master 900de99. Changes include:
Fixed documentation display of constants
Fixed handling of unknown parsers
* test/rdoc: ditto.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@43962 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
| -rw-r--r-- | lib/rdoc/constant.rb | 10 | ||||
| -rw-r--r-- | lib/rdoc/parser.rb | 6 |
2 files changed, 5 insertions, 11 deletions
diff --git a/lib/rdoc/constant.rb b/lib/rdoc/constant.rb index 97985cbf99..48b32aaf98 100644 --- a/lib/rdoc/constant.rb +++ b/lib/rdoc/constant.rb @@ -63,15 +63,7 @@ class RDoc::Constant < RDoc::CodeObject # for a documented class or module. def documented? - return true if super - return false unless @is_alias_for - case @is_alias_for - when String then - found = @store.find_class_or_module @is_alias_for - return false unless found - @is_alias_for = found - end - @is_alias_for.documented? + super or is_alias_for && is_alias_for.documented? end ## diff --git a/lib/rdoc/parser.rb b/lib/rdoc/parser.rb index 5c6a0a8983..5572ba10a4 100644 --- a/lib/rdoc/parser.rb +++ b/lib/rdoc/parser.rb @@ -268,9 +268,11 @@ class RDoc::Parser markup = Regexp.escape markup - RDoc::Parser.parsers.find do |_, parser| + _, selected = RDoc::Parser.parsers.find do |_, parser| /^#{markup}$/i =~ parser.name.sub(/.*:/, '') - end.last + end + + selected end ## |