From 39c4d6928ba085665b5a02d9386091b81745e02a Mon Sep 17 00:00:00 2001 From: nobu Date: Sun, 21 Dec 2008 05:55:20 +0000 Subject: [PATCH] * lib/optparse.rb (SPLAT_PROC): splat values by hand. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@20902 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 8 ++------ lib/optparse.rb | 6 +++--- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index eb330d137d..165f47ae12 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,10 +1,6 @@ -Sun Dec 21 14:48:51 2008 TAKAO Kouji +Sun Dec 21 14:55:18 2008 Nobuyoshi Nakada - * test/readline/test_readline_history.rb: checked encoding. - -Sun Dec 21 14:45:58 2008 Nobuyoshi Nakada - - * lib/optparse.rb (parse_in_order): splat values to be passed. + * lib/optparse.rb (SPLAT_PROC): splat values by hand. Sun Dec 21 13:50:37 2008 TAKAO Kouji diff --git a/lib/optparse.rb b/lib/optparse.rb index 446039116a..e52d5d2759 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -996,7 +996,7 @@ class OptionParser end private :notwice - SPLAT_PROC = proc {|*a| next *a} + SPLAT_PROC = proc {|*a| a.length <= 1 ? a.first : a} # # Creates an OptionParser::Switch from the parameters. The parsed argument # value is passed to the given block, where it can be processed. @@ -1263,7 +1263,7 @@ class OptionParser end begin opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)} - val = cb.call(*val) if cb + val = cb.call(val) if cb setter.call(sw.switch_name, val) if setter rescue ParseError raise $!.set_option(arg, rest) @@ -1294,7 +1294,7 @@ class OptionParser opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq} raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}" argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-' - val = cb.call(*val) if cb + val = cb.call(val) if cb setter.call(sw.switch_name, val) if setter rescue ParseError raise $!.set_option(arg, arg.length > 2)