summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-21 05:46:01 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2008-12-21 05:46:01 +0000
commitb3c3e87b70b52296cc04d7b7e6bc565f3730f849 (patch)
treec4769be127ab63b9b51f6136414314cc80a01efd /lib
parenta1bf58a86692b88a51ed2f6511941957dcca0f8f (diff)
downloadruby-b3c3e87b70b52296cc04d7b7e6bc565f3730f849.tar.gz
ruby-b3c3e87b70b52296cc04d7b7e6bc565f3730f849.tar.xz
ruby-b3c3e87b70b52296cc04d7b7e6bc565f3730f849.zip
* lib/optparse.rb (parse_in_order): splat values to be passed.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20900 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/optparse.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 134f1cf3b..446039116 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -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)