summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-12 14:34:26 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-12-12 14:34:26 +0000
commit5bd2003ad50667ee074a24be937b437220f6f10b (patch)
tree61c5e5afb94111e4d80cc322a903823227036005 /lib
parent857e1e403bc7edc28ae183540248f59895889b1c (diff)
downloadruby-5bd2003ad50667ee074a24be937b437220f6f10b.tar.gz
ruby-5bd2003ad50667ee074a24be937b437220f6f10b.tar.xz
ruby-5bd2003ad50667ee074a24be937b437220f6f10b.zip
* lib/optparse.rb (Switch#parse_arg, Switch#conv_arg): splat failures.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@11381 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r--lib/optparse.rb6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 4cab6928b..91520479e 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -321,10 +321,10 @@ class OptionParser
# argument pattern. Yields when the pattern doesn't match substring.
#
def parse_arg(arg)
- pattern or return nil, arg
+ pattern or return nil, [arg]
unless m = pattern.match(arg)
yield(InvalidArgument, arg)
- return arg, nil
+ return arg, []
end
if String === m
m = [s = m]
@@ -345,7 +345,7 @@ class OptionParser
# conversion. Yields at semi-error condition instead of raising an
# exception.
#
- def conv_arg(arg, val = nil)
+ def conv_arg(arg, val = [])
if conv
val = conv.call(*val)
else