diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-25 22:56:15 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2005-09-25 22:56:15 +0000 |
commit | cd5a5a30c026d898a5637bbc1897b71ba7302437 (patch) | |
tree | 641f709a369f3f77df9ac89d0f9e4c52d6148a3d /lib | |
parent | 977176d702da8ce0317285f4449c795d277c2d09 (diff) | |
download | ruby-cd5a5a30c026d898a5637bbc1897b71ba7302437.tar.gz |
* lib/optparse.rb (RequiredArgument#parse): not consume unmatched
argument. fixed [ruby-dev:27316]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@9313 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/optparse.rb | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index 21d07c4665..7135c79b34 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -454,11 +454,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 @@ -479,24 +482,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 |