Merge pull request #3083 from smowton/smowton/feature/cmdline-has-option

Add cmdlinet::has_option

Author: Daniel Kroening

src/util/cmdline.h

@@ -35,6 +35,11 @@ class cmdlinet
   virtual void set(const std::string &option, const std::string &value);
   virtual void clear();
 
+  bool has_option(const std::string &option) const
+  {
+    return getoptnr(option).has_value();
+  }
+
   typedef std::vector<std::string> argst;
   argst args;
   std::string unknown_arg;

unit/Makefile

@@ -29,6 +29,7 @@ SRC += analyses/ai/ai.cpp \
        solvers/refinement/string_refinement/sparse_array.cpp \
        solvers/refinement/string_refinement/substitute_array_list.cpp \
        solvers/refinement/string_refinement/union_find_replace.cpp \
+       util/cmdline.cpp \
        util/expr_cast/expr_cast.cpp \
        util/expr.cpp \
        util/file_util.cpp \

unit/util/cmdline.cpp

@@ -0,0 +1,19 @@
+/*******************************************************************\
+
+ Module: cmdlinet unit tests
+
+ Author: Diffblue Ltd.
+
+\*******************************************************************/
+
+#include <testing-utils/catch.hpp>
+#include <util/cmdline.h>
+
+TEST_CASE("cmdlinet::has_option", "[core][util][cmdline]")
+{
+  cmdlinet cmdline;
+  REQUIRE(!cmdline.parse(0, nullptr, "(a)(b):"));
+  REQUIRE(cmdline.has_option("a"));
+  REQUIRE(cmdline.has_option("b"));
+  REQUIRE(!cmdline.has_option("c"));
+}