Fix based on comments, roll back changes in show_symbol_table

Author: Petr Bauch

src/goto-programs/read_bin_goto_object.cpp

@@ -158,7 +158,8 @@ static bool read_bin_goto_object_v4(
 
   functions.compute_location_numbers();
 
-  POSTCONDITION(functions.function_map.count(goto_functionst::entry_point()));
+  POSTCONDITION(
+    functions.function_map.count(goto_functionst::entry_point()) != 0);
 
   return false;
 }

src/goto-programs/show_symbol_table.cpp

@@ -18,7 +18,6 @@ Author: Daniel Kroening, [email protected]
 #include <langapi/language.h>
 #include <langapi/mode.h>
 
-#include <util/invariant.h>
 #include <util/json_irep.h>
 
 #include "goto_model.h"
@@ -52,8 +51,8 @@ void show_symbol_table_brief_plain(
     else
     {
       ptr=get_language_from_mode(symbol.mode);
-      INVARIANT_WITH_DIAGNOSTICS(
-        ptr != nullptr, "symbol ", id2string(symbol.name), " has unknown mode");
+      if(ptr==nullptr)
+        throw "symbol "+id2string(symbol.name)+" has unknown mode";
     }
 
     std::string type_str;
@@ -96,8 +95,8 @@ void show_symbol_table_plain(
       ptr=get_language_from_mode(symbol.mode);
     }
 
-    INVARIANT_WITH_DIAGNOSTICS(
-      ptr != nullptr, "symbol ", id2string(symbol.name), " has unknown mode");
+    if(!ptr)
+      throw "symbol "+id2string(symbol.name)+" has unknown mode";
 
     std::string type_str, value_str;
 
@@ -184,8 +183,8 @@ static void show_symbol_table_json_ui(
       ptr=get_language_from_mode(symbol.mode);
     }
 
-    INVARIANT_WITH_DIAGNOSTICS(
-      ptr != nullptr, "symbol ", id2string(symbol.name), " has unknown mode");
+    if(!ptr)
+      throw "symbol "+id2string(symbol.name)+" has unknown mode";
 
     std::string type_str, value_str;
 
@@ -259,8 +258,8 @@ static void show_symbol_table_brief_json_ui(
       ptr=get_language_from_mode(symbol.mode);
     }
 
-    INVARIANT_WITH_DIAGNOSTICS(
-      ptr != nullptr, "symbol ", id2string(symbol.name), " has unknown mode");
+    if(!ptr)
+      throw "symbol "+id2string(symbol.name)+" has unknown mode";
 
     std::string type_str, value_str;
 

src/goto-programs/vcd_goto_trace.cpp

@@ -15,7 +15,6 @@ Date: June 2011
 
 #include <ctime>
 
-#include <util/invariant.h>
 #include <util/numbering.h>
 #include <util/pointer_offset_size.h>