Modify parse_options_baset::main to handle exceptions.

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.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_options_baset,
+                            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(
@@ -47,23 +49,34 @@ void parse_options_baset::unknown_option_msg()
 
 int parse_options_baset::main()
 {
-  if(parse_result)
+  // catch all exceptions here so that this code is not duplicated
+  // for each tool
+  try
   {
-    usage_error();
-    unknown_option_msg();
-    return EX_USAGE;
+    if(parse_result)
+    {
+      usage_error();
+      unknown_option_msg();
+      return EX_USAGE;
+    }
+
+    if(cmdline.isset('?') || cmdline.isset('h') || cmdline.isset("help"))
+    {
+      help();
+      return EX_OK;
+    }
+
+    // install signal catcher
+    install_signal_catcher();
+
+    return doit();
   }
-
-  if(cmdline.isset('?') || cmdline.isset('h') || cmdline.isset("help"))
+  catch(invalid_user_input_exceptiont &e)
   {
-    help();
-    return EX_OK;
+    std::cerr << e.what() << "\n";
+    return CPROVER_EXIT_USAGE_ERROR;
   }
-
-  // install signal catcher
-  install_signal_catcher();
-
-  return doit();
+  return CPROVER_EXIT_SUCCESS;
 }
 
 std::string