mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-13 09:26:15 +00:00
Code Activity

fix bugs exposed by Chris' sequence unit tests. Improve diagnostics for reason-unknown in combined solver

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-01-28 08:51:04 -08:00
parent b352d43e50
commit 30f8110488
2 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/ast/ast.cpp
View file

@ -1048,7 +1048,6 @@ sort* basic_decl_plugin::join(sort* s1, sort* s2) {
return s2; return s2;
} }
std::ostringstream buffer; std::ostringstream buffer;
SASSERT(false);
buffer << "Sorts " << mk_pp(s1, *m_manager) << " and " << mk_pp(s2, *m_manager) << " are incompatible"; buffer << "Sorts " << mk_pp(s1, *m_manager) << " and " << mk_pp(s2, *m_manager) << " are incompatible";
throw ast_exception(buffer.str().c_str()); throw ast_exception(buffer.str().c_str());
} }

6
src/smt/theory_seq.cpp
View file

@ -584,9 +584,9 @@ bool theory_seq::check_extensionality() {
for (unsigned i = 0; i < seqs.size(); ++i) { for (unsigned i = 0; i < seqs.size(); ++i) {
enode* n2 = get_enode(seqs[i]); enode* n2 = get_enode(seqs[i]);
expr* o2 = n2->get_owner(); expr* o2 = n2->get_owner();
if (m.get_sort(o1) != m.get_sort(o2)) { if (m.get_sort(o1) != m.get_sort(o2)) {
continue; continue;
} }
if (m_exclude.contains(o1, o2)) { if (m_exclude.contains(o1, o2)) {
continue; continue;
} }