diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:15 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2008-11-18 16:48:15 +0000 |
commit | b0722f60637313cc0dbc93533831128ad8266760 (patch) | |
tree | 76b375eab548c3864ef1dd3a619a6b564d6d81fd /lib/optparse.rb | |
parent | 7e5c0ea08761514713fc176dfe35741829fe8999 (diff) |
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: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20269 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/optparse.rb')
-rw-r--r-- | lib/optparse.rb | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index 5a86194b7e..0548a29cac 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 |