diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/optparse.rb | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,3 +1,8 @@ +Mon Apr 16 17:08:02 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/optparse.rb (make_switch): do not clobber converter if pattern + has no convert method. reported by sheepman in [ruby-dev:30709]. + Mon Apr 16 16:49:32 2007 Nobuyoshi Nakada <nobu@ruby-lang.org> * ext/stringio/stringio.c (strio_seek): consistent behavior with diff --git a/lib/optparse.rb b/lib/optparse.rb index 91520479e..fd0ca70d5 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1076,7 +1076,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 @@ -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 |