Move exception catch to parse_options_baset

Author: Petr Bauch

jbmc/src/janalyzer/janalyzer_parse_options.cpp

@@ -46,7 +46,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <langapi/mode.h>
 
 #include <util/config.h>
-#include <util/exception_utils.h>
 #include <util/exit_codes.h>
 #include <util/options.h>
 #include <util/unicode.h>
@@ -638,12 +637,6 @@ bool janalyzer_parse_optionst::set_properties()
       ::set_properties(goto_model, cmdline.get_values("property"));
   }
 
-  catch(const incorrect_goto_program_exceptiont &e)
-  {
-    std::cerr << e.what() << "\n";
-    return true;
-  }
-
   catch(const char *e)
   {
     error() << e << eom;

jbmc/src/jbmc/jbmc_parse_options.cpp

@@ -575,12 +575,6 @@ bool jbmc_parse_optionst::set_properties(goto_modelt &goto_model)
       ::set_properties(goto_model, cmdline.get_values("property"));
   }
 
-  catch(const incorrect_goto_program_exceptiont &e)
-  {
-    std::cerr << e.what() << "\n";
-    return true;
-  }
-
   catch(const char *e)
   {
     error() << e << eom;

src/cbmc/cbmc_parse_options.cpp

@@ -17,7 +17,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <memory>
 
 #include <util/config.h>
-#include <util/exception_utils.h>
 #include <util/exit_codes.h>
 #include <util/invariant.h>
 #include <util/unicode.h>
@@ -542,12 +541,6 @@ bool cbmc_parse_optionst::set_properties()
       ::set_properties(goto_model, cmdline.get_values("property"));
   }
 
-  catch(const incorrect_goto_program_exceptiont &e)
-  {
-    std::cerr << e.what() << "\n";
-    return true;
-  }
-
   catch(const char *e)
   {
     error() << e << eom;

src/goto-analyzer/goto_analyzer_parse_options.cpp

@@ -51,7 +51,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #include <langapi/language.h>
 
 #include <util/config.h>
-#include <util/exception_utils.h>
 #include <util/exit_codes.h>
 #include <util/options.h>
 #include <util/unicode.h>
@@ -692,12 +691,6 @@ bool goto_analyzer_parse_optionst::set_properties()
       ::set_properties(goto_model, cmdline.get_values("property"));
   }
 
-  catch(const incorrect_goto_program_exceptiont &e)
-  {
-    std::cerr << e.what() << "\n";
-    return true;
-  }
-
   catch(const char *e)
   {
     error() << e << eom;

src/util/parse_options.cpp

@@ -76,6 +76,11 @@ int parse_options_baset::main()
     std::cerr << e.what() << "\n";
     return CPROVER_EXIT_USAGE_ERROR;
   }
+  catch(const incorrect_goto_program_exceptiont &e)
+  {
+    std::cerr << e.what() << "\n";
+    return CPROVER_EXIT_EXCEPTION;
+  }
   catch(const cprover_exception_baset &e)
   {
     std::cerr << e.what() << '\n';