Allow --enable/--disable options to take an argument

[Bug #15850]
akkyta · May 15, 2019 · c9b28fd · c9b28fd
1 parent f54aa6c
commit c9b28fd
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/lib/optparse/ac.rb b/lib/optparse/ac.rb
@@ -13,15 +13,18 @@ def _check_ac_args(name, block)
     end
   end
 
+  ARG_CONV = proc {|val| val.nil? ? true : val}
+
   def _ac_arg_enable(prefix, name, help_string, block)
     _check_ac_args(name, block)
 
     sdesc = []
     ldesc = ["--#{prefix}-#{name}"]
     desc = [help_string]
     q = name.downcase
-    enable = Switch::NoArgument.new(nil, proc {true}, sdesc, ldesc, nil, desc, block)
-    disable = Switch::NoArgument.new(nil, proc {false}, sdesc, ldesc, nil, desc, block)
+    ac_block = proc {|val| block.call(ARG_CONV.call(val))}
+    enable = Switch::PlacedArgument.new(nil, ARG_CONV, sdesc, ldesc, nil, desc, ac_block)
+    disable = Switch::NoArgument.new(nil, proc {false}, sdesc, ldesc, nil, desc, ac_block)
     top.append(enable, [], ["enable-" + q], disable, ['disable-' + q])
     enable
   end

diff --git a/test/optparse/test_autoconf.rb b/test/optparse/test_autoconf.rb
@@ -32,6 +32,13 @@ def test_enable
     assert_equal(true, @bar)
   end
 
+  def test_enable_value
+    @opt.parse!(%w"--enable-foo=A")
+    assert_equal("A", @foo)
+    @opt.parse!(%w"--enable-bar=B")
+    assert_equal("B", @bar)
+  end
+
   def test_disable
     @opt.parse!(%w"--disable-foo")
     assert_equal(false, @foo)