Import RDoc 3

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@30249 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 11 insertions, 2 deletions

diff --git a/lib/rdoc/normal_class.rb b/lib/rdoc/normal_class.rb
index e7ca6fffde..1ed8eaf974 100644
--- a/lib/rdoc/normal_class.rb
+++ b/lib/rdoc/normal_class.rb
@@ -6,10 +6,10 @@ require 'rdoc/class_module'
 class RDoc::NormalClass < RDoc::ClassModule
 
   ##
-  # Ancestor ClassModules
+  # Appends the superclass, if any, to the included modules.
 
   def ancestors
-    includes + [superclass]
+    superclass ? super + [superclass] : super
   end
 
   def inspect # :nodoc:
@@ -20,6 +20,15 @@ class RDoc::NormalClass < RDoc::ClassModule
     ]
   end
 
+  def to_s # :nodoc:
+    display = "#{self.class.name} #{self.full_name}"
+    if superclass
+      display << ' < ' << (superclass.is_a?(String) ? superclass : superclass.full_name)
+    end
+    display << ' -> ' << is_alias_for.to_s if is_alias_for
+    display
+  end
+
   def pretty_print q # :nodoc:
     superclass = @superclass ? " < #{@superclass}" : nil