summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rw-r--r--lib/rdoc/code_objects.rb4
-rw-r--r--lib/rdoc/parsers/parse_rb.rb2
3 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 2c70efa5d1..30cbf42a10 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sat Apr 10 23:51:13 2004 Dave Thomas <dave@pragprog.com>
+
+ * lib/rdoc/code_objects.rb (RDoc::Context::add_to): Implementation of :enddoc:
+ made one too many assumptions...
+
Sat Apr 10 00:00:19 2004 Dave Thomas <dave@pragprog.com>
* lib/rdoc/markup/simple_markup/inline.rb: Fix problem
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index c48f5957b2..700f93a2a1 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -233,14 +233,14 @@ module RDoc
else
cls = class_type.new(name, superclass)
puts "Adding class/module #{name} to #@name" if $DEBUG
- collection[name] = cls
+ collection[name] = cls if @document_self && !@done_documenting
cls.parent = self
end
cls
end
def add_to(array, thing)
- array << thing if @document_self
+ array << thing if @document_self && !@done_documenting
thing.parent = self
end
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 9988b71337..1a660c1f31 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1614,7 +1614,7 @@ module RDoc
look_for_directives_in(container, comment)
if container.done_documenting
container.ongoing_visibility = save_visibility
- return
+# return
end
end
keep_comment = true