From 2dd91facca2337ff611489f1ccd84441d8fc9bf2 Mon Sep 17 00:00:00 2001 From: ko1 Date: Thu, 19 Apr 2007 08:48:03 +0000 Subject: [PATCH] * lib/optparse.rb: fix to override conv proc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@12194 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/optparse.rb | 2 +- version.h | 6 +++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6c012d7be..85231086f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Thu Apr 19 17:46:36 2007 Koichi Sasada + + * lib/optparse.rb: fix to override conv proc. + Wed Apr 18 10:41:21 2007 Nobuyoshi Nakada * util.c (ruby_strtod): exponent is radix 10. [ruby-talk:248272] diff --git a/lib/optparse.rb b/lib/optparse.rb index fd0ca70d5a..1808487337 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1089,7 +1089,7 @@ class OptionParser when CompletingHash when nil pattern = CompletingHash.new - conv ||= pattern.method(:convert).to_proc if pattern.respond_to?(:convert) + conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert) else raise ArgumentError, "argument pattern given twice" end diff --git a/version.h b/version.h index 6d13ceb212..a9e65bde19 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ #define RUBY_VERSION "1.9.0" -#define RUBY_RELEASE_DATE "2007-04-18" +#define RUBY_RELEASE_DATE "2007-04-19" #define RUBY_VERSION_CODE 190 -#define RUBY_RELEASE_CODE 20070418 +#define RUBY_RELEASE_CODE 20070419 #define RUBY_PATCHLEVEL 0 #define RUBY_VERSION_MAJOR 1 @@ -9,7 +9,7 @@ #define RUBY_VERSION_TEENY 0 #define RUBY_RELEASE_YEAR 2007 #define RUBY_RELEASE_MONTH 4 -#define RUBY_RELEASE_DAY 18 +#define RUBY_RELEASE_DAY 19 RUBY_EXTERN const char ruby_version[]; RUBY_EXTERN const char ruby_release_date[];