Handle :nodoc: om singleton classes

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

1 files changed, 8 insertions, 12 deletions

diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index e3af27d3f7..f9b0a19cd6 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1747,21 +1747,17 @@ module RDoc
 
       when TkLSHFT
 	case name = get_class_specification
-	when "self"
+	when "self", container.name
 	  parse_statements(container, SINGLE, &block)
 	else
-
-          # Special case: class << X inside class 'X' adds singleton methods
-          if name == container.name
-            parse_statements(container, SINGLE, &block)
-          else
-            other = TopLevel.find_class_named(name)
-            unless other
-              other = @top_level.add_class(NormalClass, name, nil)
-              other.record_location(@top_level)
-            end
-            parse_statements(other, SINGLE, &block)
+          other = TopLevel.find_class_named(name)
+          unless other
+            other = @top_level.add_class(NormalClass, name, nil)
+            other.record_location(@top_level)
+            other.comment = comment
           end
+          read_documentation_modifiers(other, CLASS_MODIFIERS)
+          parse_statements(other, SINGLE, &block)
 	end
 
       else