nobu	2010-11-27 11:29:26 +0900 (Sat, 27 Nov 2010)

  New Revision: 29945

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=29945

  Log:
    * lib/optparse.rb (OptionParser#candidate): get rid of 1.9 syntax
      so that BASERUBY can be 1.8.

  Modified files:
    trunk/ChangeLog
    trunk/lib/optparse.rb

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 29944)
+++ ChangeLog	(revision 29945)
@@ -1,3 +1,8 @@
+Sat Nov 27 11:29:24 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/optparse.rb (OptionParser#candidate): get rid of 1.9 syntax
+	  so that BASERUBY can be 1.8.
+
 Sat Nov 27 08:16:21 2010  Nobuyoshi Nakada  <nobu@r...>
 
 	* addr2line.c (rb_dump_backtrace_with_lines): should close fd on
Index: lib/optparse.rb
===================================================================
--- lib/optparse.rb	(revision 29944)
+++ lib/optparse.rb	(revision 29945)
@@ -1549,10 +1549,10 @@
     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)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/