mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-12 12:08:18 +00:00
Code Activity

avoid duplicate class names frame in sat_scc and sat_smt

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2020-08-30 20:16:48 -07:00
parent bee3077640
commit 314bd9277b
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/sat/smt/euf_internalize.cpp
View file

@ -36,7 +36,7 @@ namespace euf {
loop: loop:
if (!m.inc()) if (!m.inc())
throw tactic_exception(m.limit().get_cancel_msg()); 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; expr* e = fr.m_e;
if (m_egraph.find(e)) { if (m_egraph.find(e)) {
m_stack.pop_back(); m_stack.pop_back();
@ -80,7 +80,7 @@ namespace euf {
return n; return n;
} }
if (is_app(e) && to_app(e)->get_num_args() > 0) { 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; return nullptr;
} }
n = m_egraph.mk(e, 0, nullptr); n = m_egraph.mk(e, 0, nullptr);

2
src/sat/smt/euf_solver.h
View file

@ -82,7 +82,7 @@ namespace euf {
ptr_vector<euf::enode> m_var2node; ptr_vector<euf::enode> m_var2node;
ptr_vector<unsigned> m_explain; ptr_vector<unsigned> m_explain;
euf::enode_vector m_args; euf::enode_vector m_args;
svector<sat::frame> m_stack; svector<sat::eframe> m_stack;
unsigned m_num_scopes { 0 }; unsigned m_num_scopes { 0 };
unsigned_vector m_var_trail; unsigned_vector m_var_trail;
svector<scope> m_scopes; svector<scope> m_scopes;

8
src/sat/smt/sat_smt.h
View file

@ -21,16 +21,16 @@ Author:
namespace sat { namespace sat {
struct frame { struct eframe {
expr* m_e; expr* m_e;
unsigned m_idx; unsigned m_idx;
frame(expr* e) : m_e(e), m_idx(0) {} eframe(expr* e) : m_e(e), m_idx(0) {}
}; };
struct scoped_stack { struct scoped_stack {
svector<frame>& s; svector<eframe>& s;
unsigned sz; 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); } ~scoped_stack() { s.shrink(sz); }
}; };