Reshuffle exceptions

Author: Petr Bauch

src/goto-programs/slice_global_inits.cpp

@@ -21,7 +21,6 @@ Date:   December 2016
 #include <util/cprover_prefix.h>
 #include <util/prefix.h>
 
-#include <util/exception_utils.h>
 #include <util/invariant.h>
 
 #include <goto-programs/goto_functions.h>
@@ -36,7 +35,7 @@ void slice_global_inits(goto_modelt &goto_model)
   goto_functionst &goto_functions=goto_model.goto_functions;
 
   if(goto_functions.function_map.count(entry_point) == 0)
-    throw incorrect_goto_program_exceptiont("entry point not found");
+    throw user_input_error_exceptiont("entry point not found");
 
   // Get the call graph restricted to functions reachable from
   // the entry point:

src/goto-programs/slice_global_inits.h

@@ -14,8 +14,27 @@ Date:   December 2016
 #ifndef CPROVER_GOTO_PROGRAMS_SLICE_GLOBAL_INITS_H
 #define CPROVER_GOTO_PROGRAMS_SLICE_GLOBAL_INITS_H
 
+#include <util/exception_utils.h>
+
 class goto_modelt;
 
+class user_input_error_exceptiont : public cprover_exception_baset
+{
+public:
+  explicit user_input_error_exceptiont(std::string message)
+    : message(std::move(message))
+  {
+  }
+
+  std::string what() const
+  {
+    return message;
+  }
+
+private:
+  std::string message;
+};
+
 void slice_global_inits(goto_modelt &);
 
 #endif

src/util/parse_options.cpp

@@ -76,11 +76,6 @@ 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_INTERNAL_ERROR;
-  }
   catch(const cprover_exception_baset &e)
   {
     std::cerr << e.what() << '\n';