diff options
Diffstat (limited to 'lib/optparse.rb')
-rw-r--r-- | lib/optparse.rb | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index de88b648ec..a5905d2d4b 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -414,7 +414,11 @@ summary feature. pat = t if t.respond_to?(:match) end unless block +<<<<<<< optparse.rb + block = pat.method(:convert).to_block if pat.respond_to?(:convert) +======= block = pat.method(:convert).to_block if pat.respond_to?(:convert) +>>>>>>> 1.19 end @atype[t] = [pat, block] end @@ -949,7 +953,11 @@ Default options, which never appear in option summary. # directly specified pattern(any object possible to match) if !(String === o) and o.respond_to?(:match) pattern = notwice(o, pattern, 'pattern') +<<<<<<< optparse.rb + conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert)) +======= conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert)) +>>>>>>> 1.19 next end @@ -962,7 +970,11 @@ Default options, which never appear in option summary. when CompletingHash when nil pattern = CompletingHash.new +<<<<<<< optparse.rb + conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert)) +======= conv = (pattern.method(:convert).to_block if pattern.respond_to?(:convert)) +>>>>>>> 1.19 else raise ArgumentError, "argument pattern given twice" end |