1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

* 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
This commit is contained in:
nobu 2007-04-20 03:26:19 +00:00
parent 47807a7b44
commit 2a50650ceb
2 changed files with 6 additions and 2 deletions

View file

@ -1,3 +1,7 @@
Fri Apr 20 12:27:04 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb: fix to override conv proc.
Fri Apr 20 12:17:05 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ruby_cleanup): inversed the order of errinfos.

View file

@ -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