yugui	2008-12-25 18:52:52 +0900 (Thu, 25 Dec 2008)

  New Revision: 21008

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=21008

  Log:
    merges r20932 from trunk into ruby_1_9_1.
    Don't coalesce adjacent comment blocks.  [bug#901]

  Modified files:
    branches/ruby_1_9_1/ChangeLog
    branches/ruby_1_9_1/lib/rdoc/parser/c.rb

Index: ruby_1_9_1/ChangeLog
===================================================================
--- ruby_1_9_1/ChangeLog	(revision 21007)
+++ ruby_1_9_1/ChangeLog	(revision 21008)
@@ -1,3 +1,8 @@
+Tue Dec 23 13:52:05 2008  Eric Hodel  <drbrain@s...>
+
+	* lib/rdoc/parser/c.rb:  Don't coalesce adjacent comment blocks.
+	  [bug#901]
+
 Tue Dec 23 08:10:05 2008  Eric Hodel  <drbrain@s...>
 
 	* lib/rubygems/installer.rb: Fix documentation.  [bug#827]
Index: ruby_1_9_1/lib/rdoc/parser/c.rb
===================================================================
--- ruby_1_9_1/lib/rdoc/parser/c.rb	(revision 21007)
+++ ruby_1_9_1/lib/rdoc/parser/c.rb	(revision 21008)
@@ -270,7 +270,7 @@
 
   def find_body(class_name, meth_name, meth_obj, body, quiet = false)
     case body
-    when %r"((?>/\*.*?\*/\s*)*)(?:(?:static|SWIGINTERN)\s+)?(?:intern\s+)?VALUE\s+#{meth_name}
+    when %r"((?>/\*.*?\*/\s*))(?:(?:static|SWIGINTERN)\s+)?(?:intern\s+)?VALUE\s+#{meth_name}
             \s*(\([^)]*\))([^;]|$)"xm
       comment, params = $1, $2
       body_text = $&
@@ -425,7 +425,7 @@
 
   def find_override_comment(class_name, meth_name)
     name = Regexp.escape(meth_name)
-    if @content =~ %r{Document-method:\s+#{class_name}(?:\.|::)#{name}\s*?\n((?>.*?\*/))}m then
+    if @content =~ %r{Document-method:\s+#{class_name}(?:\.|::|#)#{name}\s*?\n((?>.*?\*/))}m then
       $1
     elsif @content =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m then
       $1

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