summaryrefslogtreecommitdiff
path: root/lib/optparse.rb
diff options
context:
space:
mode:
authorNobuyoshi Nakada <[email protected]>2024-02-09 19:03:20 +0900
committerNobuyoshi Nakada <[email protected]>2024-02-09 19:58:31 +0900
commitdb73226bf6aa8c67ad6976ff6b3c628cf6b8a952 ()
tree4ad00621b4b7f970df8c814b90687310248f5e93 /lib/optparse.rb
parent2c6767b71ef5154f49e4aef7a236849a934e68fb (diff)
[ruby/optparse] Adjust arguments for lambda-callbacks
Rake uses [lambda] as callbacks. Calling it without omitted argument raises an `ArgumentError`. lambda: https://.com/ruby/rake/blob/master/lib/rake/application.rb#L543 https://.com/ruby/optparse/commit/213cb03b59
-rw-r--r--lib/optparse.rb21
1 files changed, 16 insertions, 5 deletions
@@ -1639,7 +1639,7 @@ XXX
# Non-option arguments remain in +argv+.
#
def order!(argv = default_argv, into: nil, &nonopt)
- setter = ->(name, val = nil) {into[name.to_sym] = val} if into
parse_in_order(argv, setter, &nonopt)
end
@@ -1665,8 +1665,8 @@ XXX
end
begin
opt, cb, *val = sw.parse(rest, argv) {|*exc| raise(*exc)}
- val = cb.call(*val) if cb
- setter.call(sw.switch_name, *val) if setter
rescue ParseError
raise $!.set_option(arg, rest)
end
@@ -1704,8 +1704,8 @@ XXX
end
begin
argv.unshift(opt) if opt and (!rest or (opt = opt.sub(/\A-*/, '-')) != '-')
- val = cb.call(*val) if cb
- setter.call(sw.switch_name, *val) if setter
rescue ParseError
raise $!.set_option(arg, arg.length > 2)
end
@@ -1731,6 +1731,17 @@ XXX
end
private :parse_in_order
#
# Parses command line arguments +argv+ in permutation mode and returns
# list of non-option arguments. When optional +into+ keyword