3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-08-08 20:21:23 +00:00

add more simplifiers, fix model reconstruction order for elim_unconstrained

- enable sat.smt in smt_tactic that
is invoked by default on first goals
add flatten-clauses
add push-ite
have tptp5 front-end pretty print SMT2 formulas a little nicer.
This commit is contained in:
Nikolaj Bjorner 2022-12-01 02:35:43 +09:00
parent edb0fc394b
commit cfc8e19baf
10 changed files with 271 additions and 54 deletions

View file

@ -15,19 +15,21 @@ Author:
#pragma once
#include "ast/simplifiers/dependent_expr_state.h"
#include "ast/rewriter/elim_term_ite.h"
#include "ast/normal_forms/elim_term_ite.h""
class elim_term_ite_simplifier : public dependent_expr_simplifier {
elim_term_ite m_elim;
defined_names m_df;
elim_term_ite_rw m_rewriter;
public:
elim_term_ite_simplifier(ast_manager& m, params_ref const& p, dependent_expr_state& fmls):
dependent_expr_simplifier(m, fmls),
m_elim_term_ite(m) {
m_df(m),
m_rewriter(m, m_df) {
}
char const* name() const override { return "distribute-forall"; }
char const* name() const override { return "elim-term-ite"; }
void reduce() override {
if (!m_fmls.has_quantifiers())
@ -42,8 +44,8 @@ public:
}
}
void push() override { dependent_expr_simplifier::push(); m_rewriter.push(); }
void push() override { dependent_expr_simplifier::push(); m_df.push(); m_rewriter.push(); }
void pop(unsigned n) override { dependent_expr_simplifier::pop(n); m_rewriter.pop(n); }
void pop(unsigned n) override { m_rewriter.pop(n); m_df.pop(n); dependent_expr_simplifier::pop(n); }
};