diff options
| -rw-r--r-- | ChangeLog | 4 | ||||
| -rw-r--r-- | lib/optparse.rb | 4 |
2 files changed, 6 insertions, 2 deletions
@@ -1,3 +1,7 @@ +Fri Sep 29 09:29:45 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * lib/optparse.rb (parse_in_order): splat arguments to callback block. + Thu Sep 28 23:59:31 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * node.h (struct thread): declare win32_exception_list on cygwin and diff --git a/lib/optparse.rb b/lib/optparse.rb index 84b2066f27..cf0791863b 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1259,7 +1259,7 @@ class OptionParser end begin opt, cb, val = sw.parse(rest, argv) {|*exc| raise(*exc)} - val = cb.call(val) if cb + val = cb.call(*val) if cb setter.call(sw.switch_name, val) if setter rescue ParseError raise $!.set_option(arg, rest) @@ -1290,7 +1290,7 @@ class OptionParser opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq} raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}" argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-' - val = cb.call(val) if cb + val = cb.call(*val) if cb setter.call(sw.switch_name, val) if setter rescue ParseError raise $!.set_option(arg, arg.length > 2) |