Set superclass if unknown

Author: drbrain

History.txt

@@ -23,6 +23,7 @@
   * Fixed issue with <!-- --> style comments
   * Lowercase words are no longer rdoc'd as methods without leading #, as
     described in the documentation
+  * RDoc now correctly sets superclasses if they were originally unknown
 
 === 2.0.0 / 2008-04-10
 

lib/rdoc/code_objects.rb

@@ -264,7 +264,7 @@ def defined_in?(file)
     end
 
     def add_class(class_type, name, superclass)
-      add_class_or_module(@classes, class_type, name, superclass)
+      add_class_or_module @classes, class_type, name, superclass
     end
 
     def add_module(class_type, name)
@@ -550,22 +550,26 @@ def full_name
     def add_class_or_module(collection, class_type, name, superclass)
       cls = collection[name]
 
-      if cls
+      if cls then
         puts "Reusing class/module #{name}" #if $DEBUG_RDOC
       else
-        if class_type == NormalModule
+        if class_type == NormalModule then
           all = @@all_modules
         else
           all = @@all_classes
         end
 
         cls = all[name]
 
-        if !cls
+        unless cls then
           cls = class_type.new(name, superclass)
           all[name] = cls unless @done_documenting
         end
 
+        if NormalClass === cls and cls.superclass.nil? then
+          cls.superclass = superclass
+        end
+
         puts "Adding class/module #{name} to #{@name}" if $DEBUG_RDOC
 
         collection[name] = cls unless @done_documenting
@@ -628,6 +632,8 @@ class ClassModule < Context
 
     attr_accessor :diagram
 
+    attr_writer :superclass
+
     def initialize(name, superclass = nil)
       @name       = name
       @diagram    = nil
@@ -673,12 +679,12 @@ def superclass
 
       scope = self
 
-      until TopLevel === scope do
+      begin
         superclass = scope.classes.find { |c| c.name == @superclass }
 
         return superclass.full_name if superclass
         scope = scope.parent
-      end
+      end until scope.nil? or TopLevel === scope
 
       @superclass
     end
@@ -807,9 +813,7 @@ def param_seq
       if (block = block_params)
         # If this method has explicit block parameters, remove any
         # explicit &block
-$stderr.puts p
         p.sub!(/,?\s*&\w+/)
-$stderr.puts p
 
         block.gsub!(/\s*\#.*/, '')
         block = block.tr("\n", " ").squeeze(" ")

lib/rdoc/parser/c.rb

@@ -482,13 +482,14 @@ def handle_class_module(var_name, class_mod, class_name, parent, in_module)
       enclosure = @top_level
     end
 
-    if class_mod == "class"
+    if class_mod == "class" then
       cm = enclosure.add_class RDoc::NormalClass, class_name, parent_name
       @stats.num_classes += 1
     else
       cm = enclosure.add_module RDoc::NormalModule, class_name
       @stats.num_modules += 1
     end
+
     cm.record_location(enclosure.toplevel)
 
     find_class_comment(cm.full_name, cm)