mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-18 20:03:38 +00:00
Code Activity

another module level ifdef for #4382

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-05-18 15:01:27 -07:00
parent d603bd7e3b
commit c8c02060ee
4 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/ast/seq_decl_plugin.cpp
View file

@ -569,7 +569,6 @@ void seq_decl_plugin::init() {
sort* str2TintT[3] = { strT, strT, intT }; sort* str2TintT[3] = { strT, strT, intT };
sort* seqAintT[2] = { seqA, intT }; sort* seqAintT[2] = { seqA, intT };
sort* seq3A[3] = { seqA, seqA, seqA }; sort* seq3A[3] = { seqA, seqA, seqA };
sort* charTcharT[2] = { m_char, m_char };
m_sigs.resize(LAST_SEQ_OP); m_sigs.resize(LAST_SEQ_OP);
// TBD: have (par ..) construct and load parameterized signature from premable. // TBD: have (par ..) construct and load parameterized signature from premable.
m_sigs[OP_SEQ_UNIT] = alloc(psig, m, "seq.unit", 1, 1, &A, seqA); m_sigs[OP_SEQ_UNIT] = alloc(psig, m, "seq.unit", 1, 1, &A, seqA);
@ -609,6 +608,7 @@ void seq_decl_plugin::init() {
m_sigs[OP_STRING_CONST] = nullptr; m_sigs[OP_STRING_CONST] = nullptr;
#if _USE_UNICODE #if _USE_UNICODE
m_sigs[OP_CHAR_CONST] = nullptr; m_sigs[OP_CHAR_CONST] = nullptr;
sort* charTcharT[2] = { m_char, m_char };
m_sigs[OP_CHAR_LE] = alloc(psig, m, "char.<=", 0, 2, charTcharT, boolT); m_sigs[OP_CHAR_LE] = alloc(psig, m, "char.<=", 0, 2, charTcharT, boolT);
#endif #endif
m_sigs[_OP_STRING_STRIDOF] = alloc(psig, m, "str.indexof", 0, 3, str2TintT, intT); m_sigs[_OP_STRING_STRIDOF] = alloc(psig, m, "str.indexof", 0, 3, str2TintT, intT);

2
src/smt/seq_unicode.cpp
View file

@ -28,7 +28,7 @@ namespace smt {
seq(m), seq(m),
dl(), dl(),
m_qhead(0), m_qhead(0),
m_nc_functor(*this), m_nc_functor(),
m_var_value_hash(*this), m_var_value_hash(*this),
m_var_value_eq(*this), m_var_value_eq(*this),
m_var_value_table(DEFAULT_HASHTABLE_INITIAL_CAPACITY, m_var_value_hash, m_var_value_eq) m_var_value_table(DEFAULT_HASHTABLE_INITIAL_CAPACITY, m_var_value_hash, m_var_value_eq)

3
src/smt/seq_unicode.h
View file

@ -35,9 +35,8 @@ namespace smt {
class nc_functor { class nc_functor {
literal_vector m_literals; literal_vector m_literals;
seq_unicode& m_super;
public: public:
nc_functor(seq_unicode& s): m_super(s) {} nc_functor() {}
void operator()(literal const& l) { void operator()(literal const& l) {
if (l != null_literal) m_literals.push_back(l); if (l != null_literal) m_literals.push_back(l);
} }

9
src/solver/parallel_tactic.cpp
View file

@ -28,6 +28,14 @@ Notes:
--*/ --*/
#ifdef SINGLE_THREAD
tactic * mk_parallel_tactic(solver* s, params_ref const& p) {
throw default_exception("parallel tactic is disabled in single threaded mode");
}
#else
#include <thread> #include <thread>
#include <mutex> #include <mutex>
#include <cmath> #include <cmath>
@ -795,3 +803,4 @@ tactic * mk_parallel_tactic(solver* s, params_ref const& p) {
return alloc(parallel_tactic, s, p); return alloc(parallel_tactic, s, p);
} }
#endif