From 166ee9719f323f7337124eb6288181d128fd4806 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: [PATCH] * lib/optparse.rb: splat parsed arguments.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       |  4 ++++
 lib/optparse.rb | 10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 351b1d18a3..d993b0eead 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Sep 10 09:19:47 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* lib/optparse.rb: splat parsed arguments.
+
 Tue Jan 10 09:18:03 2006  Nobuyoshi Nakada  <nobu@ruby-lang.org>
 
 	* eval.c (rb_require_safe): prevent extension from loading twice.
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 305f828e0e..e24d77e4e3 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