diff options
author | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-30 16:08:03 +0000 |
---|---|---|
committer | matz <matz@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2003-05-30 16:08:03 +0000 |
commit | 979f006b9e63cc787551d98b9bea9e94d61744de (patch) | |
tree | 8f8629ea50ad01c553bf56231af0b1f8a5d17287 /lib/optparse.rb | |
parent | 045eb9773e37dbe31c5ff595d380beb71ac62863 (diff) |
* io.c (rb_f_syscall): type dispatch should be based on
rb_check_string_type(), not FIXNUM_P(), because values may be a
bignum. [ruby-talk:72257]
* eval.c (rb_call0): should pass the current klass value to
block_invoke, which may be called via "super". [ruby-core:01077]
* eval.c (block_invoke): now takes 4th argument "klass".
* eval.c (block_alloc): should propagate BLOCK_PROC to
ruby_block.
* marshal.c (r_object0): should not use "yield" method, use "call"
instead. (ruby-bugs-ja PR#476)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3886 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
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 |