Rename top_level method to file_context

Author: st0012

lib/rdoc/code_object/context.rb

@@ -297,7 +297,7 @@ def add_class(class_type, given_name, superclass = '::Object')
     # find the name & enclosing context
     if given_name =~ /^:+(\w+)$/ then
       full_name = $1
-      enclosing = top_level
+      enclosing = file_context
       name = full_name.split(/:+/).last
     else
       full_name = child_name given_name
@@ -1189,18 +1189,20 @@ def to_s # :nodoc:
   end
 
   ##
-  # Return the TopLevel that owns us
+  # Return the File that owns us
   #--
-  # FIXME we can be 'owned' by several TopLevel (see #record_location &
+  # FIXME we can be 'owned' by several Files (see #record_location &
   # #in_files)
 
-  def top_level
-    return @top_level if defined? @top_level
-    @top_level = self
-    @top_level = @top_level.parent until RDoc::File === @top_level
-    @top_level
+  def file_context
+    return @file_context if defined? @file_context
+    @file_context = self
+    @file_context = @file_context.parent until @file_context.nil? or RDoc::File === @file_context
+    @file_context
   end
 
+  alias_method :top_level, :file_context # :nodoc:
+
   ##
   # Upgrades NormalModule +mod+ in +enclosing+ to a +class_type+
 

lib/rdoc/code_object/require.rb

@@ -15,7 +15,7 @@ class RDoc::Require < RDoc::CodeObject
   def initialize(name, comment)
     super()
     @name = name.gsub(/'|"/, "") #'
-    @top_level = nil
+    @file_context = nil
     self.comment = comment
   end
 
@@ -35,17 +35,19 @@ def to_s # :nodoc:
   ##
   # The RDoc::File corresponding to this require, or +nil+ if not found.
 
-  def top_level
-    @top_level ||= begin
-      tl = RDoc::File.all_files_hash[name + '.rb']
+  def file_context
+    @file_context ||= begin
+      f = RDoc::File.all_files_hash[name + '.rb']
 
-      if tl.nil? and RDoc::File.all_files.first.full_name =~ %r(^lib/) then
+      if f.nil? and RDoc::File.all_files.first.full_name =~ %r(^lib/) then
         # second chance
-        tl = RDoc::File.all_files_hash['lib/' + name + '.rb']
+        f = RDoc::File.all_files_hash['lib/' + name + '.rb']
       end
 
-      tl
+      f
     end
   end
 
+  alias_method :top_level, :file_context # :nodoc:
+
 end

lib/rdoc/parser/c.rb

@@ -897,7 +897,7 @@ def handle_class_module(var_name, type, class_name, parent, in_module)
       cm = enclosure.add_module RDoc::NormalModule, class_name
     end
 
-    cm.record_location enclosure.top_level
+    cm.record_location enclosure.file_context
 
     find_class_comment cm.full_name, cm
 

test/rdoc/rdoc_context_test.rb

@@ -320,7 +320,7 @@ def test_add_require
     @c1.add_require req
 
     assert_empty @c1.requires
-    assert_includes @c1.top_level.requires, req
+    assert_includes @c1.file_context.requires, req
   end
 
   def test_add_section