From 2a50650ceb893ec7ea22bdab65a39dcc921bafe4 Mon Sep 17 00:00:00 2001 From: nobu Date: Fri, 20 Apr 2007 03:26:19 +0000 Subject: [PATCH] * lib/optparse.rb: fix to override conv proc. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@12203 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 4 ++++ lib/optparse.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84671e90ee..4efb6226c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada + + * lib/optparse.rb: fix to override conv proc. + Fri Apr 20 12:17:05 2007 Nobuyoshi Nakada * eval.c (ruby_cleanup): inversed the order of errinfos. diff --git a/lib/optparse.rb b/lib/optparse.rb index 5013700ae2..0c4b484e02 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1077,7 +1077,7 @@ class OptionParser # directly specified pattern(any object possible to match) if !(String === o) and o.respond_to?(:match) pattern = notwice(o, pattern, 'pattern') - conv ||= pattern.method(:convert).to_proc if pattern.respond_to?(:convert) + conv = pattern.method(:convert).to_proc if pattern.respond_to?(:convert) next end @@ -1090,7 +1090,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