diff options
author | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-20 11:42:39 +0000 |
---|---|---|
committer | shyouhei <shyouhei@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-02-20 11:42:39 +0000 |
commit | 54b82ec9e9b7c5842dbb6d23fb907b7b8e76096e (patch) | |
tree | 5fd16d3ffc43f714bbc4326c95a5c6b40ea12167 /lib | |
parent | b0fc5e541e1c55f9ec89aec5d0dd31178f6fbec9 (diff) |
merge revision(s) 21066:
* lib/optparse.rb (OptionParser::List#summarize): gives priority
to latter switches. [ruby-dev:36692]
* lib/optparse.rb (OptionParser#summarize): do not append
unnecessary line terminator.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_6@22467 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/optparse.rb | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index 80b16fa18d..d4500266d5 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -630,15 +630,19 @@ class OptionParser # method which is called on every option. # def summarize(*args, &block) - list.each do |opt| + sum = [] + list.reverse_each do |opt| if opt.respond_to?(:summarize) # perhaps OptionParser::Switch - opt.summarize(*args, &block) + s = [] + opt.summarize(*args) {|l| s << l} + sum.concat(s.reverse) elsif !opt or opt.empty? - yield("") + sum << "" else - opt.each(&block) + sum.concat(opt.to_a.reverse) end end + sum.reverse_each(&block) end def add_banner(to) # :nodoc: @@ -960,7 +964,8 @@ class OptionParser # +indent+:: Indentation, defaults to @summary_indent. # def summarize(to = [], width = @summary_width, max = width - 1, indent = @summary_indent, &blk) - visit(:summarize, {}, {}, width, max, indent, &(blk || proc {|l| to << l + $/})) + blk ||= proc {|l| to << (l.index($/, -1) ? l : l + $/)} + visit(:summarize, {}, {}, width, max, indent, &blk) to end |