summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2021-03-29 16:42:49 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2021-03-29 19:37:24 +0900
commite8317d90b0b102ba270b456cc6cb7c6865c6b448 (patch)
tree0889564769d0de1db072887223ce2e386c6d8ca6
parent2bbae0e91acf1090bbcea49476ef007162ec8e2b (diff)
[ruby/optparse] Fixed error message of unparsed non-option
Close https://github.com/ruby/optparse/issues/3 https://github.com/ruby/optparse/commit/94c5cf4032
-rw-r--r--lib/optparse.rb5
-rw-r--r--test/optparse/test_optparse.rb8
2 files changed, 13 insertions, 0 deletions
diff --git a/lib/optparse.rb b/lib/optparse.rb
index 8b09915..ad20ce7 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 fec14fc..5f5ea18 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