From 1755b98599f3b7768972a8cfbc4f80f4c22bc0ea Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sun, 10 Sep 2006 00:20:03 +0000
Subject: * lib/optparse.rb: splat parsed arguments.

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 lib/optparse.rb | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib')

diff --git a/lib/optparse.rb b/lib/optparse.rb
index 305f828e0..e24d77e4e 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1250,8 +1250,8 @@ class OptionParser
             raise $!.set_option(arg, true)
           end
           begin
-            opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
-            sw.call(val) if sw
+            opt, sw, *val = sw.parse(rest, argv) {|*exc| raise(*exc)}
+            sw.call(*val) if sw
           rescue ParseError
             raise $!.set_option(arg, rest)
           end
@@ -1278,10 +1278,10 @@ class OptionParser
             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.call(val) if sw
+            sw.call(*val) if sw
           rescue ParseError
             raise $!.set_option(arg, arg.length > 2)
           end
@@ -1300,7 +1300,7 @@ class OptionParser
       nil
     }
 
-    visit(:search, :short, nil) {|sw| sw.block.call(argv) if !sw.pattern}
+    visit(:search, :short, nil) {|sw| sw.block.call(*argv) if !sw.pattern}
 
     argv
   end
-- 
cgit