summaryrefslogtreecommitdiff
path: root/lib/optparse.rb
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-29 21:35:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2003-05-29 21:35:50 +0000
commit4ca5e66ee793f0c8b7f96d4f82d813c8f98a26be (patch)
tree7435d7580b806442ac004b4fd94f0d2ff9034cdc /lib/optparse.rb
parentf130d47f6a60228933c451f82b6a1da7fc1d69e2 (diff)
backout
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3879 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/optparse.rb')
-rw-r--r--lib/optparse.rb10
1 files changed, 5 insertions, 5 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 0b11915133..e9a7138d76 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -223,7 +223,7 @@ Individual switch class.
def parse(arg, *val)
if block
val = conv.call(*val) if conv
- return arg, block, *val
+ return arg, block, val
else
return arg, nil
end
@@ -1122,8 +1122,8 @@ Default options, which never appear in option summary.
raise $!.set_option(arg, true)
end
begin
- opt, sw, *val = sw.parse(rest, argv) {|*exc| raise(*exc)}
- sw.call(*val) if sw
+ opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
+ sw.call(val) if sw
rescue ParseError
raise $!.set_option(arg, rest)
end
@@ -1149,10 +1149,10 @@ Default options, which never appear in option summary.
raise $!.set_option(arg, true)
end
begin
- opt, sw, *val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
+ opt, sw, 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-*/, '-')) != '-'
- sw.call(*val) if sw
+ sw.call(val) if sw
rescue ParseError
raise $!.set_option(arg, has_arg)
end