From 7050069d8020684af2979cbf67b7702d4f7823fd Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 27 Nov 2010 02:29:26 +0000
Subject: * lib/optparse.rb (OptionParser#candidate): get rid of 1.9 syntax  
 so that BASERUBY can be 1.8.

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

(limited to 'lib/optparse.rb')

diff --git a/lib/optparse.rb b/lib/optparse.rb
index b21bd935c7..91308a9aef 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1549,10 +1549,10 @@ XXX
     end
     pat = Completion.regexp(word, true)
     visit(:each_option) do |opt|
-      opts = [*(opt.long if long), *(opt.short if short)]
+      opts = (long ? opt.long : []) + (short ? opt.short [])
       opts = Completion.candidate(word, true, pat, &opts.method(:each)).map(&:first) if pat
       if /\A=/ =~ opt.arg
-        opts = opts.map {|sw| sw + "="}
+        opts.map! {|sw| sw + "="}
         if arg and CompletingHash === opt.pattern
           if opts = opt.pattern.candidate(arg, false, argpat)
             opts.map!(&:last)
-- 
cgit v1.2.3