* optparse.rb (OptionParser::Completion::convert): returned all

  values not first one.

* optparse.rb (OptionParser::Switch::parse): return values as is.

* optparse.rb (OptionParser::order): ditto.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@2694 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 7 insertions, 7 deletions

diff --git a/lib/optparse.rb b/lib/optparse.rb
index e4f0998fcf..f93000e855 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -106,7 +106,7 @@ Keyword completion module.
     Extracts the first element from result of
     ((<OptionParser::Completion#complete>)).
 =end #'#"#`#
-    def convert(opt = nil, *val)
+    def convert(opt = nil, val = nil, *)
       val
     end
   end
@@ -210,8 +210,8 @@ Individual switch class.
 =end #'#"#`#
     def parse(arg, *val)
       if block
-	*val = conv.yield(*val) if conv
-	return arg, block, *val
+	val = conv.yield(*val) if conv
+	return arg, block, val
       else
 	return arg, nil
       end
@@ -1075,8 +1075,8 @@ Default options, which never appear in option summary.
 	    raise $!.set_option(arg, true)
 	  end
 	  begin
-	    opt, sw, *val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-	    sw.yield(*val) if sw
+	    opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
+	    sw.yield(val) if sw
 	  rescue ParseError
 	    raise $!.set_option(arg, rest)
 	  end
@@ -1102,10 +1102,10 @@ Default options, which never appear in option summary.
 	    raise $!.set_option(arg, true)
 	  end
 	  begin
-	    opt, sw, *val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
+	    opt, sw, 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-*/, '-')) != '-'
-	    sw.yield(*val) if sw
+	    sw.yield(val) if sw
 	  rescue ParseError
 	    raise $!.set_option(arg, has_arg)
 	  end