mirrors/z3
3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-21 13:23:39 +00:00
Code Activity

fix #1544

Browse source 
Signed-off-by: Nikolaj Bjorner <nbjorner@microsoft.com>
This commit is contained in:
Nikolaj Bjorner 2018-03-16 19:30:13 -07:00
parent b1f05d8271
commit 5dd7e2c520
3 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
src/api/z3.h
View file

@ -22,7 +22,6 @@ Notes:
#define Z3_H_ #define Z3_H_
#include <stdio.h> #include <stdio.h>
#include <stdbool.h>
#include "z3_macros.h" #include "z3_macros.h"
#include "z3_api.h" #include "z3_api.h"
#include "z3_ast_containers.h" #include "z3_ast_containers.h"

2
src/ast/rewriter/rewriter_def.h
View file

@ -194,12 +194,14 @@ bool rewriter_tpl<Config>::constant_fold(app * t, frame & fr) {
result_stack().shrink(fr.m_spos); result_stack().shrink(fr.m_spos);
result_stack().push_back(arg); result_stack().push_back(arg);
fr.m_state = REWRITE_BUILTIN; fr.m_state = REWRITE_BUILTIN;
TRACE("rewriter_step", tout << "step\n" << mk_ismt2_pp(t, m()) << "\n";);
if (visit<false>(arg, fr.m_max_depth)) { if (visit<false>(arg, fr.m_max_depth)) {
m_r = result_stack().back(); m_r = result_stack().back();
result_stack().pop_back(); result_stack().pop_back();
result_stack().pop_back(); result_stack().pop_back();
result_stack().push_back(m_r); result_stack().push_back(m_r);
cache_result<false>(t, m_r, m_pr, fr.m_cache_result); cache_result<false>(t, m_r, m_pr, fr.m_cache_result);
TRACE("rewriter_step", tout << "step 1\n" << mk_ismt2_pp(m_r, m()) << "\n";);
frame_stack().pop_back(); frame_stack().pop_back();
set_new_child_flag(t); set_new_child_flag(t);
} }

11
src/model/model_evaluator.cpp
View file

@ -187,14 +187,14 @@ struct evaluator_cfg : public default_rewriter_cfg {
TRACE("model_evaluator", tout << "reduce_app " << f->get_name() << "\n"; TRACE("model_evaluator", tout << "reduce_app " << f->get_name() << "\n";
for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m) << "\n"; for (unsigned i = 0; i < num; i++) tout << mk_ismt2_pp(args[i], m) << "\n";
tout << "---->\n" << mk_ismt2_pp(result, m) << "\n";); tout << "---->\n" << mk_ismt2_pp(result, m) << "\n";);
return BR_DONE; return BR_REWRITE1;
} }
if (st == BR_FAILED && !m.is_builtin_family_id(fid)) if (st == BR_FAILED && !m.is_builtin_family_id(fid))
st = evaluate_partial_theory_func(f, num, args, result, result_pr); st = evaluate_partial_theory_func(f, num, args, result, result_pr);
if (st == BR_DONE && is_app(result)) { if (st == BR_DONE && is_app(result)) {
app* a = to_app(result); app* a = to_app(result);
if (evaluate(a->get_decl(), a->get_num_args(), a->get_args(), result)) { if (evaluate(a->get_decl(), a->get_num_args(), a->get_args(), result)) {
return BR_DONE; return BR_REWRITE1;
} }
} }
CTRACE("model_evaluator", st != BR_FAILED, tout << result << "\n";); CTRACE("model_evaluator", st != BR_FAILED, tout << result << "\n";);
@ -399,12 +399,11 @@ struct evaluator_cfg : public default_rewriter_cfg {
} }
} }
} }
args_table::iterator it = table1.begin(), end = table1.end(); for (auto const& t : table1) {
for (; it != end; ++it) { switch (compare((t)[arity], else2)) {
switch (compare((*it)[arity], else2)) {
case l_true: break; case l_true: break;
case l_false: result = m.mk_false(); return BR_DONE; case l_false: result = m.mk_false(); return BR_DONE;
default: conj.push_back(m.mk_eq((*it)[arity], else2)); break; default: conj.push_back(m.mk_eq((t)[arity], else2)); break;
} }
} }
result = mk_and(conj); result = mk_and(conj);