diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-12 14:34:26 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-12 14:34:26 +0000 |
| commit | 5bd2003ad50667ee074a24be937b437220f6f10b (patch) | |
| tree | 61c5e5afb94111e4d80cc322a903823227036005 | |
| parent | 857e1e403bc7edc28ae183540248f59895889b1c (diff) | |
| download | ruby-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
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/optparse.rb | 6 |
2 files changed, 7 insertions, 3 deletions
@@ -1,3 +1,7 @@ +Tue Dec 12 23:33:53 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/optparse.rb (Switch#parse_arg, Switch#conv_arg): splat failures. + Mon Dec 11 11:51:10 2006 Akinori MUSHA <knu@iDaemons.org> * ext/digest/sha2/lib/sha2.rb: Moved one level up from under 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 |