diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:05:43 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-05-11 15:05:43 +0000 |
commit | 364d1f348170b43529694d23305116ccd505c511 (patch) | |
tree | e179d53157f350794c81d2e282f52db24bd89641 /lib | |
parent | 0c8adaa861067ff8e22d6329076889ab257bca04 (diff) | |
download | ruby-364d1f348170b43529694d23305116ccd505c511.tar.gz ruby-364d1f348170b43529694d23305116ccd505c511.tar.xz ruby-364d1f348170b43529694d23305116ccd505c511.zip |
merges r23286 from trunk into ruby_1_9_1.
--
* lib/optparse.rb (OptionParser#parse_in_order): do not make an
option from non-option argument. [ruby-dev:38333]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/optparse.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index 0397382a6..33a65c455 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1298,7 +1298,7 @@ class OptionParser begin opt, cb, 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-*/, '-')) != '-' + argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-') val = cb.call(val) if cb setter.call(sw.switch_name, val) if setter rescue ParseError |