Make ui_message_handlert parameterizable in the underlying message handler

Author: peterschrammel

src/util/ui_message.cpp

@@ -19,21 +19,14 @@ Author: Daniel Kroening, [email protected]
 #include "cout_message.h"
 #include "cmdline.h"
 
-ui_message_handlert::ui_message_handlert()
-  : _ui(uit::PLAIN),
-    always_flush(false),
-    time(timestampert::make(timestampert::clockt::NONE)),
-    out(std::cout),
-    json_stream(nullptr)
-{
-}
-
 ui_message_handlert::ui_message_handlert(
+  message_handlert *message_handler,
   uit __ui,
   const std::string &program,
   bool always_flush,
   timestampert::clockt clock_type)
-  : _ui(__ui),
+  : message_handler(message_handler),
+    _ui(__ui),
     always_flush(always_flush),
     time(timestampert::make(clock_type)),
     out(std::cout),
@@ -73,6 +66,7 @@ ui_message_handlert::ui_message_handlert(
   const class cmdlinet &cmdline,
   const std::string &program)
   : ui_message_handlert(
+      nullptr,
       cmdline.isset("xml-ui") ? uit::XML_UI : cmdline.isset("json-ui")
                                                 ? uit::JSON_UI
                                                 : uit::PLAIN,
@@ -88,6 +82,12 @@ ui_message_handlert::ui_message_handlert(
 {
 }
 
+ui_message_handlert::ui_message_handlert(message_handlert &message_handler)
+  : ui_message_handlert(
+      &message_handler, uit::PLAIN, "", false, timestampert::clockt::NONE)
+{
+}
+
 ui_message_handlert::~ui_message_handlert()
 {
   switch(get_ui())
@@ -129,13 +129,22 @@ void ui_message_handlert::print(
     {
     case uit::PLAIN:
     {
-      console_message_handlert console_message_handler(always_flush);
       std::stringstream ss;
       const std::string timestamp = time->stamp();
       ss << timestamp << (timestamp.empty() ? "" : " ") << message;
-      console_message_handler.print(level, ss.str());
-      if(always_flush)
-        console_message_handler.flush(level);
+      if(message_handler)
+      {
+        message_handler->print(level, ss.str());
+        if(always_flush)
+          message_handler->flush(level);
+      }
+      else
+      {
+        console_message_handlert msg(always_flush);
+        msg.print(level, ss.str());
+        if(always_flush)
+          msg.flush(level);
+      }
     }
     break;
 
@@ -298,8 +307,15 @@ void ui_message_handlert::flush(unsigned level)
   {
   case uit::PLAIN:
   {
-    console_message_handlert console_message_handler(always_flush);
-    console_message_handler.flush(level);
+    if(message_handler)
+    {
+      message_handler->flush(level);
+    }
+    else
+    {
+      console_message_handlert msg(always_flush);
+      msg.flush(level);
+    }
   }
   break;
 

src/util/ui_message.h

@@ -21,16 +21,9 @@ class ui_message_handlert : public message_handlert
 public:
   enum class uit { PLAIN, XML_UI, JSON_UI };
 
-  ui_message_handlert(
-    uit,
-    const std::string &program,
-    const bool always_flush,
-    timestampert::clockt clock_type);
-
   ui_message_handlert(const class cmdlinet &, const std::string &program);
 
-  /// Default constructor; implementation is in .cpp file
-  ui_message_handlert();
+  explicit ui_message_handlert(message_handlert &);
 
   virtual ~ui_message_handlert();
 
@@ -48,12 +41,20 @@ class ui_message_handlert : public message_handlert
   }
 
 protected:
+  message_handlert *message_handler;
   uit _ui;
   const bool always_flush;
   std::unique_ptr<const timestampert> time;
   std::ostream &out;
   std::unique_ptr<json_stream_arrayt> json_stream;
 
+  ui_message_handlert(
+    message_handlert *,
+    uit,
+    const std::string &program,
+    const bool always_flush,
+    timestampert::clockt clock_type);
+
   virtual void print(
     unsigned level,
     const std::string &message) override;

unit/analyses/ai/ai_simplify_lhs.cpp

@@ -10,6 +10,7 @@
 /// Unit tests for ai_domain_baset::ai_simplify_lhs
 
 #include <testing-utils/catch.hpp>
+#include <testing-utils/message.h>
 
 #include <analyses/ai.h>
 
@@ -64,7 +65,7 @@ bool constant_simplification_mockt::ai_simplify(
 SCENARIO("ai_domain_baset::ai_simplify_lhs",
   "[core][analyses][ai][ai_simplify_lhs]")
 {
-  ui_message_handlert message_handler;
+  ui_message_handlert message_handler(null_message_handler);
   ansi_c_languaget language;
   language.set_message_handler(message_handler);