matz	2008-11-08 17:17:20 +0900 (Sat, 08 Nov 2008)

  New Revision: 20149

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

  Log:
    * lib/optparse.rb (OptionParser#make_switch): 1.9 Symbols respond
      to :match.  a patch from keith cascio, <keith at ucla.edu>.
      [ruby-core:19730]

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

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 20148)
+++ ChangeLog	(revision 20149)
@@ -1,3 +1,9 @@
+Sat Nov  8 17:15:08 2008  Yukihiro Matsumoto  <matz@r...>
+
+	* lib/optparse.rb (OptionParser#make_switch): 1.9 Symbols respond
+	  to :match.  a patch from keith cascio, <keith at ucla.edu>.
+	  [ruby-core:19730]
+
 Sat Nov  8 12:10:15 2008  Yukihiro Matsumoto  <matz@r...>
 
 	* ext/gdbm/gdbm.c (fgdbm_index): make #index warn like Hash.
Index: lib/optparse.rb
===================================================================
--- lib/optparse.rb	(revision 20148)
+++ lib/optparse.rb	(revision 20149)
@@ -1074,7 +1074,7 @@
       end
 
       # directly specified pattern(any object possible to match)
-      if !(String === o) and o.respond_to?(:match)
+      if (!(String === o || Symbol === o)) and o.respond_to?(:match)
         pattern = notwice(o, pattern, 'pattern')
         conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert)
         next

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