Handle the config specific options in-house

via a member method handle_option. That is recursive_initialization_config now
implements its own handle_option that parses the user options specific to the
recursive initialization. These are: minimal null tree depth, maximal
nondeterministic tree depth, maximal array size and minimal array size. To that
end, the config inherits from the harness_option_parser, e.g. to have access to
require_exactly_one_value, etc.

Author: petr-bauch

src/goto-harness/recursive_initialization.cpp

@@ -16,9 +16,63 @@ Author: Diffblue Ltd.
 #include <util/optional_utils.h>
 #include <util/std_code.h>
 #include <util/std_expr.h>
+#include <util/string2int.h>
 
 #include <functional>
 
+bool recursive_initialization_configt::handle_option(
+  const std::string &option,
+  const std::list<std::string> &values)
+{
+  if(option == COMMON_HARNESS_GENERATOR_MIN_NULL_TREE_DEPTH_OPT)
+  {
+    auto const value = require_exactly_one_value(option, values);
+    auto const user_min_null_tree_depth =
+      string2optional<std::size_t>(value, 10);
+    if(user_min_null_tree_depth.has_value())
+    {
+      min_null_tree_depth = user_min_null_tree_depth.value();
+    }
+    else
+    {
+      throw invalid_command_line_argument_exceptiont{
+        "failed to convert `" + value + "' to integer",
+        "--" COMMON_HARNESS_GENERATOR_MIN_NULL_TREE_DEPTH_OPT};
+    }
+    return true;
+  }
+  else if(option == COMMON_HARNESS_GENERATOR_MAX_NONDET_TREE_DEPTH_OPT)
+  {
+    auto const value = require_exactly_one_value(option, values);
+    auto const user_max_nondet_tree_depth =
+      string2optional<std::size_t>(value, 10);
+    if(user_max_nondet_tree_depth.has_value())
+    {
+      max_nondet_tree_depth = user_max_nondet_tree_depth.value();
+    }
+    else
+    {
+      throw invalid_command_line_argument_exceptiont{
+        "failed to convert `" + value + "' to integer",
+        "--" COMMON_HARNESS_GENERATOR_MAX_NONDET_TREE_DEPTH_OPT};
+    }
+    return true;
+  }
+  else if(option == COMMON_HARNESS_GENERATOR_MAX_ARRAY_SIZE_OPT)
+  {
+    max_dynamic_array_size = require_one_size_value(
+      COMMON_HARNESS_GENERATOR_MAX_ARRAY_SIZE_OPT, values);
+    return true;
+  }
+  else if(option == COMMON_HARNESS_GENERATOR_MIN_ARRAY_SIZE_OPT)
+  {
+    min_dynamic_array_size = require_one_size_value(
+      COMMON_HARNESS_GENERATOR_MIN_ARRAY_SIZE_OPT, values);
+    return true;
+  }
+  return false;
+}
+
 recursive_initializationt::recursive_initializationt(
   recursive_initialization_configt initialization_config,
   goto_modelt &goto_model)

src/goto-harness/recursive_initialization.h

@@ -18,7 +18,10 @@ Author: Diffblue Ltd.
 #include <util/optional.h>
 #include <util/std_types.h>
 
-struct recursive_initialization_configt
+#include "function_harness_generator_options.h"
+#include "goto_harness_generator.h"
+
+struct recursive_initialization_configt : harness_options_parsert
 {
   std::size_t min_null_tree_depth = 1;
   std::size_t max_nondet_tree_depth = 2;
@@ -35,6 +38,15 @@ struct recursive_initialization_configt
   std::set<irep_idt> pointers_to_treat_as_cstrings;
 
   std::string to_string() const; // for debugging purposes
+
+  /// Parse the options specific for recursive initialisation
+  /// \param option: the user option name
+  /// \param values: the (one-or-more) values for this option
+  /// \return true if the option belonged to recursive initialisation and was
+  /// successfully parsed here
+  bool handle_option(
+    const std::string &option,
+    const std::list<std::string> &values);
 };
 
 /// Class for generating initialisation code