merge revision(s) 55228: [Backport #12438]

	* lib/optparse.rb (OptionParser::Completion.candidate): get rid of
	  nil as key names.  [ruby-core:75773] [Bug #12438]

	* lib/optparse.rb (OptionParser#make_switch): char class option
	  cannot be NoArgument, default to RequiredArgument.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_2@55364 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 18 insertions, 0 deletions

diff --git a/test/optparse/test_cclass.rb b/test/optparse/test_cclass.rb
new file mode 100644
index 0000000000..ac46f46bb2
--- /dev/null
+++ b/test/optparse/test_cclass.rb
@@ -0,0 +1,18 @@
+# frozen_string_literal: false
+require_relative 'test_optparse'
+
+class TestOptionParser::CClass < TestOptionParser
+  def test_no_argument
+    flags = []
+    @opt.def_option("-[a-z]") {|x| flags << x}
+    no_error {@opt.parse!(%w"-a")}
+    assert_equal(%w"a", flags)
+  end
+
+  def test_required_argument
+    flags = []
+    @opt.def_option("-[a-z]X") {|x| flags << x}
+    no_error {@opt.parse!(%w"-a")}
+    assert_equal(%w"a", flags)
+  end
+end