From 3d33a14369dd65001b840a9fe0e77ed3d3508fec Mon Sep 17 00:00:00 2001
From: dave <dave@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Wed, 5 May 2004 17:02:47 +0000
Subject: Don't include &block if we have yield parameters

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@6248 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                             | 6 ++++++
 lib/rdoc/code_objects.rb              | 6 ++++++
 lib/rdoc/generators/html_generator.rb | 5 +++++
 lib/rdoc/parsers/parse_rb.rb          | 1 +
 4 files changed, 18 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 145c08dcc1..e8e22b39ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu May  6 01:59:04 2004  Dave Thomas  <dave@pragprog.com>
+
+	* lib/rdoc/generators/html_generator.rb (Generators::HtmlMethod::params): 
+	  Don't include the &block parameter if we have explicit
+	  yield parameters.
+
 Wed May  5 03:52:31 2004  Masatoshi SEKI  <m_seki@mva.biglobe.ne.jp>
 
 	* lib/rinda/ring.rb: use recv instead of recvfrom.
diff --git a/lib/rdoc/code_objects.rb b/lib/rdoc/code_objects.rb
index 1d2e4d2129..9bacab8f6d 100644
--- a/lib/rdoc/code_objects.rb
+++ b/lib/rdoc/code_objects.rb
@@ -597,6 +597,12 @@ module RDoc
       p = "(" + p + ")" unless p[0] == ?(
 
       if (block = block_params)
+        # If this method has explicit block parameters, remove any
+        # explicit &block
+$stderr.puts p
+        p.sub!(/,?\s*&\w+/)
+$stderr.puts p
+
         block.gsub!(/\s*\#.*/, '')
         block = block.tr("\n", " ").squeeze(" ")
         if block[0] == ?(
diff --git a/lib/rdoc/generators/html_generator.rb b/lib/rdoc/generators/html_generator.rb
index 75b056b8be..13d63e5a3c 100644
--- a/lib/rdoc/generators/html_generator.rb
+++ b/lib/rdoc/generators/html_generator.rb
@@ -922,6 +922,11 @@ module Generators
         p = "(" + p + ")" unless p[0] == ?(
         
         if (block = @context.block_params)
+         # If this method has explicit block parameters, remove any
+         # explicit &block
+
+         p.sub!(/,?\s*&\w+/, '')
+
           block.gsub!(/\s*\#.*/, '')
           block = block.tr("\n", " ").squeeze(" ")
           if block[0] == ?(
diff --git a/lib/rdoc/parsers/parse_rb.rb b/lib/rdoc/parsers/parse_rb.rb
index 6876cfe0fc..1a3874fe24 100644
--- a/lib/rdoc/parsers/parse_rb.rb
+++ b/lib/rdoc/parsers/parse_rb.rb
@@ -1968,6 +1968,7 @@ module RDoc
       remove_token_listener(meth)
       
       meth.comment = comment
+
     end
     
     def skip_method(container)
-- 
cgit v1.2.3