diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 11:16:16 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-12-26 11:16:16 +0000 |
commit | 8309a878a9c61726f03809cf918f17601b9e39c4 (patch) | |
tree | 4b47e8abb28c7cbf63fd5c83eae9405182f85a3f /lib | |
parent | d2165fe2bb2756c2f781c3255005476c90b02020 (diff) |
merges r21066 from trunk into ruby_1_9_1.
* 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_9_1@21070 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/optparse.rb | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index e52d5d2759..0397382a6b 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -631,17 +631,21 @@ 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 << "" elsif opt.respond_to?(:each_line) - opt.each_line(&block) + sum.concat([*opt.each_line].reverse) else - opt.each(&block) + sum.concat([*opt.each].reverse) end end + sum.reverse_each(&block) end def add_banner(to) # :nodoc: @@ -964,7 +968,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 |