From 823c341841d5b2e5effd1a962b3446f03b928c6c Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Thu, 20 Aug 2020 17:54:49 +0100 Subject: [PATCH] Add missing overrides (also removes some trailing whitespace). --- src/smt/smt_solver.cpp | 17 ++++++++--------- src/smt/user_propagator.h | 10 +++++----- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/src/smt/smt_solver.cpp b/src/smt/smt_solver.cpp index 52cce743723..010a74ceec9 100644 --- a/src/smt/smt_solver.cpp +++ b/src/smt/smt_solver.cpp @@ -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); @@ -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); @@ -209,7 +209,7 @@ namespace { } void user_propagate_init( - void* ctx, + void* ctx, std::function& fixed_eh, std::function& push_eh, std::function& pop_eh, @@ -217,13 +217,13 @@ namespace { 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; @@ -367,7 +367,7 @@ namespace { } void compute_assrtn_fds(expr_ref_vector & core, vector & 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)) { @@ -499,4 +499,3 @@ class smt_solver_factory : public solver_factory { solver_factory * mk_smt_solver_factory() { return alloc(smt_solver_factory); } - diff --git a/src/smt/user_propagator.h b/src/smt/user_propagator.h index d905478f2eb..2600657b40d 100644 --- a/src/smt/user_propagator.h +++ b/src/smt/user_propagator.h @@ -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: @@ -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& fixed_eh, std::function& push_eh, std::function& pop_eh, @@ -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 {} }; };