diff options
author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-06 06:20:50 +0000 |
---|---|---|
committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-12-06 06:20:50 +0000 |
commit | 854758c464e6cdba06eed5d05b7fe10c33788c89 (patch) | |
tree | cc1e1b36bfab9923b3e962a0c52dc28c58a3f120 /lib | |
parent | 80ba379c242ce1d92005403423717cf0f74a74db (diff) | |
download | ruby-854758c464e6cdba06eed5d05b7fe10c33788c89.tar.gz |
* lib/rdoc/context.rb: Don't warn for duplicate methods while loading.
* test/rdoc/test_rdoc_context.rb: Test for above.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@38231 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/rdoc/context.rb | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/lib/rdoc/context.rb b/lib/rdoc/context.rb index 6f9deae4a8..22339bf1c7 100644 --- a/lib/rdoc/context.rb +++ b/lib/rdoc/context.rb @@ -447,11 +447,13 @@ class RDoc::Context < RDoc::CodeObject known = @methods_hash[key] if known then - known.comment = method.comment if known.comment.empty? - previously = ", previously in #{known.file}" unless - method.file == known.file - @store.rdoc.options.warn \ - "Duplicate method #{known.full_name} in #{method.file}#{previously}" + if @store then # otherwise we are loading + known.comment = method.comment if known.comment.empty? + previously = ", previously in #{known.file}" unless + method.file == known.file + @store.rdoc.options.warn \ + "Duplicate method #{known.full_name} in #{method.file}#{previously}" + end else @methods_hash[key] = method method.visibility = @visibility |