diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/optparse.rb | 7 | ||||
| -rw-r--r-- | version.h | 6 |
3 files changed, 14 insertions, 4 deletions
@@ -1,3 +1,8 @@ +Tue Nov 18 09:42:11 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/optparse.rb (OptionParser::make_switch): makes default + conversion to splat. [ruby-list:45645] + Mon Nov 17 18:05:16 2008 Nobuyoshi Nakada <nobu@ruby-lang.org> * enc/depend (LIBS): fixed for disable-shared. [ruby-dev:37103] 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 @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2008-11-17" +#define RUBY_RELEASE_DATE "2008-11-18" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20081117 +#define RUBY_RELEASE_CODE 20081118 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2008 #define RUBY_RELEASE_MONTH 11 -#define RUBY_RELEASE_DAY 17 +#define RUBY_RELEASE_DAY 18 #ifdef RUBY_EXTERN RUBY_EXTERN const char ruby_version[]; |