diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/optparse.rb | 26 |
2 files changed, 16 insertions, 15 deletions
@@ -1,3 +1,8 @@ +Mon Sep 26 07:55:06 2005 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/optparse.rb (RequiredArgument#parse): not consume unmatched + argument. fixed [ruby-dev:27316] + Sun Sep 25 12:05:10 2005 Masatoshi SEKI <m_seki@mva.biglobe.ne.jp> * bin/erb: typo fixed. diff --git a/lib/optparse.rb b/lib/optparse.rb index 8fc27f8cd3..18ffe123e7 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -442,11 +442,14 @@ class OptionParser # Raises an exception if argument is not present. # def parse(arg, argv, &error) - unless arg - raise MissingArgument if argv.empty? - arg = argv.shift + opt = (val = parse_arg(val, &error))[1] + val = conv_arg(*val) + if opt and !arg + argv.shift + else + val[0] = nil end - conv_arg(*parse_arg(arg, &error)) + val end end @@ -467,24 +470,17 @@ class OptionParser end # - # ? + # Switch that takes an argument, which does not begin with '-'. # - class PlacedArgument < self + class PlacedArgument < RequiredArgument # - # ? + # Returns nil if argument is not present or begins with '-'. # def parse(arg, argv, &error) if !(val = arg) and (argv.empty? or /\A-/ =~ (val = argv[0])) return nil, block, nil end - opt = (val = parse_arg(val, &error))[1] - val = conv_arg(*val) - if opt and !arg - argv.shift - else - val[0] = nil - end - val + super end end end |