mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-28 08:58:44 +00:00
Code Activity

move qhead to attribute on the state instead of the simplifier,

Browse source 
- add sat.smt option to enable the new incremental core (it is not ready for mainstream consumption as cloning and other features are not implemented and it hasn't been tested in any detail yet).
- move "name" into attribute on simplifier so it can be reused for diagnostics by the seq-simplifier.
This commit is contained in:
Nikolaj Bjorner 2022-11-29 16:36:02 +07:00
parent ac023935a3
commit dd1ca8f6bd
37 changed files with 132 additions and 85 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/tactic/dependent_expr_state_tactic.h
View file

@ -22,7 +22,6 @@ Author:
class dependent_expr_state_tactic : public tactic, public dependent_expr_state {
ast_manager& m;
params_ref m_params;
std::string m_name;
trail_stack m_trail;
goal_ref m_goal;
dependent_expr m_dep;
@ -42,10 +41,9 @@ class dependent_expr_state_tactic : public tactic, public dependent_expr_state {
public:
dependent_expr_state_tactic(ast_manager& m, params_ref const& p, dependent_expr_simplifier_factory* f, char const* name):
dependent_expr_state_tactic(ast_manager& m, params_ref const& p, dependent_expr_simplifier_factory* f):
m(m),
m_params(p),
m_name(name),
m_factory(f),
m_simp(nullptr),
m_dep(m, m.mk_true(), nullptr)
@ -79,7 +77,7 @@ public:
return *m_model_trail;
}
char const* name() const override { return m_name.c_str(); }
char const* name() const override { return m_simp?m_simp->name():"null"; }
void updt_params(params_ref const & p) override {
m_params.append(p);
@ -93,7 +91,7 @@ public:
}
tactic * translate(ast_manager & m) override {
return alloc(dependent_expr_state_tactic, m, m_params, m_factory.get(), name());
return alloc(dependent_expr_state_tactic, m, m_params, m_factory.get());
}
void operator()(goal_ref const & in,
@ -105,10 +103,12 @@ public:
try {
if (!in->proofs_enabled())
m_simp->reduce();
if (m.inc())
advance_qhead();
}
catch (rewriter_exception& ex) {
throw tactic_exception(ex.msg());
}
}
m_goal->elim_true();
m_goal->elim_redundancies();
m_goal->inc_depth();