mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-07 09:55:19 +00:00
Code Activity

check for logic in solver

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2016-11-04 15:19:11 +00:00
parent c0fb2eafe5
commit 51a4085910
6 changed files with 213 additions and 128 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/cmake/src/solver/CMakeLists.txt
View file

@ -3,6 +3,7 @@ z3_add_component(solver
check_sat_result.cpp check_sat_result.cpp
combined_solver.cpp combined_solver.cpp
mus.cpp mus.cpp
smt_logics.cpp
solver.cpp solver.cpp
solver_na2as.cpp solver_na2as.cpp
solver2tactic.cpp solver2tactic.cpp

17
src/api/api_solver.cpp
View file

@ -32,6 +32,7 @@ Revision History:
#include"smt_strategic_solver.h" #include"smt_strategic_solver.h"
#include"smt_solver.h" #include"smt_solver.h"
#include"smt_implied_equalities.h" #include"smt_implied_equalities.h"
#include"smt_logics.h"
extern "C" { extern "C" {
@ -80,10 +81,18 @@ extern "C" {
Z3_TRY; Z3_TRY;
LOG_Z3_mk_solver_for_logic(c, logic); LOG_Z3_mk_solver_for_logic(c, logic);
RESET_ERROR_CODE(); RESET_ERROR_CODE();
Z3_solver_ref * s = alloc(Z3_solver_ref, *mk_c(c), mk_smt_strategic_solver_factory(to_symbol(logic))); if (!smt_logics::supported_logic(to_symbol(logic))) {
mk_c(c)->save_object(s); std::ostringstream strm;
Z3_solver r = of_solver(s); strm << "logic '" << to_symbol(logic) << "' is not recognized";
RETURN_Z3(r); throw default_exception(strm.str());
RETURN_Z3(0);
}
else {
Z3_solver_ref * s = alloc(Z3_solver_ref, *mk_c(c), mk_smt_strategic_solver_factory(to_symbol(logic)));
mk_c(c)->save_object(s);
Z3_solver r = of_solver(s);
RETURN_Z3(r);
}
Z3_CATCH_RETURN(0); Z3_CATCH_RETURN(0);
} }

127
src/cmd_context/cmd_context.cpp
View file

@ -45,6 +45,7 @@ Notes:
#include"model_params.hpp" #include"model_params.hpp"
#include"th_rewriter.h" #include"th_rewriter.h"
#include"tactic_exception.h" #include"tactic_exception.h"
#include"smt_logics.h"
func_decls::func_decls(ast_manager & m, func_decl * f): func_decls::func_decls(ast_manager & m, func_decl * f):
m_decls(TAG(func_decl*, f, 0)) { m_decls(TAG(func_decl*, f, 0)) {
@ -503,128 +504,32 @@ void cmd_context::load_plugin(symbol const & name, bool install, svector<family_
fids.erase(id); fids.erase(id);
} }
bool cmd_context::logic_has_arith_core(symbol const & s) const {
return
s == "QF_LRA" ||
s == "QF_LIA" ||
s == "QF_RDL" ||
s == "QF_IDL" ||
s == "QF_AUFLIA" ||
s == "QF_ALIA" ||
s == "QF_AUFLIRA" ||
s == "QF_AUFNIA" ||
s == "QF_AUFNIRA" ||
s == "QF_ANIA" ||
s == "QF_LIRA" ||
s == "QF_UFLIA" ||
s == "QF_UFLRA" ||
s == "QF_UFIDL" ||
s == "QF_UFRDL" ||
s == "QF_NIA" ||
s == "QF_NRA" ||
s == "QF_NIRA" ||
s == "QF_UFNRA" ||
s == "QF_UFNIA" ||
s == "QF_UFNIRA" ||
s == "QF_BVRE" ||
s == "ALIA" ||
s == "AUFLIA" ||
s == "AUFLIRA" ||
s == "AUFNIA" ||
s == "AUFNIRA" ||
s == "UFLIA" ||
s == "UFLRA" ||
s == "UFNRA" ||
s == "UFNIRA" ||
s == "NIA" ||
s == "NRA" ||
s == "UFNIA" ||
s == "LIA" ||
s == "LRA" ||
s == "UFIDL" ||
s == "QF_FP" ||
s == "QF_FPBV" ||
s == "QF_BVFP" ||
s == "QF_S" ||
s == "ALL" ||
s == "QF_FD" ||
s == "HORN";
}
bool cmd_context::logic_has_arith() const { bool cmd_context::logic_has_arith() const {
return !has_logic() || logic_has_arith_core(m_logic); return !has_logic() || smt_logics::logic_has_arith(m_logic);
} }
bool cmd_context::logic_has_bv_core(symbol const & s) const {
return
s == "UFBV" ||
s == "AUFBV" ||
s == "ABV" ||
s == "BV" ||
s == "QF_BV" ||
s == "QF_UFBV" ||
s == "QF_ABV" ||
s == "QF_AUFBV" ||
s == "QF_BVRE" ||
s == "QF_FPBV" ||
s == "QF_BVFP" ||
s == "ALL" ||
s == "QF_FD" ||
s == "HORN";
}
bool cmd_context::logic_has_horn(symbol const& s) const {
return s == "HORN";
}
bool cmd_context::logic_has_bv() const { bool cmd_context::logic_has_bv() const {
return !has_logic() || logic_has_bv_core(m_logic); return !has_logic() || smt_logics::logic_has_bv(m_logic);
}
bool cmd_context::logic_has_seq_core(symbol const& s) const {
return s == "QF_BVRE" || s == "QF_S" || s == "ALL";
} }
bool cmd_context::logic_has_seq() const { bool cmd_context::logic_has_seq() const {
return !has_logic() || logic_has_seq_core(m_logic); return !has_logic() || smt_logics::logic_has_seq(m_logic);
}
bool cmd_context::logic_has_fpa_core(symbol const& s) const {
return s == "QF_FP" || s == "QF_FPBV" || s == "QF_BVFP" || s == "ALL";
} }
bool cmd_context::logic_has_fpa() const { bool cmd_context::logic_has_fpa() const {
return !has_logic() || logic_has_fpa_core(m_logic); return !has_logic() || smt_logics::logic_has_fpa(m_logic);
} }
bool cmd_context::logic_has_array_core(symbol const & s) const {
return
s == "QF_AX" ||
s == "QF_AUFLIA" ||
s == "QF_ANIA" ||
s == "QF_ALIA" ||
s == "QF_AUFLIRA" ||
s == "QF_AUFNIA" ||
s == "QF_AUFNIRA" ||
s == "ALIA" ||
s == "AUFLIA" ||
s == "AUFLIRA" ||
s == "AUFNIA" ||
s == "AUFNIRA" ||
s == "AUFBV" ||
s == "ABV" ||
s == "ALL" ||
s == "QF_ABV" ||
s == "QF_AUFBV" ||
s == "HORN";
}
bool cmd_context::logic_has_array() const { bool cmd_context::logic_has_array() const {
return !has_logic() || logic_has_array_core(m_logic); return !has_logic() || smt_logics::logic_has_array(m_logic);
} }
bool cmd_context::logic_has_datatype() const { bool cmd_context::logic_has_datatype() const {
return !has_logic() || m_logic == "QF_FD"; return !has_logic() || smt_logics::logic_has_datatype(m_logic);
} }
void cmd_context::init_manager_core(bool new_manager) { void cmd_context::init_manager_core(bool new_manager) {
@ -706,31 +611,19 @@ void cmd_context::init_external_manager() {
init_manager_core(false); init_manager_core(false);
} }
bool cmd_context::supported_logic(symbol const & s) const {
return s == "QF_UF" || s == "UF" || s == "ALL" || s == "QF_FD" ||
logic_has_arith_core(s) || logic_has_bv_core(s) ||
logic_has_array_core(s) || logic_has_seq_core(s) ||
logic_has_horn(s) || logic_has_fpa_core(s);
}
bool cmd_context::set_logic(symbol const & s) { bool cmd_context::set_logic(symbol const & s) {
if (has_logic()) if (has_logic())
throw cmd_exception("the logic has already been set"); throw cmd_exception("the logic has already been set");
if (has_manager() && m_main_ctx) if (has_manager() && m_main_ctx)
throw cmd_exception("logic must be set before initialization"); throw cmd_exception("logic must be set before initialization");
if (!supported_logic(s)) { if (!smt_logics::supported_logic(s)) {
return false; return false;
} }
m_logic = s; m_logic = s;
if (is_logic("QF_RDL") || if (smt_logics::logic_has_reals_only(s)) {
is_logic("QF_LRA") ||
is_logic("UFLRA") ||
is_logic("LRA") ||
is_logic("RDL") ||
is_logic("QF_NRA") ||
is_logic("QF_UFNRA") ||
is_logic("QF_UFLRA"))
m_numeral_as_real = true; m_numeral_as_real = true;
}
return true; return true;
} }

7
src/cmd_context/cmd_context.h
View file

@ -249,19 +249,12 @@ protected:
void erase_psort_decl_core(symbol const & s); void erase_psort_decl_core(symbol const & s);
void erase_macro_core(symbol const & s); void erase_macro_core(symbol const & s);
bool logic_has_arith_core(symbol const & s) const;
bool logic_has_bv_core(symbol const & s) const;
bool logic_has_array_core(symbol const & s) const;
bool logic_has_seq_core(symbol const & s) const;
bool logic_has_fpa_core(symbol const & s) const;
bool logic_has_horn(symbol const& s) const;
bool logic_has_arith() const; bool logic_has_arith() const;
bool logic_has_bv() const; bool logic_has_bv() const;
bool logic_has_seq() const; bool logic_has_seq() const;
bool logic_has_array() const; bool logic_has_array() const;
bool logic_has_datatype() const; bool logic_has_datatype() const;
bool logic_has_fpa() const; bool logic_has_fpa() const;
bool supported_logic(symbol const & s) const;
void print_unsupported_msg() { regular_stream() << "unsupported" << std::endl; } void print_unsupported_msg() { regular_stream() << "unsupported" << std::endl; }
void print_unsupported_info(symbol const& s, int line, int pos) { if (s != symbol::null) diagnostic_stream() << "; " << s << " line: " << line << " position: " << pos << std::endl;} void print_unsupported_info(symbol const& s, int line, int pos) { if (s != symbol::null) diagnostic_stream() << "; " << s << " line: " << line << " position: " << pos << std::endl;}

149
src/solver/smt_logics.cpp Normal file
View file

@ -0,0 +1,149 @@
/*++
Copyright (c) 2016 Microsoft Corporation
Module Name:
smt_logics.cpp
Abstract:
Module for recognizing SMT logics.
Author:
Nikolaj Bjorner (nbjorner) 2016-11-4
Revision History:
--*/
#include "symbol.h"
#include "smt_logics.h"
bool smt_logics::supported_logic(symbol const & s) {
return logic_has_uf(s) || logic_is_all(s) || logic_has_fd(s) ||
logic_has_arith(s) || logic_has_bv(s) ||
logic_has_array(s) || logic_has_seq(s) ||
logic_has_horn(s) || logic_has_fpa(s);
}
bool smt_logics::logic_has_reals_only(symbol const& s) {
return
s == "QF_RDL" ||
s == "QF_LRA" ||
s == "UFLRA" ||
s == "LRA" ||
s == "RDL" ||
s == "QF_NRA" ||
s == "QF_UFNRA" ||
s == "QF_UFLRA";
}
bool smt_logics::logic_has_arith(symbol const & s) {
return
s == "QF_LRA" ||
s == "QF_LIA" ||
s == "QF_RDL" ||
s == "QF_IDL" ||
s == "QF_AUFLIA" ||
s == "QF_ALIA" ||
s == "QF_AUFLIRA" ||
s == "QF_AUFNIA" ||
s == "QF_AUFNIRA" ||
s == "QF_ANIA" ||
s == "QF_LIRA" ||
s == "QF_UFLIA" ||
s == "QF_UFLRA" ||
s == "QF_UFIDL" ||
s == "QF_UFRDL" ||
s == "QF_NIA" ||
s == "QF_NRA" ||
s == "QF_NIRA" ||
s == "QF_UFNRA" ||
s == "QF_UFNIA" ||
s == "QF_UFNIRA" ||
s == "QF_BVRE" ||
s == "ALIA" ||
s == "AUFLIA" ||
s == "AUFLIRA" ||
s == "AUFNIA" ||
s == "AUFNIRA" ||
s == "UFLIA" ||
s == "UFLRA" ||
s == "UFNRA" ||
s == "UFNIRA" ||
s == "NIA" ||
s == "NRA" ||
s == "UFNIA" ||
s == "LIA" ||
s == "LRA" ||
s == "UFIDL" ||
s == "QF_FP" ||
s == "QF_FPBV" ||
s == "QF_BVFP" ||
s == "QF_S" ||
s == "ALL" ||
s == "QF_FD" ||
s == "HORN";
}
bool smt_logics::logic_has_bv(symbol const & s) {
return
s == "UFBV" ||
s == "AUFBV" ||
s == "ABV" ||
s == "BV" ||
s == "QF_BV" ||
s == "QF_UFBV" ||
s == "QF_ABV" ||
s == "QF_AUFBV" ||
s == "QF_BVRE" ||
s == "QF_FPBV" ||
s == "QF_BVFP" ||
s == "ALL" ||
s == "QF_FD" ||
s == "HORN";
}
bool smt_logics::logic_has_array(symbol const & s) {
return
s == "QF_AX" ||
s == "QF_AUFLIA" ||
s == "QF_ANIA" ||
s == "QF_ALIA" ||
s == "QF_AUFLIRA" ||
s == "QF_AUFNIA" ||
s == "QF_AUFNIRA" ||
s == "ALIA" ||
s == "AUFLIA" ||
s == "AUFLIRA" ||
s == "AUFNIA" ||
s == "AUFNIRA" ||
s == "AUFBV" ||
s == "ABV" ||
s == "ALL" ||
s == "QF_ABV" ||
s == "QF_AUFBV" ||
s == "HORN";
}
bool smt_logics::logic_has_seq(symbol const & s) {
return s == "QF_BVRE" || s == "QF_S" || s == "ALL";
}
bool smt_logics::logic_has_fpa(symbol const & s) {
return s == "QF_FP" || s == "QF_FPBV" || s == "QF_BVFP" || s == "ALL";
}
bool smt_logics::logic_has_uf(symbol const & s) {
return s == "QF_UF" || s == "UF";
}
bool smt_logics::logic_has_horn(symbol const& s) {
return s == "HORN";
}
bool smt_logics::logic_has_datatype(symbol const& s) {
return s == "QF_FD";
}

40
src/solver/smt_logics.h Normal file
View file

@ -0,0 +1,40 @@
/*++
Copyright (c) 2016 Microsoft Corporation
Module Name:
smt_logics.h
Abstract:
Module for recognizing SMT logics.
Author:
Nikolaj Bjorner (nbjorner) 2016-11-4
Revision History:
--*/
#ifndef SMT_LOGICS_H_
#define SMT_LOGICS_H_
class smt_logics {
public:
smt_logics() {}
static bool supported_logic(symbol const & s);
static bool logic_has_reals_only(symbol const& l);
static bool logic_is_all(symbol const& s) { return s == "ALL"; }
static bool logic_has_uf(symbol const& s);
static bool logic_has_arith(symbol const & s);
static bool logic_has_bv(symbol const & s);
static bool logic_has_array(symbol const & s);
static bool logic_has_seq(symbol const & s);
static bool logic_has_fpa(symbol const & s);
static bool logic_has_horn(symbol const& s);
static bool logic_has_fd(symbol const& s) { return s == "QF_FD"; }
static bool logic_has_datatype(symbol const& s);
};
#endif /* SMT_LOGICS_H_ */