diff options
| author | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-11 07:11:46 +0000 |
|---|---|---|
| committer | dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-09-11 07:11:46 +0000 |
| commit | 336a32fd42c12a7ea70ccd85074e94f390f19909 (patch) | |
| tree | 8205c2439133f5a6518d6db991193bd7b34e0fa8 /lib/rdoc | |
| parent | d7c42199c8f8729d66a28e634525e57cfe7ab8a6 (diff) | |
| download | ruby-336a32fd42c12a7ea70ccd85074e94f390f19909.tar.gz ruby-336a32fd42c12a7ea70ccd85074e94f390f19909.tar.xz ruby-336a32fd42c12a7ea70ccd85074e94f390f19909.zip | |
Fix up cross-file class merging
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@6882 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc')
| -rw-r--r-- | lib/rdoc/code_objects.rb | 6 | ||||
| -rw-r--r-- | lib/rdoc/parsers/parse_rb.rb | 2 |
2 files changed, 7 insertions, 1 deletions
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb index 82872db14..55b1cfa65 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 8a1ecc612..90194e069 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) |