Use *args instead of ... for unknown args

Author: drbrain

History.txt

@@ -7,9 +7,11 @@
     <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.
+  * The C parser now uses <tt>*args</tt> instead of <tt>...</tt> if no
+    <tt>call-seq</tt> was provided to give names to the arguments.
 * Bug fixes
+  * The C parser now records the file location of aliases, attributes,
+    constants and methods allowing -C to work on C files.
   * Darkfish now handles dots in call-seq allowing <tt>ary.insert(index,
     obj...)</tt> to display correctly.  Patch #6 by KUBO Takehiro.
   * Improved processing of meta-programmed methods when followed by unparseable

lib/rdoc/parser/c.rb

@@ -779,11 +779,12 @@ def handle_method(type, var_name, meth_name, meth_body, param_count,
       p_count = Integer(param_count) rescue -1
 
       if p_count < 0 then
-        meth_obj.params = "(...)"
+        meth_obj.params = "(*args)"
       elsif p_count == 0
         meth_obj.params = "()"
       else
-        meth_obj.params = "(" + (1..p_count).map{|i| "p#{i}"}.join(", ") + ")"
+        params = (1..p_count).map { |i| "p#{i}" }.join(', ')
+        meth_obj.params = "(#{params})"
       end
 
       if source_file then

test/test_rdoc_parser_c.rb

@@ -750,18 +750,29 @@ def test_find_modifiers_yields
   end
 
   def test_handle_method
+    parser = util_parser "Document-method: Object#m\n blah */"
+
+    parser.handle_method 'method', 'rb_cObject', 'm', 'rb_m', 2
+
+    m = @top_level.find_module_named('Object').method_list.first
+
+    assert_equal 'm', m.name
+    assert_equal '(p1, p2)', m.params
+    assert_equal @top_level, m.file
+  end
+
+  def test_handle_method_args
     parser = util_parser "Document-method: BasicObject#==\n blah */"
 
-    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 1
+    parser.handle_method 'method', 'rb_cBasicObject', '==', 'rb_obj_equal', 2
 
     bo = @top_level.find_module_named 'BasicObject'
 
     assert_equal 1, bo.method_list.length
 
     equals2 = bo.method_list.first
 
-    assert_equal '==', equals2.name
-    assert_equal @top_level, equals2.file
+    assert_equal '(p1, p2)', equals2.params
   end
 
   def test_handle_method_initialize
@@ -780,6 +791,16 @@ def test_handle_method_initialize
     assert_equal :public, new.visibility
   end
 
+  def test_handle_method_star_args
+    parser = util_parser "Document-method: Object#m\n blah */"
+
+    parser.handle_method 'method', 'rb_cObject', 'm', 'rb_m', -1
+
+    m = @top_level.find_module_named('Object').method_list.first
+
+    assert_equal '(*args)', m.params
+  end
+
   def test_look_for_directives_in
     parser = util_parser ''