Change symbol lookup scheme in HTML generation

git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_8@6289 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

2 files changed, 17 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 658ca3655..b48e7f9ac 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon May 10 21:44:42 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb: Change scheme for
+	  looking up symbols in  HTML generator.
+
 Mon May 10 12:11:37 2004  Dave Thomas  <dave@pragprog.com>
 
 	* lib/rdoc/generators/html_generator.rb: Hack to search parents
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index ba1a512b1..ef0895106 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -380,10 +380,18 @@ module Generators
       res = []
       array.each do |i|
         ref = AllReferences[i.name] 
-        if !ref && @context.parent
-          name = @context.parent.name + "::" + i.name
-          ref = AllReferences[name] 
-        end
+#         if !ref
+#           container = @context.parent
+#           while !ref && container
+#             name = container.name + "::" + i.name
+#             ref = AllReferences[name] 
+#             container = container.parent
+#           end
+#         end
+
+        ref = @context.find_symbol(i.name)
+        ref = ref.viewer if ref
+
         if !ref && block_given?
           possibles = yield(i.name)
           while !ref and !possibles.empty?