diff options
| author | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-05 01:41:25 +0000 |
|---|---|---|
| committer | hsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-09-05 01:41:25 +0000 |
| commit | d42d6e690e3f553b971322eae783ac6b0d4d9692 (patch) | |
| tree | 2004bf4517ee7b81466c300cf30092e62e65467e /lib/rdoc/parser/c.rb | |
| parent | 670c6e8ce9d4a12bb4832e10fab27365398649bf (diff) | |
* lib/rdoc.rb, lib/rdoc, test/rdoc: Update to RDoc 4.2.0.alpha(313287)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47391 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rdoc/parser/c.rb')
| -rw-r--r-- | lib/rdoc/parser/c.rb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/rdoc/parser/c.rb b/lib/rdoc/parser/c.rb index f7d0a9afa0..dd3ba5efdb 100644 --- a/lib/rdoc/parser/c.rb +++ b/lib/rdoc/parser/c.rb @@ -594,9 +594,10 @@ class RDoc::Parser::C < RDoc::Parser \s*#{attr_name}\s*, #{rw},.*?\)\s*;%xm then $1 - elsif @content =~ %r%Document-attr:\s#{attr_name}\s*?\n - ((?>.*?\*/))%xm then - $1 + elsif @content =~ %r%(/\*.*?(?:\s*\*\s*)?) + Document-attr:\s#{attr_name}\s*?\n + ((?>(.|\n)*?\*/))%x then + "#{$1}\n#{$2}" else '' end @@ -610,7 +611,7 @@ class RDoc::Parser::C < RDoc::Parser def find_body class_name, meth_name, meth_obj, file_content, quiet = false case file_content when %r%((?>/\*.*?\*/\s*)?) - ((?:(?:static|SWIGINTERN)\s+)? + ((?:(?:\w+)\s+)? (?:intern\s+)?VALUE\s+#{meth_name} \s*(\([^)]*\))([^;]|$))%xm then comment = RDoc::Comment.new $1, @top_level @@ -1185,7 +1186,6 @@ class RDoc::Parser::C < RDoc::Parser if hash then args << "p#{position} = {}" - position += 1 end args << '&block' if block |