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.

Sign up for GitHub

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

Add missing overrides (also removes some trailing whitespace). #4654

Closed
wants to merge 1 commit into from
Closed

Add missing overrides (also removes some trailing whitespace). #4654

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 8 additions & 9 deletions src/smt/smt_solver.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ namespace {
m_minimizing_core(false),
m_core_extend_patterns(false),
m_core_extend_patterns_max_distance(UINT_MAX),
m_core_extend_nonlocal_patterns(false) {
m_core_extend_nonlocal_patterns(false) {
m_logic = l;
if (m_logic != symbol::null)
m_context.set_logic(m_logic);
Expand All @@ -89,10 +89,10 @@ namespace {
smt_solver * result = alloc(smt_solver, m, p, m_logic);
smt::kernel::copy(m_context, result->m_context);

if (mc0())
if (mc0())
result->set_model_converter(mc0()->translate(translator));

for (auto & kv : m_name2assertion) {
for (auto & kv : m_name2assertion) {
expr* val = translator(kv.m_value);
expr* key = translator(kv.m_key);
result->assert_expr(val, key);
Expand Down Expand Up @@ -209,21 +209,21 @@ namespace {
}

void user_propagate_init(
void* ctx,
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
std::function<void*(void*)>& fresh_eh) override {
m_context.user_propagate_init(ctx, fixed_eh, push_eh, pop_eh, fresh_eh);
}

unsigned user_propagate_register(expr* e) override {
unsigned user_propagate_register(expr* e) override {
return m_context.user_propagate_register(e);
}

void user_propagate_consequence(unsigned sz, unsigned const* ids, expr* conseq) {
void user_propagate_consequence(unsigned sz, unsigned const* ids, expr* conseq) override {
m_context.user_propagate_consequence(sz, ids, conseq);
}
}

struct scoped_minimize_core {
smt_solver& s;
Expand Down Expand Up @@ -367,7 +367,7 @@ namespace {
}

void compute_assrtn_fds(expr_ref_vector & core, vector<func_decl_set> & assrtn_fds) {
assrtn_fds.resize(m_name2assertion.size());
assrtn_fds.resize(m_name2assertion.size());
unsigned i = 0;
for (auto & kv : m_name2assertion) {
if (!core.contains(kv.m_key)) {
Expand Down Expand Up @@ -499,4 +499,3 @@ class smt_solver_factory : public solver_factory {
solver_factory * mk_smt_solver_factory() {
return alloc(smt_solver_factory);
}

10 changes: 5 additions & 5 deletions src/smt/user_propagator.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ Module Name:
Abstract:

User-propagator plugin.
Adds user plugins to propagate based on
Adds user plugins to propagate based on
terms receiving fixed values.

Author:
Expand Down Expand Up @@ -51,14 +51,14 @@ namespace smt {

public:
user_propagator(context& ctx);

~user_propagator() override {}

/*
* \brief initial setup for user propagator.
*/
void add(
void* ctx,
void* ctx,
std::function<void(void*, unsigned, expr*)>& fixed_eh,
std::function<void(void*)>& push_eh,
std::function<void(void*, unsigned)>& pop_eh,
Expand Down Expand Up @@ -95,7 +95,7 @@ namespace smt {
void init_model(model_generator & m) override {}
bool include_func_interp(func_decl* f) override { return false; }
bool can_propagate() override;
void propagate() override;
void display(std::ostream& out) const {}
void propagate() override;
void display(std::ostream& out) const override {}
};
};