kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

Don't coalesce adjacent comment blocks. [bug#901]

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2008-12-23 05:16:54 +00:00
parent 469d119ab9
commit b8f7b97321
2 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Tue Dec 23 13:52:05 2008 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/parser/c.rb: Don't coalesce adjacent comment blocks.
[bug#901]
Tue Dec 23 12:00:00 2008 Tanaka Akira <akr@fsij.org> Tue Dec 23 12:00:00 2008 Tanaka Akira <akr@fsij.org>
* io.c (pipe_close): fix coding style. [ruby-dev:37554] * io.c (pipe_close): fix coding style. [ruby-dev:37554]

4
lib/rdoc/parser/c.rb
View file

@ -270,7 +270,7 @@ class RDoc::Parser::C < RDoc::Parser
def find_body(class_name, meth_name, meth_obj, body, quiet = false) def find_body(class_name, meth_name, meth_obj, body, quiet = false)
case body 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 \s*(\([^)]*\))([^;]|$)"xm
comment, params = $1, $2 comment, params = $1, $2
body_text = $& body_text = $&
@ -425,7 +425,7 @@ class RDoc::Parser::C < RDoc::Parser
def find_override_comment(class_name, meth_name) def find_override_comment(class_name, meth_name)
name = Regexp.escape(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 $1
elsif @content =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m then elsif @content =~ %r{Document-method:\s#{name}\s*?\n((?>.*?\*/))}m then
$1 $1