From 1325437297539bf433904b64db63a3186e62177e Mon Sep 17 00:00:00 2001 From: drbrain Date: Sat, 10 Apr 2010 06:36:13 +0000 Subject: * lib/rdoc: Import RDoc 2.5.2 * lib/rdoc/parser/ruby.rb (RDoc::Parser::Ruby): Don't parse rdoc files, reverts r24976 in favor of include directive support in C parser. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@27283 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/rdoc/ri/driver.rb | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'lib/rdoc/ri/driver.rb') diff --git a/lib/rdoc/ri/driver.rb b/lib/rdoc/ri/driver.rb index d3620d4817..9083f6c67a 100644 --- a/lib/rdoc/ri/driver.rb +++ b/lib/rdoc/ri/driver.rb @@ -657,21 +657,13 @@ Options may also be set in the 'RI' environment variable. end out << RDoc::Markup::Rule.new(1) - if method.call_seq then - call_seq = method.call_seq.chomp.split "\n" - call_seq = call_seq.map { |line| [' ', line, "\n"] } - out << RDoc::Markup::Verbatim.new(*call_seq.flatten) + if method.arglists then + arglists = method.arglists.chomp.split "\n" + arglists = arglists.map { |line| [' ', line, "\n"] } + out << RDoc::Markup::Verbatim.new(*arglists.flatten) + out << RDoc::Markup::Rule.new(1) end - if method.block_params then - out << RDoc::Markup::BlankLine.new if method.call_seq - params = "yields: #{method.block_params}" - out << RDoc::Markup::Verbatim.new(' ', params, "\n") - end - - out << RDoc::Markup::Rule.new(1) if - method.call_seq or method.block_params - out << RDoc::Markup::BlankLine.new out << method.comment out << RDoc::Markup::BlankLine.new @@ -793,7 +785,7 @@ Options may also be set in the 'RI' environment variable. end methods.each do |item| - yield(*item) + yield(*item) # :yields: store, klass, ancestor, types, method end self -- cgit v1.2.3