diff options
| author | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-23 05:16:54 +0000 |
|---|---|---|
| committer | drbrain <drbrain@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-23 05:16:54 +0000 |
| commit | b8f7b97321b6dd7ba62f6ffe6138ef906b37c57d (patch) | |
| tree | 41f2519b71c91d345fc01f1a4a068287de6a1b3e | |
| parent | 469d119ab9913f0f41e9c060de630426196ee3ab (diff) | |
Don't coalesce adjacent comment blocks. [bug#901]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/rdoc/parser/c.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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> * io.c (pipe_close): fix coding style. [ruby-dev:37554] diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb index 9061841bec..933838debd 100644 --- a/lib/rdoc/parser/c.rb +++ b/lib/rdoc/parser/c.rb @@ -270,7 +270,7 @@ class RDoc::Parser::C < RDoc::Parser 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 @@ class RDoc::Parser::C < RDoc::Parser 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 |