mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-16 16:27:11 +00:00
Code Activity

merge with master

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-03-25 14:57:01 -07:00
commit c513f3ca09
883 changed files with 13979 additions and 16480 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/tactic/fpa/fpa2bv_model_converter.h
View file

@ -33,7 +33,7 @@ public:
m_bv2fp(alloc(bv2fpa_converter, m, conv)) {
}
virtual ~fpa2bv_model_converter() {
~fpa2bv_model_converter() override {
dealloc(m_bv2fp);
}
@ -43,7 +43,6 @@ public:
md = new_model;
}
void display(std::ostream & out) override;
model_converter * translate(ast_translation & translator) override;
@ -51,7 +50,7 @@ public:
protected:
fpa2bv_model_converter(ast_manager & m) :
m(m),
m_bv2fp(0) {}
m_bv2fp(nullptr) {}
void convert(model_core * mc, model * float_mdl);
};

14
src/tactic/fpa/fpa2bv_tactic.cpp
View file

@ -120,24 +120,24 @@ public:
m_imp = alloc(imp, m, p);
}
virtual tactic * translate(ast_manager & m) {
tactic * translate(ast_manager & m) override {
return alloc(fpa2bv_tactic, m, m_params);
}
virtual ~fpa2bv_tactic() {
~fpa2bv_tactic() override {
dealloc(m_imp);
}
virtual void updt_params(params_ref const & p) {
void updt_params(params_ref const & p) override {
m_params = p;
m_imp->updt_params(p);
}
virtual void collect_param_descrs(param_descrs & r) {
void collect_param_descrs(param_descrs & r) override {
}
virtual void operator()(goal_ref const & in,
goal_ref_buffer & result) {
void operator()(goal_ref const & in,
goal_ref_buffer & result) override {
try {
(*m_imp)(in, result);
}
@ -146,7 +146,7 @@ public:
}
}
virtual void cleanup() {
void cleanup() override {
imp * d = alloc(imp, m_imp->m, m_params);
std::swap(d, m_imp);
dealloc(d);

8
src/tactic/fpa/qffp_tactic.cpp
View file

@ -66,10 +66,10 @@ struct is_non_fp_qfnra_predicate {
class is_fp_qfnra_probe : public probe {
public:
virtual result operator()(goal const & g) {
result operator()(goal const & g) override {
return !test<is_non_fp_qfnra_predicate>(g);
}
virtual ~is_fp_qfnra_probe() {}
~is_fp_qfnra_probe() override {}
};
probe * mk_is_fp_qfnra_probe() {
@ -141,11 +141,11 @@ struct is_non_qffp_predicate {
class is_qffp_probe : public probe {
public:
virtual result operator()(goal const & g) {
result operator()(goal const & g) override {
return !test<is_non_qffp_predicate>(g);
}
virtual ~is_qffp_probe() {}
~is_qffp_probe() override {}
};
probe * mk_is_qffp_probe() {