diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:52:52 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-25 09:52:52 +0000 |
| commit | 298cae677d8e61168253bab7efe67a254afa10c7 (patch) | |
| tree | 0e0d031f5843c6aac44dfa53950c198cbbe92451 /lib | |
| parent | 299340c27000cd105ea3331579d50ee238f419e1 (diff) | |
merges r20932 from trunk into ruby_1_9_1.
Don't coalesce adjacent comment blocks. [bug#901]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21008 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 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 |