mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-05-15 11:44:44 +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

12
src/model/model.cpp
View file

@ -91,13 +91,13 @@ bool model::eval(expr * e, expr_ref & result, bool model_completion) {
struct model::value_proc : public some_value_proc {
model & m_model;
value_proc(model & m):m_model(m) {}
virtual expr * operator()(sort * s) {
ptr_vector<expr> * u = 0;
expr * operator()(sort * s) override {
ptr_vector<expr> * u = nullptr;
if (m_model.m_usort2universe.find(s, u)) {
if (u->size() > 0)
return u->get(0);
}
return 0;
return nullptr;
}
};
@ -107,16 +107,16 @@ expr * model::get_some_value(sort * s) {
}
ptr_vector<expr> const & model::get_universe(sort * s) const {
ptr_vector<expr> * u = 0;
ptr_vector<expr> * u = nullptr;
m_usort2universe.find(s, u);
SASSERT(u != 0);
return *u;
}
bool model::has_uninterpreted_sort(sort * s) const {
ptr_vector<expr> * u = 0;
ptr_vector<expr> * u = nullptr;
m_usort2universe.find(s, u);
return u != 0;
return u != nullptr;
}
unsigned model::get_num_uninterpreted_sorts() const {