diff options
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | lib/rdoc/code_objects.rb | 6 | ||||
-rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 2 |
3 files changed, 11 insertions, 1 deletions
@@ -1,3 +1,7 @@ +Sat Sep 11 16:09:46 2004 Dave Thomas <dave@pragprog.com> + + * lib/rdoc/parsers/parse_rb.rb: Fix up cross-file class merging. + Fri Sep 10 20:20:53 2004 Hirokazu Yamamoto <ocean@m2.ccsnet.ne.jp> * ext/tcltklib/tcltklib.c (lib_merge_tklist): fix suspicious diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb index 82872db14d..55b1cfa656 100644 --- a/lib/rdoc/code_objects.rb +++ b/lib/rdoc/code_objects.rb @@ -477,6 +477,12 @@ module RDoc nil end + # Find a named module + def find_module_named(name) + find_class_or_module_named(name) || find_enclosing_module_named(name) + end + + end # ClassModule is the base class for objects representing either a diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb index 8a1ecc612c..90194e0699 100644 --- a/lib/rdoc/parsers/parse_rb.rb +++ b/lib/rdoc/parsers/parse_rb.rb @@ -1760,7 +1760,7 @@ module RDoc else cls_type = NormalClass end - + cls = container.add_class(cls_type, name, superclass) read_documentation_modifiers(cls, CLASS_MODIFIERS) cls.record_location(@top_level) |