Move string handling option parsing to parse_object_factory_options()

Two object factory options were currently parsed in jbmc_parse_optionst but
should be parsed by parse_object_factory_options() like the other options.

Author: danpoe

jbmc/src/jbmc/jbmc_parse_options.cpp

@@ -251,28 +251,18 @@ void jbmc_parse_optionst::get_command_line_options(optionst &options)
   if(cmdline.isset("no-refine-strings"))
     options.set_option("refine-strings", false);
 
-  if(cmdline.isset("string-printable"))
+  if(cmdline.isset("string-printable") && cmdline.isset("no-refine-strings"))
   {
-    if(cmdline.isset("no-refine-strings"))
-    {
-      throw invalid_command_line_argument_exceptiont(
-        "cannot use --string-printable with --no-refine-strings",
-        "--string-printable");
-    }
-    options.set_option("string-printable", true);
+    throw invalid_command_line_argument_exceptiont(
+      "cannot use --string-printable with --no-refine-strings",
+      "--string-printable");
   }
 
-  if(cmdline.isset("string-input-value"))
+  if(cmdline.isset("string-input-value") && cmdline.isset("no-refine-strings"))
   {
-    if(cmdline.isset("no-refine-strings"))
-    {
-      throw invalid_command_line_argument_exceptiont(
-        "cannot use --string-input-value with --no-refine-strings",
-        "--string-input-value");
-    }
-    options.set_option(
-      "string-input-value",
-      cmdline.get_values("string-input-value"));
+    throw invalid_command_line_argument_exceptiont(
+      "cannot use --string-input-value with --no-refine-strings",
+      "--string-input-value");
   }
 
   if(

src/util/object_factory_parameters.cpp

@@ -82,4 +82,9 @@ void parse_object_factory_options(const cmdlinet &cmdline, optionst &options)
   {
     options.set_option("min-nondet-string-length", 1);
   }
+  if(cmdline.isset("string-input-value"))
+  {
+    options.set_option(
+      "string-input-value", cmdline.get_values("string-input-value"));
+  }
 }