From a20f1713c3a86422c68ce1a9d93c32d5737328db Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 26 Apr 2009 06:13:11 +0000
Subject: * lib/optparse.rb (OptionParser#parse_in_order): do not make an  
 option from non-option argument.  [ruby-dev:38333]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/optparse.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'lib/optparse.rb')

diff --git a/lib/optparse.rb b/lib/optparse.rb
index ea1eaae52d..e701363e8b 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1304,7 +1304,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
-- 
cgit v1.2.3