mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-16 02:46:16 +00:00
Code Activity

Merge branch 'upstream-master' into develop

Browse source 
Conflicts:
	src/smt/params/smt_params.h
	src/smt/params/smt_params_helper.pyg
	src/smt/smt_case_split_queue.cpp
	src/smt/smt_context.h
	src/smt/smt_setup.cpp
	src/smt/smt_setup.h
This commit is contained in:
Murphy Berzish 2017-05-03 17:03:13 -04:00
commit 41a242fab1
9 changed files with 102 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/smt/smt_setup.cpp
View file

@ -824,19 +824,23 @@ namespace smt {
m_context.register_plugin(mk_theory_dl(m_manager));
}
void setup::setup_seq(static_features const & st) {
void setup::setup_seq_str(static_features const & st) {
// check params for what to do here when it's ambiguous
if (m_params.m_string_solver == "z3str3") {
setup_str();
} else if (m_params.m_string_solver == "seq") {
m_context.register_plugin(alloc(theory_seq, m_manager));
} else if (m_params.m_string_solver == "auto") {
}
else if (m_params.m_string_solver == "seq") {
setup_seq();
}
else if (m_params.m_string_solver == "auto") {
if (st.m_has_seq_non_str) {
m_context.register_plugin(alloc(theory_seq, m_manager));
} else {
setup_seq();
}
else {
setup_str();
}
} else {
}
else {
throw default_exception("invalid parameter for smt.string_solver, valid options are 'z3str3', 'seq', 'auto'");
}
}
@ -855,6 +859,10 @@ namespace smt {
m_context.register_plugin(alloc(theory_str, m_manager, m_params));
}
void setup::setup_seq() {
m_context.register_plugin(alloc(smt::theory_seq, m_manager));
}
void setup::setup_unknown() {
static_features st(m_manager);
st.collect(m_context.get_num_asserted_formulas(), m_context.get_asserted_formulas());
@ -864,7 +872,7 @@ namespace smt {
setup_bv();
setup_datatypes();
setup_dl();
setup_seq(st);
setup_seq_str(st);
setup_card();
setup_fpa();
}
@ -879,7 +887,7 @@ namespace smt {
setup_datatypes();
setup_bv();
setup_dl();
setup_seq(st);
setup_seq_str(st);
setup_card();
setup_fpa();
return;