diff options
| -rw-r--r-- | lib/optparse.rb | 5 | ||||
| -rw-r--r-- | test/optparse/test_optparse.rb | 8 |
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb index 8b0991506a..ad20ce77a4 100644 --- a/lib/optparse.rb +++ b/lib/optparse.rb @@ -1646,7 +1646,12 @@ XXX end begin opt, cb, val = sw.parse(val, argv) {|*exc| raise(*exc) if eq} + rescue ParseError + raise $!.set_option(arg, arg.length > 2) + else raise InvalidOption, arg if has_arg and !eq and arg == "-#{opt}" + 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 diff --git a/test/optparse/test_optparse.rb b/test/optparse/test_optparse.rb index fec14fc318..5f5ea183b0 100644 --- a/test/optparse/test_optparse.rb +++ b/test/optparse/test_optparse.rb @@ -97,4 +97,12 @@ class TestOptionParser < Test::Unit::TestCase assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-zr foo))} assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-z foo))} end + + def test_nonopt_pattern + @opt.def_option(/^[^-]/) do |arg| + assert(false, "Never gets called") + end + e = assert_raise(OptionParser::InvalidOption) {@opt.parse(%w(-t))} + assert_equal(["-t"], e.args) + end end |