mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-11-23 14:11:28 +00:00
Code Activity

include FS logic

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2025-11-21 13:14:53 -08:00
parent df816cab07
commit 04cb59fd74
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/cmd_context/cmd_context.cpp
View file

@ -833,7 +833,7 @@ void cmd_context::init_manager_core(bool new_manager) {
register_plugin(symbol("fpa"), alloc(fpa_decl_plugin), logic_has_fpa()); register_plugin(symbol("fpa"), alloc(fpa_decl_plugin), logic_has_fpa());
register_plugin(symbol("datalog_relation"), alloc(datalog::dl_decl_plugin), !has_logic()); register_plugin(symbol("datalog_relation"), alloc(datalog::dl_decl_plugin), !has_logic());
register_plugin(symbol("specrels"), alloc(special_relations_decl_plugin), !has_logic()); register_plugin(symbol("specrels"), alloc(special_relations_decl_plugin), !has_logic());
register_plugin(symbol("finite_set"), alloc(finite_set_decl_plugin), !has_logic()); register_plugin(symbol("finite_set"), alloc(finite_set_decl_plugin), !has_logic() || smt_logics::logic_has_finite_sets(m_logic));
} }
else { else {
// the manager was created by an external module // the manager was created by an external module
@ -850,7 +850,7 @@ void cmd_context::init_manager_core(bool new_manager) {
load_plugin(symbol("seq"), logic_has_seq(), fids); load_plugin(symbol("seq"), logic_has_seq(), fids);
load_plugin(symbol("fpa"), logic_has_fpa(), fids); load_plugin(symbol("fpa"), logic_has_fpa(), fids);
load_plugin(symbol("pb"), logic_has_pb(), fids); load_plugin(symbol("pb"), logic_has_pb(), fids);
load_plugin(symbol("finite_set"), !has_logic(), fids); load_plugin(symbol("finite_set"), smt_logics::logic_has_finite_sets(m_logic) || !has_logic(), fids);
for (family_id fid : fids) { for (family_id fid : fids) {
decl_plugin * p = m_manager->get_plugin(fid); decl_plugin * p = m_manager->get_plugin(fid);

11
src/solver/smt_logics.cpp
View file

@ -24,8 +24,8 @@ Revision History:
bool smt_logics::supported_logic(symbol const & s) { bool smt_logics::supported_logic(symbol const & s) {
return logic_has_uf(s) || logic_is_all(s) || logic_has_fd(s) || return logic_has_uf(s) || logic_is_all(s) || logic_has_fd(s) ||
logic_has_arith(s) || logic_has_bv(s) || logic_has_arith(s) || logic_has_bv(s) ||
logic_has_array(s) || logic_has_seq(s) || logic_has_str(s) || logic_has_array(s) || logic_has_seq(s) || logic_has_str(s) || logic_has_horn(s) || logic_has_fpa(s) ||
logic_has_horn(s) || logic_has_fpa(s) || logic_has_datatype(s); logic_has_datatype(s) || logic_has_finite_sets(s);
} }
bool smt_logics::logic_has_reals_only(symbol const& s) { bool smt_logics::logic_has_reals_only(symbol const& s) {
@ -71,6 +71,13 @@ bool smt_logics::logic_has_bv(symbol const & s) {
str == "HORN"; str == "HORN";
} }
bool smt_logics::logic_has_finite_sets(symbol const &s) {
auto str = s.str();
return
str.find("FS") != std::string::npos ||
logic_is_all(s);
}
bool smt_logics::logic_has_array(symbol const & s) { bool smt_logics::logic_has_array(symbol const & s) {
auto str = s.str(); auto str = s.str();
return return

1
src/solver/smt_logics.h
View file

@ -27,6 +27,7 @@ public:
static bool logic_has_arith(symbol const & s); static bool logic_has_arith(symbol const & s);
static bool logic_has_bv(symbol const & s); static bool logic_has_bv(symbol const & s);
static bool logic_has_array(symbol const & s); static bool logic_has_array(symbol const & s);
static bool logic_has_finite_sets(symbol const &s);
static bool logic_has_seq(symbol const & s); static bool logic_has_seq(symbol const & s);
static bool logic_has_str(symbol const & s); static bool logic_has_str(symbol const & s);
static bool logic_has_fpa(symbol const & s); static bool logic_has_fpa(symbol const & s);