* lib/optparse.rb: suppress `assigning void value' warning.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@10883 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
d1cb9e75d0
commit
58b0275a4c
@ -1,3 +1,7 @@
|
|||||||
|
Fri Sep 8 08:25:39 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||||
|
|
||||||
|
* lib/optparse.rb: suppress `assigning void value' warning.
|
||||||
|
|
||||||
Fri Sep 8 01:16:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
Fri Sep 8 01:16:34 2006 Yukihiro Matsumoto <matz@ruby-lang.org>
|
||||||
|
|
||||||
* array.c (Init_Array): #to_s to be an alias to #inspect.
|
* array.c (Init_Array): #to_s to be an alias to #inspect.
|
||||||
|
@ -786,7 +786,7 @@ class OptionParser
|
|||||||
def add_officious # :nodoc:
|
def add_officious # :nodoc:
|
||||||
list = base()
|
list = base()
|
||||||
Officious.each do |opt, block|
|
Officious.each do |opt, block|
|
||||||
list.long[opt] ||= block.yield(self)
|
list.long[opt] ||= block.call(self)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -1251,7 +1251,7 @@ class OptionParser
|
|||||||
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.call(val) if sw
|
||||||
rescue ParseError
|
rescue ParseError
|
||||||
raise $!.set_option(arg, rest)
|
raise $!.set_option(arg, rest)
|
||||||
end
|
end
|
||||||
@ -1281,7 +1281,7 @@ class OptionParser
|
|||||||
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.call(val) if sw
|
||||||
rescue ParseError
|
rescue ParseError
|
||||||
raise $!.set_option(arg, arg.length > 2)
|
raise $!.set_option(arg, arg.length > 2)
|
||||||
end
|
end
|
||||||
@ -1290,9 +1290,9 @@ class OptionParser
|
|||||||
else
|
else
|
||||||
catch(:prune) do
|
catch(:prune) do
|
||||||
visit(:each_option) do |sw|
|
visit(:each_option) do |sw|
|
||||||
sw.block.yield(arg) if Switch === sw and sw.match_nonswitch?(arg)
|
sw.block.call(arg) if Switch === sw and sw.match_nonswitch?(arg)
|
||||||
end
|
end
|
||||||
nonopt.yield(arg)
|
nonopt.call(arg)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@ -1300,7 +1300,7 @@ class OptionParser
|
|||||||
nil
|
nil
|
||||||
}
|
}
|
||||||
|
|
||||||
visit(:search, :short, nil) {|sw| sw.block.yield(argv) if !sw.pattern}
|
visit(:search, :short, nil) {|sw| sw.block.call(argv) if !sw.pattern}
|
||||||
|
|
||||||
argv
|
argv
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user