backout
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@3615 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
80a97f173f
commit
8478ba513f
@ -1118,7 +1118,7 @@ Default options, which never appear in option summary.
|
|||||||
end
|
end
|
||||||
begin
|
begin
|
||||||
opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
|
opt, sw, val = sw.parse(rest, argv) {|*exc| raise(*exc)}
|
||||||
sw.yield(*val) if sw
|
sw.yield(val) if sw
|
||||||
rescue ParseError
|
rescue ParseError
|
||||||
raise $!.set_option(arg, rest)
|
raise $!.set_option(arg, rest)
|
||||||
end
|
end
|
||||||
@ -1147,7 +1147,7 @@ Default options, which never appear in option summary.
|
|||||||
opt, sw, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
|
opt, sw, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq}
|
||||||
raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
|
raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}"
|
||||||
argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
|
argv.unshift(opt) if opt and (opt = opt.sub(/\A-*/, '-')) != '-'
|
||||||
sw.yield(*val) if sw
|
sw.yield(val) if sw
|
||||||
rescue ParseError
|
rescue ParseError
|
||||||
raise $!.set_option(arg, has_arg)
|
raise $!.set_option(arg, has_arg)
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user