Record the location of everything in the C parser

Author: drbrain

History.txt

@@ -7,6 +7,8 @@
     <kbd>rdoc -C</kbd> gives a standard report, <kbd>rdoc -C1</kbd> includes
     method parameters.  Method parameters are considered documented if they're
     marked-up with <tt>+</tt>, <tt><code></tt> or <code><tt></code>.
+  * The C parser now records the file location of aliases, attributes,
+    constants and methods.
 * Bug fixes
   * Darkfish now handles dots in call-seq allowing <tt>ary.insert(index,
     obj...)</tt> to display correctly.  Patch #6 by KUBO Takehiro.

lib/rdoc/parser/c.rb

@@ -156,6 +156,7 @@ def do_aliases
       comment = strip_stars comment
       al.comment = comment
 
+      al.record_location @top_level
       class_obj.add_alias al
       @stats.add_alias al
     end
@@ -618,6 +619,7 @@ def handle_attr(var_name, attr_name, read, write)
 
     attr = RDoc::Attr.new '', name, rw, comment
 
+    attr.record_location @top_level
     class_obj.add_attribute attr
     @stats.add_attribute attr
   end
@@ -732,6 +734,7 @@ def handle_constants(type, var_name, const_name, definition)
       con = RDoc::Constant.new const_name, definition, comment
     end
 
+    con.record_location @top_level
     @stats.add_constant con
     class_obj.add_constant con
   end
@@ -797,6 +800,7 @@ def handle_method(type, var_name, meth_name, meth_body, param_count,
 
       if find_body(class_name, meth_body, meth_obj, body) and
          meth_obj.document_self then
+        meth_obj.record_location @top_level
         class_obj.add_method meth_obj
         @stats.add_method meth_obj
         meth_obj.visibility = :private if 'private_method' == type

test/test_rdoc_parser_c.rb

@@ -101,6 +101,7 @@ def test_do_attr_rb_attr
     assert_equal 'accessor',            accessor.name
     assert_equal 'RW',                  accessor.rw
     assert_equal 'This is an accessor', accessor.comment
+    assert_equal @top_level,            accessor.file
 
     reader = attrs.shift
     assert_equal 'reader',           reader.name
@@ -134,6 +135,7 @@ def test_do_attr_rb_define_attr
     assert_equal 'accessor',            accessor.name
     assert_equal 'RW',                  accessor.rw
     assert_equal 'This is an accessor', accessor.comment
+    assert_equal @top_level,            accessor.file
   end
 
   def test_do_aliases
@@ -159,6 +161,9 @@ def test_do_aliases
     assert_equal 2,      methods.length
     assert_equal 'bleh', methods.last.name
     assert_equal 'blah', methods.last.is_alias_for.name
+
+    assert_equal @top_level, methods.last.is_alias_for.file
+    assert_equal @top_level, methods.last.file
   end
 
   def test_do_aliases_singleton
@@ -339,6 +344,8 @@ def test_do_constants
     constants = klass.constants
     assert !klass.constants.empty?
 
+    assert_equal @top_level, constants.first.file
+
     constants = constants.map { |c| [c.name, c.value, c.comment] }
 
     assert_equal ['PERFECT', '300', 'The highest possible score in bowling   '],
@@ -754,6 +761,7 @@ def test_handle_method
     equals2 = bo.method_list.first
 
     assert_equal '==', equals2.name
+    assert_equal @top_level, equals2.file
   end
 
   def test_handle_method_initialize