diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/optparse.rb | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index 18ffe123e7..6668f30c8b 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -441,15 +441,12 @@ class OptionParser # # Raises an exception if argument is not present. # - def parse(arg, argv, &error) - opt = (val = parse_arg(val, &error))[1] - val = conv_arg(*val) - if opt and !arg - argv.shift - else - val[0] = nil + def parse(arg, argv) + unless arg + raise MissingArgument if argv.empty? + arg = argv.shift end - val + conv_arg(*parse_arg(arg) {|*exc| raise(*exc)}) end end @@ -472,7 +469,7 @@ class OptionParser # # Switch that takes an argument, which does not begin with '-'. # - class PlacedArgument < RequiredArgument + class PlacedArgument < self # # Returns nil if argument is not present or begins with '-'. # @@ -480,7 +477,14 @@ class OptionParser if !(val = arg) and (argv.empty? or /\A-/ =~ (val = argv[0])) return nil, block, nil end - super + opt = (val = parse_arg(val, &error))[1] + val = conv_arg(*val) + if opt and !arg + argv.shift + else + val[0] = nil + end + val end end end |