Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove deprecated messaget() constructor #8143

Merged
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions src/goto-symex/complexity_limiter.h
Original file line number Diff line number Diff line change
@@ -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?
14 changes: 3 additions & 11 deletions src/util/message.h
Original file line number Diff line number Diff line change
@@ -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)
11 changes: 1 addition & 10 deletions src/util/parser.h
Original file line number Diff line number Diff line change
@@ -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;