ruby-changes:9394
From: drbrain <ko1@a...>
Date: Tue, 23 Dec 2008 14:17:29 +0900 (JST)
Subject: [ruby-changes:9394] Ruby:r20932 (trunk): Don't coalesce adjacent comment blocks. [bug#901]
drbrain 2008-12-23 14:16:54 +0900 (Tue, 23 Dec 2008) New Revision: 20932 http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=20932 Log: Don't coalesce adjacent comment blocks. [bug#901] Modified files: trunk/ChangeLog trunk/lib/rdoc/parser/c.rb Index: ChangeLog =================================================================== --- ChangeLog (revision 20931) +++ ChangeLog (revision 20932) @@ -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 12:00:00 2008 Tanaka Akira <akr@f...> * io.c (pipe_close): fix coding style. [ruby-dev:37554] Index: lib/rdoc/parser/c.rb =================================================================== --- lib/rdoc/parser/c.rb (revision 20931) +++ lib/rdoc/parser/c.rb (revision 20932) @@ -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/