Removed legacy_typecheckt interface, use new message counters

Author: tautschnig

src/util/cout_message.cpp

@@ -68,11 +68,11 @@ void console_message_handlert::print(
   unsigned level,
   const std::string &message)
 {
+  message_handlert::print(level, message);
+
   if(verbosity<level)
     return;
 
-  message_handlert::print(level, message);
-
   #ifdef _WIN32
   HANDLE out_handle=
     GetStdHandle((level>1)?STD_OUTPUT_HANDLE:STD_ERROR_HANDLE);
@@ -217,6 +217,8 @@ void gcc_message_handlert::print(
   unsigned level,
   const std::string &message)
 {
+  message_handlert::print(level, message);
+
   // gcc appears to send everything to cerr
   if(verbosity>=level)
     std::cerr << message << '\n' << std::flush;

src/util/message.h

@@ -82,11 +82,10 @@ class stream_message_handlert:public message_handlert
 
   virtual void print(unsigned level, const std::string &message)
   {
+    message_handlert::print(level, message);
+
     if(verbosity>=level)
-    {
-      message_handlert::print(level, message);
       out << message << '\n';
-    }
   }
 
   virtual void flush(unsigned level)

src/util/typecheck.cpp

@@ -22,14 +22,19 @@ Author: Daniel Kroening, kroening@kroening.com
 
 bool typecheckt::typecheck_main()
 {
+  assert(message_handler);
+
+  const unsigned errors_before=
+    message_handler->get_message_count(messaget::M_ERROR);
+
   try
   {
     typecheck();
   }
 
   catch(int)
   {
-    error_found=true;
+    error();
   }
 
   catch(const char *e)
@@ -42,5 +47,5 @@ bool typecheckt::typecheck_main()
     error() << e << eom;
   }
 
-  return error_found;
+  return message_handler->get_message_count(messaget::M_ERROR)!=errors_before;
 }

src/util/typecheck.h

@@ -16,30 +16,27 @@ class typecheckt:public messaget
 {
 public:
   explicit typecheckt(message_handlert &_message_handler):
-    messaget(_message_handler),
-    error_found(false)
+    messaget(_message_handler)
   {
   }
 
   virtual ~typecheckt() { }
 
-  mstreamt &error()
+  // not pretty, but makes transition easier
+  void err_location(const source_locationt &loc)
   {
-    error_found=true;
-    return messaget::error();
+    messaget::error().source_location=loc;
   }
 
   // not pretty, but makes transition easier
   void err_location(const exprt &src)
   {
-    error().source_location=src.find_source_location();
+    err_location(src.find_source_location());
   }
 
-  bool error_found;
-
-  bool get_error_found() const
+  void err_location(const typet &src)
   {
-    return error_found;
+    err_location(src.source_location());
   }
 
 protected:

src/util/ui_message.cpp

@@ -156,8 +156,6 @@ void ui_message_handlert::print(
     {
     case PLAIN:
     {
-      message_handlert::print(level, message);
-
       console_message_handlert console_message_handler;
       console_message_handler.print(level, message);
     }
@@ -193,6 +191,8 @@ void ui_message_handlert::print(
   int sequence_number,
   const source_locationt &location)
 {
+  message_handlert::print(level, message);
+
   if(verbosity>=level)
   {
     switch(get_ui())
@@ -205,8 +205,6 @@ void ui_message_handlert::print(
     case XML_UI:
     case JSON_UI:
     {
-      message_handlert::print(level, message);
-
       std::string tmp_message(message);
 
       if(!tmp_message.empty() && *tmp_message.rbegin()=='\n')