1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

Restore missing line to RDoc::Generator#params. Patch by Lincoln Stoll.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@15735 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
drbrain 2008-03-09 04:52:53 +00:00
parent 861219ce4a
commit 74a1543645
2 changed files with 13 additions and 7 deletions

View file

@ -1,3 +1,8 @@
Sun Mar 9 13:51:21 2008 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/generator.rb: Restore missing line to #params. Patch by
Lincoln Stoll <lstoll at lstoll.net>
Sun Mar 9 09:52:00 2008 Eric Hodel <drbrain@segment7.net> Sun Mar 9 09:52:00 2008 Eric Hodel <drbrain@segment7.net>
* lib/rdoc/code_objects.rb: Remove debugging Kernel#p. Patch by * lib/rdoc/code_objects.rb: Remove debugging Kernel#p. Patch by

View file

@ -921,26 +921,27 @@ module RDoc::Generator
def params def params
# params coming from a call-seq in 'C' will start with the # params coming from a call-seq in 'C' will start with the
# method name # method name
if p !~ /^\w/ params = @context.params
p = @context.params.gsub(/\s*\#.*/, '') if params !~ /^\w/
p = p.tr("\n", " ").squeeze(" ") params = @context.params.gsub(/\s*\#.*/, '')
p = "(" + p + ")" unless p[0] == ?( params = params.tr("\n", " ").squeeze(" ")
params = "(" + params + ")" unless params[0] == ?(
if (block = @context.block_params) if (block = @context.block_params)
# If this method has explicit block parameters, remove any # If this method has explicit block parameters, remove any
# explicit &block # explicit &block
p.sub!(/,?\s*&\w+/, '') params.sub!(/,?\s*&\w+/, '')
block.gsub!(/\s*\#.*/, '') block.gsub!(/\s*\#.*/, '')
block = block.tr("\n", " ").squeeze(" ") block = block.tr("\n", " ").squeeze(" ")
if block[0] == ?( if block[0] == ?(
block.sub!(/^\(/, '').sub!(/\)/, '') block.sub!(/^\(/, '').sub!(/\)/, '')
end end
p << " {|#{block.strip}| ...}" params << " {|#{block.strip}| ...}"
end end
end end
CGI.escapeHTML(p) CGI.escapeHTML(params)
end end
def create_source_code_file(code_body) def create_source_code_file(code_body)