3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-04-28 19:35:50 +00:00

move functionality from qe_util to ast_util

Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2015-06-23 14:33:45 +02:00
parent 5f484c069b
commit bf5419d44a
25 changed files with 174 additions and 161 deletions

View file

@ -30,6 +30,7 @@ Revision History:
#include "bool_rewriter.h"
#include "var_subst.h"
#include "uint_set.h"
#include "ast_util.h"
#include "qe_util.h"
#include "th_rewriter.h"
#include "for_each_expr.h"
@ -723,7 +724,7 @@ namespace eq {
m_subst(r, m_subst_map.size(), m_subst_map.c_ptr(), new_r);
m_rewriter(new_r);
conjs.reset();
qe::flatten_and(new_r, conjs);
flatten_and(new_r, conjs);
reduced = true;
}
}
@ -2414,7 +2415,7 @@ public:
void operator()(uint_set const& index_set, bool index_of_bound, expr_ref& fml) {
expr_ref_vector disjs(m);
qe::flatten_or(fml, disjs);
flatten_or(fml, disjs);
for (unsigned i = 0; i < disjs.size(); ++i) {
expr_ref_vector conjs(m);
conjs.push_back(disjs[i].get());
@ -2427,7 +2428,7 @@ public:
void operator()(uint_set const& index_set, bool index_of_bound, expr_ref_vector& fmls) {
qe::flatten_and(fmls);
flatten_and(fmls);
unsigned index;
if (has_unique_non_ground(fmls, index)) {
expr_ref fml(m);