add command line option handling methods

Author: NlightNFotis

src/goto-harness/Makefile

@@ -1,5 +1,6 @@
 SRC = \
   function_call_harness_generator.cpp \
+  goto_harness_generator.cpp \
   goto_harness_generator_factory.cpp \
   goto_harness_main.cpp \
   goto_harness_parse_options.cpp \

src/goto-harness/function_call_harness_generator.cpp

@@ -36,11 +36,11 @@ function_call_harness_generatort::~function_call_harness_generatort() = default;
 
 void function_call_harness_generatort::handle_option(
   const std::string &option,
-  const std::string &value)
+  const std::list<std::string> &values)
 {
   if(option == FUNCTION_HARNESS_GENERATOR_FUNCTION_OPT)
   {
-    p_impl->function = value;
+    p_impl->function = require_exactly_one_value(option, values);
   }
   else
   {

src/goto-harness/function_call_harness_generator.h

@@ -9,6 +9,7 @@ Author: Diffblue Ltd.
 #ifndef CPROVER_GOTO_HARNESS_FUNCTION_CALL_HARNESS_GENERATOR_H
 #define CPROVER_GOTO_HARNESS_FUNCTION_CALL_HARNESS_GENERATOR_H
 
+#include <list>
 #include <memory>
 #include <string>
 
@@ -28,8 +29,9 @@ class function_call_harness_generatort : public goto_harness_generatort
     override;
 
 protected:
-  void
-  handle_option(const std::string &option, const std::string &value) override;
+  void handle_option(
+    const std::string &option,
+    const std::list<std::string> &values) override;
 
   void validate_options() override;
 

src/goto-harness/goto_harness_generator.h

@@ -9,6 +9,9 @@ Author: Diffblue Ltd.
 #ifndef CPROVER_GOTO_HARNESS_GOTO_HARNESS_GENERATOR_H
 #define CPROVER_GOTO_HARNESS_GOTO_HARNESS_GENERATOR_H
 
+#include <list>
+#include <string>
+
 #include <util/irep.h>
 
 class goto_modelt;
@@ -27,11 +30,23 @@ class goto_harness_generatort
   /// Handle a command line argument. Should throw an exception if the option
   /// doesn't apply to this generator. Should only set options rather than
   /// immediately performing work
-  virtual void
-  handle_option(const std::string &option, const std::string &value) = 0;
+  virtual void handle_option(
+    const std::string &option,
+    const std::list<std::string> &values) = 0;
 
   /// Check if options are in a sane state, throw otherwise
   virtual void validate_options() = 0;
+
+  /// Returns the only value of a single element list,
+  /// throws an exception if not passed a single element list
+  static std::string require_exactly_one_value(
+    const std::string &option,
+    const std::list<std::string> &values);
+
+  /// Asserts that the list of values to an option passed is empty
+  static void assert_no_values(
+    const std::string &option,
+    const std::list<std::string> &values);
 };
 
 #endif // CPROVER_GOTO_HARNESS_GOTO_HARNESS_GENERATOR_H

src/goto-harness/goto_harness_generator_factory.h

@@ -35,7 +35,7 @@ class goto_harness_generator_factoryt
   using build_generatort =
     std::function<std::unique_ptr<goto_harness_generatort>()>;
 
-  using generator_optionst = std::map<std::string, std::string>;
+  using generator_optionst = std::map<std::string, std::list<std::string>>;
 
   /// register a new goto-harness generator with the given name.
   /// \param generator_name: name of newly registered generator

src/goto-harness/goto_harness_parse_options.cpp

@@ -180,7 +180,7 @@ goto_harness_parse_optionst::collect_generate_factory_options()
   {
     if(common_options.find(option) == common_options.end())
     {
-      factory_options.insert({option, cmdline.get_value(option.c_str())});
+      factory_options.insert({option, cmdline.get_values(option.c_str())});
     }
   }