diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/optparse.rb | 24 |
1 files changed, 15 insertions, 9 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index f9d059cd29..0b11915133 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 @@ -343,11 +343,17 @@ Switch that can omit argument. class PlacedArgument < self def parse(arg, argv, &error) - unless arg - return nil, block, nil if argv.empty? or /\A-/ =~ argv[0] - arg = argv.shift + if !(val = arg) and (argv.empty? or /\A-/ =~ (val = argv[0])) + return nil, block, nil end - super(*parse_arg(arg, &error)) + if (val = parse_arg(val, &error))[1] + arg = nil + else + val[0] = arg + end + *val = super(*val) + argv.shift unless arg + val end end end @@ -1116,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 @@ -1143,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 |