3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-09-03 08:38:06 +00:00

Use override rather than virtual.

This commit is contained in:
Bruce Mitchener 2018-02-10 09:15:12 +07:00
parent ce123d9dbc
commit 7167fda1dc
220 changed files with 2546 additions and 2548 deletions

View file

@ -66,9 +66,9 @@ namespace datalog {
*/
mk_array_blast(context & ctx, unsigned priority);
virtual ~mk_array_blast();
~mk_array_blast() override;
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};

View file

@ -40,8 +40,8 @@ namespace datalog {
public:
mk_array_eq_rewrite(context & ctx, unsigned priority);
rule_set * operator()(rule_set const & source);
virtual ~mk_array_eq_rewrite(){}
rule_set * operator()(rule_set const & source) override;
~mk_array_eq_rewrite() override{}
};

View file

@ -112,8 +112,8 @@ namespace datalog {
expr_ref_vector getId(app*old_pred, const expr_ref_vector& new_args);
public:
mk_array_instantiation(context & ctx, unsigned priority);
rule_set * operator()(rule_set const & source);
virtual ~mk_array_instantiation(){}
rule_set * operator()(rule_set const & source) override;
~mk_array_instantiation() override{}
};

View file

@ -28,8 +28,8 @@ namespace datalog {
context& m_ctx;
public:
mk_backwards(context & ctx, unsigned priority = 33000);
~mk_backwards();
rule_set * operator()(rule_set const & source);
~mk_backwards() override;
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -59,11 +59,11 @@ namespace datalog {
m_new_funcs.push_back(new_f);
}
virtual model_converter * translate(ast_translation & translator) {
model_converter * translate(ast_translation & translator) override {
return alloc(bit_blast_model_converter, m);
}
virtual void operator()(model_ref & model) {
void operator()(model_ref & model) override {
for (unsigned i = 0; i < m_new_funcs.size(); ++i) {
func_decl* p = m_new_funcs[i].get();
func_decl* q = m_old_funcs[i].get();

View file

@ -28,8 +28,8 @@ namespace datalog {
impl* m_impl;
public:
mk_bit_blast(context & ctx, unsigned priority = 35000);
~mk_bit_blast();
rule_set * operator()(rule_set const & source);
~mk_bit_blast() override;
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -52,7 +52,7 @@ namespace datalog {
*/
mk_coalesce(context & ctx);
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -42,7 +42,7 @@ namespace datalog {
m(ctx.get_manager()),
m_context(ctx) {}
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
}

View file

@ -73,11 +73,11 @@ namespace datalog {
public:
mk_filter_rules(context & ctx);
~mk_filter_rules();
~mk_filter_rules() override;
/**
\brief Return a new rule set where only filter rules contain atoms with repeated variables and/or values.
*/
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -90,7 +90,7 @@ namespace datalog {
bool transform_rules(const rule_set & orig, rule_set & tgt);
public:
mk_interp_tail_simplifier(context & ctx, unsigned priority=40000);
virtual ~mk_interp_tail_simplifier();
~mk_interp_tail_simplifier() override;
/**If rule should be retained, assign transformed version to res and return true;
if rule can be deleted, return false.
@ -100,7 +100,7 @@ namespace datalog {
*/
bool transform_rule(rule * r, rule_ref& res);
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -111,7 +111,7 @@ namespace datalog {
add_invariant_model_converter(ast_manager& m): m(m), a(m), m_funcs(m), m_invs(m) {}
virtual ~add_invariant_model_converter() { }
~add_invariant_model_converter() override { }
void add(func_decl* p, expr* inv) {
if (!m.is_true(inv)) {
@ -120,7 +120,7 @@ namespace datalog {
}
}
virtual void operator()(model_ref & mr) {
void operator()(model_ref & mr) override {
for (unsigned i = 0; i < m_funcs.size(); ++i) {
func_decl* p = m_funcs[i].get();
func_interp* f = mr->get_func_interp(p);
@ -142,7 +142,7 @@ namespace datalog {
}
}
virtual model_converter * translate(ast_translation & translator) {
model_converter * translate(ast_translation & translator) override {
add_invariant_model_converter* mc = alloc(add_invariant_model_converter, m);
for (unsigned i = 0; i < m_funcs.size(); ++i) {
mc->add(translator(m_funcs[i].get()), m_invs[i].get());

View file

@ -65,9 +65,9 @@ namespace datalog {
public:
mk_karr_invariants(context & ctx, unsigned priority);
virtual ~mk_karr_invariants();
~mk_karr_invariants() override;
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};

View file

@ -36,9 +36,9 @@ namespace datalog {
app_ref del_arg(app* fn);
public:
mk_loop_counter(context & ctx, unsigned priority = 33000);
~mk_loop_counter();
~mk_loop_counter() override;
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
func_decl* get_old(func_decl* f) const { return m_new2old.find(f); }

View file

@ -126,7 +126,7 @@ namespace datalog {
*/
mk_magic_sets(context & ctx, func_decl* goal);
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -30,8 +30,8 @@ namespace datalog {
app_ref mk_query(app* q);
public:
mk_magic_symbolic(context & ctx, unsigned priority = 33037);
~mk_magic_symbolic();
rule_set * operator()(rule_set const & source);
~mk_magic_symbolic() override;
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -47,9 +47,9 @@ namespace datalog {
qa_model_converter(ast_manager& m):
m(m), m_old_funcs(m), m_new_funcs(m) {}
virtual ~qa_model_converter() {}
~qa_model_converter() override {}
virtual model_converter * translate(ast_translation & translator) {
model_converter * translate(ast_translation & translator) override {
return alloc(qa_model_converter, m);
}
@ -61,7 +61,7 @@ namespace datalog {
m_sorts.push_back(sorts);
}
virtual void operator()(model_ref & old_model) {
void operator()(model_ref & old_model) override {
model_ref new_model = alloc(model, m);
for (unsigned i = 0; i < m_new_funcs.size(); ++i) {
func_decl* p = m_new_funcs[i].get();

View file

@ -51,9 +51,9 @@ namespace datalog {
public:
mk_quantifier_abstraction(context & ctx, unsigned priority);
virtual ~mk_quantifier_abstraction();
~mk_quantifier_abstraction() override;
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};

View file

@ -61,9 +61,9 @@ namespace datalog {
public:
mk_quantifier_instantiation(context & ctx, unsigned priority);
virtual ~mk_quantifier_instantiation();
~mk_quantifier_instantiation() override;
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};

View file

@ -89,7 +89,7 @@ namespace datalog {
obj_map<expr, unsigned_vector> m_positions;
public:
visitor(context& c, substitution & s): st_visitor(s), m_context(c) { (void) m_context; }
virtual bool operator()(expr* e);
bool operator()(expr* e) override;
void reset() { m_unifiers.reset(); }
void reset(unsigned sz);
svector<bool>& can_remove() { return m_can_remove; }
@ -194,9 +194,9 @@ namespace datalog {
m_head_visitor(ctx, m_subst),
m_tail_visitor(ctx, m_subst)
{}
virtual ~mk_rule_inliner() { }
~mk_rule_inliner() override { }
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -30,7 +30,7 @@ namespace datalog {
public:
scale_model_converter(ast_manager& m): m(m), m_trail(m), a(m) {}
virtual ~scale_model_converter() {}
~scale_model_converter() override {}
void add_new2old(func_decl* new_f, func_decl* old_f) {
m_trail.push_back(old_f);
@ -38,7 +38,7 @@ namespace datalog {
m_new2old.insert(new_f, old_f);
}
virtual void operator()(model_ref& md) {
void operator()(model_ref& md) override {
model_ref old_model = alloc(model, m);
obj_map<func_decl, func_decl*>::iterator it = m_new2old.begin();
obj_map<func_decl, func_decl*>::iterator end = m_new2old.end();
@ -95,7 +95,7 @@ namespace datalog {
//TRACE("dl", model_smt2_pp(tout, m, *md, 0); );
}
virtual model_converter * translate(ast_translation & translator) {
model_converter * translate(ast_translation & translator) override {
UNREACHABLE();
return 0;
}

View file

@ -43,8 +43,8 @@ namespace datalog {
app_ref mk_constraint(unsigned num_vars, app* q);
public:
mk_scale(context & ctx, unsigned priority = 33039);
virtual ~mk_scale();
rule_set * operator()(rule_set const & source);
~mk_scale() override;
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -51,7 +51,7 @@ namespace datalog {
public:
mk_separate_negated_tails(context& ctx, unsigned priority = 21000);
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
}

View file

@ -271,14 +271,14 @@ namespace datalog {
m_renaming.insert(orig_rule, unsigned_vector(sz, renaming));
}
virtual void operator()(ast_manager& m, unsigned num_source, proof * const * source, proof_ref & result) {
void operator()(ast_manager& m, unsigned num_source, proof * const * source, proof_ref & result) override {
SASSERT(num_source == 1);
result = source[0];
init_form2rule();
translate_proof(result);
}
virtual proof_converter * translate(ast_translation & translator) {
proof_converter * translate(ast_translation & translator) override {
UNREACHABLE();
// this would require implementing translation for the dl_context.
return 0;
@ -305,7 +305,7 @@ namespace datalog {
m_sliceable.insert(f, bv);
}
virtual void operator()(model_ref & md) {
void operator()(model_ref & md) override {
if (m_slice2old.empty()) {
return;
}
@ -391,7 +391,7 @@ namespace datalog {
TRACE("dl", model_smt2_pp(tout, m, *md, 0); );
}
virtual model_converter * translate(ast_translation & translator) {
model_converter * translate(ast_translation & translator) override {
UNREACHABLE();
return 0;
}

View file

@ -100,9 +100,9 @@ namespace datalog {
*/
mk_slice(context & ctx);
virtual ~mk_slice() { }
~mk_slice() override { }
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
func_decl* get_predicate(func_decl* p) { func_decl* q = p; m_predicates.find(p, q); return q; }

View file

@ -80,11 +80,11 @@ namespace datalog {
m_context(ctx),
m_ref_holder(ctx.get_rule_manager()),
m_new_total_relation_discovery_during_transformation(true) {}
~mk_subsumption_checker() {
~mk_subsumption_checker() override {
reset_dealloc_values(m_ground_unconditional_rule_heads);
}
virtual rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -86,7 +86,7 @@ namespace datalog {
public:
mk_unbound_compressor(context & ctx);
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};

View file

@ -44,7 +44,7 @@ namespace datalog {
*/
mk_unfold(context & ctx);
rule_set * operator()(rule_set const & source);
rule_set * operator()(rule_set const & source) override;
};
};