From 8179b310371b4988fb758158ec2e3d8c696aa98e Mon Sep 17 00:00:00 2001
From: matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Sat, 8 Nov 2008 08:17:20 +0000
Subject: * lib/optparse.rb (OptionParser#make_switch): 1.9 Symbols respond  
 to :match.  a patch from keith cascio, <keith at ucla.edu>.  
 [ruby-core:19730]

git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@20149 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog       | 6 ++++++
 lib/optparse.rb | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index d5949aef3..182ae0b6a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Sat Nov  8 17:15:08 2008  Yukihiro Matsumoto  <matz@ruby-lang.org>
+
+	* 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@ruby-lang.org>
 
 	* ext/gdbm/gdbm.c (fgdbm_index): make #index warn like Hash.
diff --git a/lib/optparse.rb b/lib/optparse.rb
index a1a5d0032..5a86194b7 100644
--- a/lib/optparse.rb
+++ b/lib/optparse.rb
@@ -1074,7 +1074,7 @@ class OptionParser
       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
-- 
cgit