Merge pull request #8143 from tautschnig/cleanup/parsert-message-handler

Remove deprecated messaget() constructor

Author: tautschnig

src/goto-symex/complexity_limiter.h

@@ -48,8 +48,6 @@ class optionst;
 class complexity_limitert
 {
 public:
-  complexity_limitert() = default;
-
   complexity_limitert(message_handlert &logger, const optionst &options);
 
   /// Is the complexity module active?

src/util/message.h

@@ -10,15 +10,14 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_UTIL_MESSAGE_H
 #define CPROVER_UTIL_MESSAGE_H
 
+#include "invariant.h"
+#include "source_location.h"
+
 #include <functional>
 #include <iosfwd>
 #include <sstream>
 #include <string>
 
-#include "deprecate.h"
-#include "invariant.h"
-#include "source_location.h"
-
 class json_objectt;
 class jsont;
 class structured_datat;
@@ -191,13 +190,6 @@ class messaget
 
   // constructors, destructor
 
-  DEPRECATED(SINCE(2019, 1, 7, "use messaget(message_handler) instead"))
-  messaget():
-    message_handler(nullptr),
-    mstream(M_DEBUG, *this)
-  {
-  }
-
   messaget(const messaget &other):
     message_handler(other.message_handler),
     mstream(other.mstream, *this)

src/util/parser.h

@@ -12,7 +12,6 @@ Author: Daniel Kroening, kroening@kroening.com
 #ifndef CPROVER_UTIL_PARSER_H
 #define CPROVER_UTIL_PARSER_H
 
-#include "deprecate.h"
 #include "expr.h"
 #include "message.h"
 
@@ -30,11 +29,6 @@ class parsert
 
   std::vector<exprt> stack;
 
-  DEPRECATED(SINCE(2023, 12, 20, "use parsert(message_handler) instead"))
-  parsert() : in(nullptr), line_no(0), previous_line_no(0), column(1)
-  {
-  }
-
   explicit parsert(message_handlert &message_handler)
     : in(nullptr),
       log(message_handler),
@@ -135,11 +129,8 @@ class parsert
     column+=token_width;
   }
 
-  // should be protected or even just be a reference to a message handler, but
-  // for now enables a step-by-step transition
-  messaget log;
-
 protected:
+  messaget log;
   source_locationt source_location;
   unsigned line_no, previous_line_no;
   unsigned column;