Add a parse_options class for a better suited exception handling location

Author: NlightNFotis

src/cbmc/cbmc_main.cpp

@@ -41,11 +41,9 @@ int wmain(int argc, const wchar_t **argv_wide)
 int main(int argc, const char **argv)
 {
 #endif
-  try
-  {
-    cbmc_parse_optionst parse_options(argc, argv);
+  cbmc_parse_optionst parse_options(argc, argv);
 
-    int res = parse_options.main();
+  int res = parse_options.main();
 
   #ifdef IREP_HASH_STATS
   std::cout << "IREP_HASH_CNT=" << irep_hash_cnt << '\n';
@@ -54,9 +52,4 @@ int main(int argc, const char **argv)
   #endif
 
   return res;
-  }
-  catch(invalid_user_input_exceptiont &e)
-  {
-    std::cerr << e.what() << std::endl;
-  }
 }

src/cbmc/cbmc_parse_options.cpp

@@ -66,7 +66,7 @@ Author: Daniel Kroening, [email protected]
 #include "xml_interface.h"
 
 cbmc_parse_optionst::cbmc_parse_optionst(int argc, const char **argv)
-  : parse_options_baset(CBMC_OPTIONS, argc, argv),
+  : parse_optionst(CBMC_OPTIONS, argc, argv),
     xml_interfacet(cmdline),
     messaget(ui_message_handler),
     ui_message_handler(cmdline, std::string("CBMC ") + CBMC_VERSION),
@@ -78,7 +78,7 @@ ::cbmc_parse_optionst::cbmc_parse_optionst(
   int argc,
   const char **argv,
   const std::string &extra_options)
-  : parse_options_baset(CBMC_OPTIONS + extra_options, argc, argv),
+  : parse_optionst(CBMC_OPTIONS + extra_options, argc, argv),
     xml_interfacet(cmdline),
     messaget(ui_message_handler),
     ui_message_handler(cmdline, std::string("CBMC ") + CBMC_VERSION),

src/cbmc/cbmc_parse_options.h

@@ -76,10 +76,9 @@ class optionst;
   "(claim):(show-claims)(floatbv)(all-claims)(all-properties)" // legacy, and will eventually disappear // NOLINT(whitespace/line_length)
 // clang-format on
 
-class cbmc_parse_optionst:
-  public parse_options_baset,
-  public xml_interfacet,
-  public messaget
+class cbmc_parse_optionst : public parse_optionst,
+                            public xml_interfacet,
+                            public messaget
 {
 public:
   virtual int doit() override;

src/util/parse_options.cpp

@@ -18,6 +18,8 @@ Author: Daniel Kroening, [email protected]
 #endif
 
 #include "cmdline.h"
+#include "exception_utils.h"
+#include "exit_codes.h"
 #include "signal_catcher.h"
 
 parse_options_baset::parse_options_baset(
@@ -82,3 +84,19 @@ banner_string(const std::string &front_end, const std::string &version)
   return "* *" + std::string(left_padding, ' ') + version_str +
          std::string(right_padding, ' ') + "* *";
 }
+
+int parse_optionst::main()
+{
+  // catch all exceptions here so that this code is not duplicated
+  // for each tool
+  try
+  {
+    return parse_options_baset::main();
+  }
+  catch(invalid_user_input_exceptiont &e)
+  {
+    std::cerr << e.what() << "\n";
+    return CPROVER_EXIT_EXCEPTION;
+  }
+  return CPROVER_EXIT_SUCCESS;
+}

src/util/parse_options.h

@@ -35,6 +35,17 @@ class parse_options_baset
   bool parse_result;
 };
 
+class parse_optionst : public parse_options_baset
+{
+public:
+  parse_optionst(const std::string &optstring, int argc, const char **argv)
+    : parse_options_baset(optstring, argc, argv)
+  {
+  }
+
+  int main() override;
+};
+
 std::string
 banner_string(const std::string &front_end, const std::string &version);