drbrain	2008-03-09 13:52:53 +0900 (Sun, 09 Mar 2008)

  New Revision: 15735

  Modified files:
    trunk/ChangeLog
    trunk/lib/rdoc/generator.rb

  Log:
    Restore missing line to RDoc::Generator#params.  Patch by Lincoln Stoll.

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=15735&r2=15734&diff_format=u
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/lib/rdoc/generator.rb?r1=15735&r2=15734&diff_format=u

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 15734)
+++ ChangeLog	(revision 15735)
@@ -1,3 +1,8 @@
+Sun Mar  9 13:51:21 2008  Eric Hodel  <drbrain@s...>
+
+	* lib/rdoc/generator.rb: Restore missing line to #params.  Patch by
+	Lincoln Stoll <lstoll at lstoll.net>
+
 Sun Mar  9 09:52:00 2008  Eric Hodel  <drbrain@s...>
 
 	* lib/rdoc/code_objects.rb: Remove debugging Kernel#p.  Patch by
Index: lib/rdoc/generator.rb
===================================================================
--- lib/rdoc/generator.rb	(revision 15734)
+++ lib/rdoc/generator.rb	(revision 15735)
@@ -921,26 +921,27 @@
     def params
       # params coming from a call-seq in 'C' will start with the
       # method name
-      if p !~ /^\w/
-        p = @context.params.gsub(/\s*\#.*/, '')
-        p = p.tr("\n", " ").squeeze(" ")
-        p = "(" + p + ")" unless p[0] == ?(
+      params = @context.params
+      if params !~ /^\w/
+        params = @context.params.gsub(/\s*\#.*/, '')
+        params = params.tr("\n", " ").squeeze(" ")
+        params = "(" + params + ")" unless params[0] == ?(
 
         if (block = @context.block_params)
          # If this method has explicit block parameters, remove any
          # explicit &block
 
-         p.sub!(/,?\s*&\w+/, '')
+         params.sub!(/,?\s*&\w+/, '')
 
           block.gsub!(/\s*\#.*/, '')
           block = block.tr("\n", " ").squeeze(" ")
           if block[0] == ?(
             block.sub!(/^\(/, '').sub!(/\)/, '')
           end
-          p << " {|#{block.strip}| ...}"
+          params << " {|#{block.strip}| ...}"
         end
       end
-      CGI.escapeHTML(p)
+      CGI.escapeHTML(params)
     end
 
     def create_source_code_file(code_body)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/