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

* lib/optparse.rb (OptionParser#parse_in_order): do not make an

Browse source 
option from non-option argument.  [ruby-dev:38333]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23286 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-04-26 06:13:11 +00:00
parent cde360334d
commit a20f1713c3
4 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
Sun Apr 26 15:13:09 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* lib/optparse.rb (OptionParser#parse_in_order): do not make an
option from non-option argument. [ruby-dev:38333]
Sat Apr 25 19:11:13 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (ac_cv_func_daemon): use daemon(3) only on *BSD.

2
lib/optparse.rb
View file

@ -1304,7 +1304,7 @@ class OptionParser
begin
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-*/, '-')) != '-'
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

2
test/optparse/test_optparse.rb
View file

@ -8,6 +8,8 @@ class TestOptionParser < Test::Unit::TestCase
end
def no_error(*args)
assert_nothing_raised(*args) {return yield}
ensure
$!.backtrace.delete_if {|e| /\A#{Regexp.quote(__FILE__)}:#{__LINE__-2}/o =~ e} if $!
end
def test_permute

8
test/optparse/test_placearg.rb
View file

@ -5,6 +5,7 @@ class TestOptionParser::PlaceArg < TestOptionParser
super
@opt.def_option("-x [VAL]") {|x| @flag = x}
@opt.def_option("--option [VAL]") {|x| @flag = x}
@opt.def_option("-T [level]", /^[0-4]$/, Integer) {|x| @topt = x}
@opt.def_option("-n") {}
end
@ -42,4 +43,11 @@ class TestOptionParser::PlaceArg < TestOptionParser
assert_equal(%w"", no_error {@opt.parse!(%w"--opt bar")})
assert_equal("bar", @flag)
end
def test_conv
assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T te.rb")})
assert_nil(@topt)
assert_equal(%w"te.rb", no_error('[ruby-dev:38333]') {@opt.parse!(%w"-T1 te.rb")})
assert_equal(1, @topt)
end
end