Cleanup invariants in lazy_goto_model

Author: hannes-steffenhagen-diffblue

src/goto-programs/lazy_goto_model.cpp

@@ -17,6 +17,7 @@
 #include <langapi/language.h>
 
 #include <fstream>
+#include <util/exception_utils.h>
 
 //! @cond Doxygen_suppress_Lambda_in_initializer_list
 lazy_goto_modelt::lazy_goto_modelt(
@@ -94,8 +95,7 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
   const std::vector<std::string> &files=cmdline.args;
   if(files.empty())
   {
-    msg.error() << "Please provide a program" << messaget::eom;
-    throw 0;
+    throw invalid_user_input_exceptiont("No program provided", "", "");
   }
 
   std::vector<std::string> binaries, sources;
@@ -122,9 +122,8 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
 
       if(!infile)
       {
-        msg.error() << "failed to open input file `" << filename
-                    << '\'' << messaget::eom;
-        throw 0;
+        throw system_exceptiont(
+          "failed to open input file `" + filename + '\'');
       }
 
       language_filet &lf=add_language_file(filename);
@@ -135,8 +134,10 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
         source_locationt location;
         location.set_file(filename);
         msg.error().source_location=location;
-        msg.error() << "failed to figure out type of file" << messaget::eom;
-        throw 0;
+        throw deserialization_exceptiont(
+          "failed to figure out type of file"
+          "\nsource location: " +
+          location.as_string());
       }
 
       languaget &language=*lf.language;
@@ -147,8 +148,8 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
 
       if(language.parse(infile, filename))
       {
-        msg.error() << "PARSING ERROR" << messaget::eom;
-        throw 0;
+        // TODO more helpful error message
+        throw deserialization_exceptiont("PARSING ERROR");
       }
 
       lf.get_modules();
@@ -158,8 +159,8 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
 
     if(language_files.typecheck(symbol_table))
     {
-      msg.error() << "CONVERSION ERROR" << messaget::eom;
-      throw 0;
+      // TODO more helpful error message
+      throw deserialization_exceptiont("CONVERSION ERROR");
     }
   }
 
@@ -168,7 +169,10 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
     msg.status() << "Reading GOTO program from file" << messaget::eom;
 
     if(read_object_and_link(file, *goto_model, message_handler))
-      throw 0;
+    {
+      // TODO more helpful error message
+      throw deserialization_exceptiont("Failed to read/link goto model");
+    }
   }
 
   bool binaries_provided_start =
@@ -203,8 +207,8 @@ void lazy_goto_modelt::initialize(const cmdlinet &cmdline)
 
   if(entry_point_generation_failed)
   {
-    msg.error() << "SUPPORT FUNCTION GENERATION ERROR" << messaget::eom;
-    throw 0;
+    // TODO more helpful error message
+    throw deserialization_exceptiont("SUPPORT FUNCTION GENERATION ERROR");
   }
 
   // stupid hack