mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-29 20:05:51 +00:00
Code Activity

remove template Context dependency in every trail object

Browse source
This commit is contained in:
Nikolaj Bjorner 2021-02-08 15:41:57 -08:00
parent df0a449f70
commit a152bb1e80
65 changed files with 413 additions and 413 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/sat/smt/bv_solver.cpp
View file

@ -24,7 +24,7 @@ Author:
namespace bv {
class solver::bit_trail : public trail<euf::solver> {
class solver::bit_trail : public trail {
solver& s;
solver::var_pos vp;
sat::literal lit;
@ -36,14 +36,14 @@ namespace bv {
}
};
class solver::bit_occs_trail : public trail<euf::solver> {
class solver::bit_occs_trail : public trail {
atom& a;
var_pos_occ* m_occs;
public:
bit_occs_trail(solver& s, atom& a): a(a), m_occs(a.m_occs) {}
virtual void undo(euf::solver& euf) {
virtual void undo() {
a.m_occs = m_occs;
}
};
@ -413,7 +413,7 @@ namespace bv {
if (m_prop_queue_head == m_prop_queue.size())
return false;
force_push();
ctx.push(value_trail<euf::solver, unsigned>(m_prop_queue_head));
ctx.push(value_trail<unsigned>(m_prop_queue_head));
for (; m_prop_queue_head < m_prop_queue.size() && !s().inconsistent(); ++m_prop_queue_head) {
auto const p = m_prop_queue[m_prop_queue_head];
if (p.m_atom) {
@ -559,7 +559,7 @@ namespace bv {
SASSERT(l2.var() == l.var());
VERIFY(l2.var() == l.var());
sat::literal r2 = (l.sign() == l2.sign()) ? r : ~r;
ctx.push(vector2_value_trail<euf::solver, bits_vector, sat::literal>(m_bits, vp.first, vp.second));
ctx.push(vector2_value_trail<bits_vector, sat::literal>(m_bits, vp.first, vp.second));
m_bits[vp.first][vp.second] = r2;
set_bit_eh(vp.first, r2, vp.second);
}