1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

optparse.rb: froze string literals

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62047 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-01-26 03:41:04 +00:00
parent f36688449b
commit db1de35a31
2 changed files with 13 additions and 4 deletions

View file

@ -1,4 +1,4 @@
# frozen_string_literal: false # frozen_string_literal: true
# #
# optparse.rb - command-line option analysis with the OptionParser class. # optparse.rb - command-line option analysis with the OptionParser class.
# #
@ -577,7 +577,7 @@ class OptionParser
while s = lopts.shift while s = lopts.shift
l = left[-1].length + s.length l = left[-1].length + s.length
l += arg.length if left.size == 1 && arg l += arg.length if left.size == 1 && arg
l < max or sopts.empty? or left << '' l < max or sopts.empty? or left << +''
left[-1] << (left[-1].empty? ? ' ' * 4 : ', ') << s left[-1] << (left[-1].empty? ? ' ' * 4 : ', ') << s
end end
@ -1136,7 +1136,7 @@ XXX
# #
def banner def banner
unless @banner unless @banner
@banner = "Usage: #{program_name} [options]" @banner = +"Usage: #{program_name} [options]"
visit(:add_banner, @banner) visit(:add_banner, @banner)
end end
@banner @banner
@ -1180,7 +1180,7 @@ XXX
# #
def ver def ver
if v = version if v = version
str = "#{program_name} #{[v].join('.')}" str = +"#{program_name} #{[v].join('.')}"
str << " (#{v})" if v = release str << " (#{v})" if v = release
str str
end end

View file

@ -44,4 +44,13 @@ class TestOptionParser::SummaryTest < TestOptionParser
assert_equal("foo bar\n", o.to_s, bug6348) assert_equal("foo bar\n", o.to_s, bug6348)
assert_equal(["foo bar"], o.to_a, bug6348) assert_equal(["foo bar"], o.to_a, bug6348)
end end
def test_ver
o = OptionParser.new("foo bar")
o.program_name = "foo"
o.version = [0, 1]
assert_equal "foo 0.1", o.ver
o.release = "rel"
assert_equal "foo 0.1 (rel)", o.ver
end
end end