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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@23396 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

4 files changed, 16 insertions, 1 deletions

diff --git a/ChangeLog b/ChangeLog
index ac7595e4f2..5a8218d9c3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Apr 26 15:13:09 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb (OptionParser#parse_in_order): do not make an
+	  option from non-option argument.  [ruby-dev:38333]
+
 Sat Apr 25 19:11:13 2009  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* configure.in (ac_cv_func_daemon): use daemon(3) only on *BSD.
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 0397382a6b..33a65c455e 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
diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb
index 9c73399f5b..6aa8fac757 100644
--- a/test/optparse/test_optparse.rb
+++ b/test/optparse/test_optparse.rb
@@ -8,6 +8,8 @@ class TestOptionParser < Test::Unit::TestCase
   end
   def no_error(*args)
     assert_nothing_raised(*args) {return yield}
+  ensure
+    $!.backtrace.delete_if {|e| /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}/o =~ e} if $!
   end
 
   def test_permute
diff --git a/test/optparse/test_placearg.rb b/test/optparse/test_placearg.rb
index f4fd249b7f..ea5810cbc5 100644
--- a/test/optparse/test_placearg.rb
+++ b/test/optparse/test_placearg.rb
@@ -5,6 +5,7 @@ class TestOptionParser::PlaceArg < TestOptionParser
     super
     @opt.def_option("-x [VAL]") {|x| @flag = x}
     @opt.def_option("--option [VAL]") {|x| @flag = x}
+    @opt.def_option("-T [level]", /^[0-4]$/, Integer) {|x| @topt = x}
     @opt.def_option("-n") {}
   end
 
@@ -42,4 +43,11 @@ class TestOptionParser::PlaceArg < TestOptionParser
     assert_equal(%w"", no_error {@opt.parse!(%w"--opt bar")})
     assert_equal("bar", @flag)
   end
+
+  def test_conv
+    assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T te.rb")})
+    assert_nil(@topt)
+    assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T1 te.rb")})
+    assert_equal(1, @topt)
+  end
 end