mirror of
https://github.com/Z3Prover/z3
synced 2025-04-06 17:44:08 +00:00
avoid duplicate class names frame in sat_scc and sat_smt
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
parent
bee3077640
commit
314bd9277b
|
@ -36,7 +36,7 @@ namespace euf {
|
|||
loop:
|
||||
if (!m.inc())
|
||||
throw tactic_exception(m.limit().get_cancel_msg());
|
||||
sat::frame & fr = m_stack.back();
|
||||
sat::eframe & fr = m_stack.back();
|
||||
expr* e = fr.m_e;
|
||||
if (m_egraph.find(e)) {
|
||||
m_stack.pop_back();
|
||||
|
@ -80,7 +80,7 @@ namespace euf {
|
|||
return n;
|
||||
}
|
||||
if (is_app(e) && to_app(e)->get_num_args() > 0) {
|
||||
m_stack.push_back(sat::frame(e));
|
||||
m_stack.push_back(sat::eframe(e));
|
||||
return nullptr;
|
||||
}
|
||||
n = m_egraph.mk(e, 0, nullptr);
|
||||
|
|
|
@ -82,7 +82,7 @@ namespace euf {
|
|||
ptr_vector<euf::enode> m_var2node;
|
||||
ptr_vector<unsigned> m_explain;
|
||||
euf::enode_vector m_args;
|
||||
svector<sat::frame> m_stack;
|
||||
svector<sat::eframe> m_stack;
|
||||
unsigned m_num_scopes { 0 };
|
||||
unsigned_vector m_var_trail;
|
||||
svector<scope> m_scopes;
|
||||
|
|
|
@ -21,16 +21,16 @@ Author:
|
|||
|
||||
namespace sat {
|
||||
|
||||
struct frame {
|
||||
struct eframe {
|
||||
expr* m_e;
|
||||
unsigned m_idx;
|
||||
frame(expr* e) : m_e(e), m_idx(0) {}
|
||||
eframe(expr* e) : m_e(e), m_idx(0) {}
|
||||
};
|
||||
|
||||
struct scoped_stack {
|
||||
svector<frame>& s;
|
||||
svector<eframe>& s;
|
||||
unsigned sz;
|
||||
scoped_stack(svector<frame>& s):s(s), sz(s.size()) {}
|
||||
scoped_stack(svector<eframe>& s):s(s), sz(s.size()) {}
|
||||
~scoped_stack() { s.shrink(sz); }
|
||||
};
|
||||
|
||||
|
|
Loading…
Reference in a new issue