From 392d9e755b281d9f1be59f44672bdc71f3f7c386 Mon Sep 17 00:00:00 2001 From: yugui Date: Tue, 18 Nov 2008 16:48:15 +0000 Subject: merges r20242 from trunk into ruby_1_9_1. recovers 1.8-compatible parsing for OptionParser. * lib/optparse.rb (OptionParser::make_switch): makes default conversion to splat. [ruby-list:45645] git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@20269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- lib/optparse.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'lib/optparse.rb') diff --git a/lib/optparse.rb b/lib/optparse.rb index 5a86194b7..0548a29ca 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -996,6 +996,7 @@ class OptionParser end private :notwice + SPLAT_PROC = proc {|*a| a} # # Creates an OptionParser::Switch from the parameters. The parsed argument # value is passed to the given block, where it can be processed. @@ -1076,7 +1077,11 @@ class OptionParser # directly specified pattern(any object possible 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) + if pattern.respond_to?(:convert) + conv = pattern.method(:convert).to_proc + else + conv = SPLAT_PROC + end next end -- cgit