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

ChangeLog

@@ -1,3 +1,10 @@
+Tue Dec 30 12:30:30 2003  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/code_objects.rb (RDoc::Context::find_symbol): If a
+	  class and a method have the same name, finding Xxx.abc was trying
+	  to find 'abc' in method 'Xxx', not class 'Xxx'.
+
+
 Tue Dec 30 08:32:32 2003  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/parsers/parse_rb.rb (RDoc::RubyParser::parse_method): 

lib/rdoc/code_objects.rb

@@ -319,6 +319,11 @@ module RDoc
             end
           end
         end
+      else
+        # 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?
@@ -330,7 +335,13 @@ module RDoc
             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

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]