Move @full_name initialization up to RDoc::CodeObject

Author: drbrain

lib/rdoc/class_module.rb

@@ -59,15 +59,16 @@ def self.from_module(class_type, mod)
 
     # update the parent of all children
 
-    (klass.attributes
-    klass.method_list +
-    klass.aliases +
-    klass.external_aliases +
-    klass.constants +
-    klass.includes +
-    klass.classes +
-    klass.modules).each do |obj|
+    (klass.attributes +
+     klass.method_list +
+     klass.aliases +
+     klass.external_aliases +
+     klass.constants +
+     klass.includes +
+     klass.classes +
+     klass.modules).each do |obj|
       obj.parent = klass
+      obj.full_name = nil
     end
 
     klass
@@ -81,7 +82,6 @@ def self.from_module(class_type, mod)
   def initialize(name, superclass = nil)
     @constant_aliases = []
     @diagram          = nil
-    @full_name        = nil
     @is_alias_for     = nil
     @name             = name
     @superclass       = superclass
@@ -173,15 +173,6 @@ def full_name
                    end
   end
 
-  ##
-  # Sets the full_name overriding any computed full name.
-  #
-  # Used for modules and classes that are constant aliases.
-
-  def full_name= full_name
-    @full_name = full_name
-  end
-
   def marshal_dump # :nodoc:
     # TODO must store the singleton attribute
     attrs = attributes.sort.map do |attr|

lib/rdoc/code_object.rb

@@ -91,10 +91,11 @@ class RDoc::CodeObject
   # Creates a new CodeObject that will document itself and its children
 
   def initialize
-    @metadata = {}
-    @comment = ''
-    @parent = nil
-    @file = nil
+    @metadata  = {}
+    @comment   = ''
+    @parent    = nil
+    @file      = nil
+    @full_name = nil
 
     @document_children   = true
     @document_self       = true
@@ -171,6 +172,15 @@ def force_documentation=(value)
     @force_documentation = value unless @done_documenting
   end
 
+  ##
+  # Sets the full_name overriding any computed full name.
+  #
+  # Set to +nil+ to clear RDoc's cached value
+
+  def full_name= full_name
+    @full_name = full_name
+  end
+
   ##
   # File name of our parent
 

lib/rdoc/context.rb

@@ -416,14 +416,17 @@ def add_class class_type, given_name, superclass = '::Object'
   # to +self+, and its #section to #current_section. Returns +mod+.
 
   def add_class_or_module mod, self_hash, all_hash
-    mod.section = @current_section    # TODO declaring context? something is wrong here...
+    mod.section = @current_section # TODO declaring context? something is
+                                   # wrong here...
     mod.parent = self
+
     unless @done_documenting then
       self_hash[mod.name] = mod
-      # this must be done AFTER adding mod to its parent,
-      # so that the full name is correct:
+      # this must be done AFTER adding mod to its parent, so that the full
+      # name is correct:
       all_hash[mod.full_name] = mod
     end
+
     mod
   end
 
@@ -484,8 +487,10 @@ def add_method(method)
   def add_module(class_type, name)
     mod = @classes[name] || @modules[name]
     return mod if mod
-    full_name = child_name(name)
+
+    full_name = child_name name
     mod = RDoc::TopLevel.modules_hash[full_name] || class_type.new(name)
+
     add_class_or_module(mod, @modules, RDoc::TopLevel.modules_hash)
   end
 
@@ -1011,7 +1016,8 @@ def to_s # :nodoc:
   ##
   # Return the TopLevel that owns us
   #--
-  # FIXME we can be 'owned' by several TopLevel (see #record_location & #in_files)
+  # FIXME we can be 'owned' by several TopLevel (see #record_location &
+  # #in_files)
 
   def top_level
     return @top_level if defined? @top_level
@@ -1029,8 +1035,8 @@ def upgrade_to_class mod, class_type, enclosing
     klass = RDoc::ClassModule.from_module class_type, mod
 
     # if it was there, then we keep it even if done_documenting
-    RDoc::TopLevel.classes_hash[full_name] = klass
-    enclosing.classes_hash[name] = klass
+    RDoc::TopLevel.classes_hash[mod.full_name] = klass
+    enclosing.classes_hash[mod.name]           = klass
 
     klass
   end

lib/rdoc/method_attr.rb

@@ -92,7 +92,6 @@ def initialize text, name
     @arglists     = nil
     @block_params = nil
     @call_seq     = nil
-    @full_name    = nil
     @param_seq    = nil
     @params       = nil
   end

lib/rdoc/ruby_lex.rb

@@ -823,6 +823,12 @@ def identify_gvar
     end
   end
 
+  IDENT_RE = if defined? Encoding then
+               /[\w\u0080-\uFFFF]/u
+             else
+               /[\w\x80-\xFF]/
+             end
+
   def identify_identifier
     token = ""
     if peek(0) =~ /[$@]/
@@ -832,7 +838,7 @@ def identify_identifier
       end
     end
 
-    while (ch = getc) =~ /[\w\u0080-\uFFFF]/u do
+    while (ch = getc) =~ IDENT_RE do
       print " :#{ch}: " if RDoc::RubyLex.debug?
       token.concat ch
     end

test/test_rdoc_any_method.rb

@@ -54,7 +54,7 @@ def test_markup_code
     ]
 
     @c2_a.collect_tokens
-    @c2_a.add_tokens *tokens
+    @c2_a.add_tokens(*tokens)
 
     expected = [
       '<span class="ruby-constant">CONSTANT</span>',

test/test_rdoc_code_object.rb

@@ -91,6 +91,16 @@ def test_done_documenting
     assert @co.document_children
   end
 
+  def test_full_name_equals
+    @co.full_name = 'hi'
+
+    assert_equal 'hi', @co.instance_variable_get(:@full_name)
+
+    @co.full_name = nil
+
+    assert_nil @co.instance_variable_get(:@full_name)
+  end
+
   def test_metadata
     assert_empty @co.metadata