diff options
author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-30 03:32:39 +0000 |
---|---|---|
committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-12-30 03:32:39 +0000 |
commit | 3ef4e98eb713a056ddd634d38cd27df327596ab1 (patch) | |
tree | 9d1d6366c9c007027fbf3f6b6b94a3e3a3ce14c9 /lib/rdoc | |
parent | 38043dde9d394119e6a164cbe22236db32089416 (diff) | |
download | ruby-3ef4e98eb713a056ddd634d38cd27df327596ab1.tar.gz |
Fix problem when class name is also a method name
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@5348 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
-rw-r--r-- | lib/rdoc/code_objects.rb | 23 | ||||
-rw-r--r-- | lib/rdoc/generators/template/chm/chm.rb | 1 |
2 files changed, 18 insertions, 6 deletions
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb index bfacff1321..f5b4e81853 100644 --- a/lib/rdoc/code_objects.rb +++ b/lib/rdoc/code_objects.rb @@ -320,17 +320,28 @@ module RDoc end end else - result = find_local_symbol(symbol) - if result.nil? - if symbol =~ /^[A-Z]/ - result = parent - while result && result.name != symbol - result = result.parent + # if a method is specified, then we're definitely looking for + # a module, otherwise it could be any symbol + if method + result = find_module_named(symbol) + else + result = find_local_symbol(symbol) + if result.nil? + if symbol =~ /^[A-Z]/ + result = parent + while result && result.name != symbol + result = result.parent + end end end end end if result && method + if !result.respond_to?(:find_local_symbol) + p result.name + p method + fail + end result = result.find_local_symbol(method) end result diff --git a/lib/rdoc/generators/template/chm/chm.rb b/lib/rdoc/generators/template/chm/chm.rb index 6df83a7773..4a89c26520 100644 --- a/lib/rdoc/generators/template/chm/chm.rb +++ b/lib/rdoc/generators/template/chm/chm.rb @@ -7,6 +7,7 @@ require "rdoc/generators/template/html/html" # tag, so... BODY.sub!(/<\?xml.*\?>/, '') +SRC_PAGE.sub!(/<\?xml.*\?>/, '') HPP_FILE = %{ [OPTIONS] |