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 | 8a82b4802d7c2263e585a795c28cc3a856ff5f02 (patch) | |
| tree | 41f2519b71c91d345fc01f1a4a068287de6a1b3e /lib | |
| parent | 1fb102fd2e3566d4fe37af9ef0cb421b52843138 (diff) | |
| download | ruby-8a82b4802d7c2263e585a795c28cc3a856ff5f02.tar.gz ruby-8a82b4802d7c2263e585a795c28cc3a856ff5f02.tar.xz ruby-8a82b4802d7c2263e585a795c28cc3a856ff5f02.zip | |
Don't coalesce adjacent comment blocks. [bug#901]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20932 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/rdoc/parser/c.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb index 9061841be..933838deb 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 |