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 | 6a0f9a2c7962bba176589a65f019addc54fcac6e (patch) | |
tree | 39366e65074c92c97c4d57aa71eea5c5da0637d0 /lib/rdoc | |
parent | 3dc173c1e92da3798995e3751ec837a1582a2974 (diff) |
Fix up cross-file class merging
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@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 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) |