3
0
Fork 0
mirror of https://github.com/Z3Prover/z3 synced 2025-06-14 01:46:15 +00:00

Formatting, mostly tabs.

Signed-off-by: Christoph M. Wintersteiger <cwinter@microsoft.com>
This commit is contained in:
Christoph M. Wintersteiger 2015-01-08 17:54:04 +00:00
parent cad841cff4
commit 0381e4317a
10 changed files with 1448 additions and 1478 deletions

View file

@ -3197,7 +3197,7 @@ void fpa2bv_converter::mk_rounding_mode(func_decl * f, expr_ref & result)
void fpa2bv_converter::dbg_decouple(const char * prefix, expr_ref & e) { void fpa2bv_converter::dbg_decouple(const char * prefix, expr_ref & e) {
#ifdef Z3DEBUG #ifdef Z3DEBUG
// return; return;
// CMW: This works only for quantifier-free formulas. // CMW: This works only for quantifier-free formulas.
expr_ref new_e(m); expr_ref new_e(m);
new_e = m.mk_fresh_const(prefix, m.get_sort(e)); new_e = m.mk_fresh_const(prefix, m.get_sort(e));

View file

@ -124,15 +124,15 @@ namespace Duality {
} }
void timer_stop(const char *name){ void timer_stop(const char *name){
if(current->name != name || !current->parent){ if (current->name != name || !current->parent) {
#if 0 #if 0
std::cerr << "imbalanced timer_start and timer_stop"; std::cerr << "imbalanced timer_start and timer_stop";
exit(1); exit(1);
#endif #endif
// in case we lost a timer stop due to an exception // in case we lost a timer stop due to an exception
while(current->name != name && current->parent) while (current->name != name && current->parent)
current = current->parent; current = current->parent;
if(current->parent){ if (current->parent) {
current->time += (current_time() - current->start_time); current->time += (current_time() - current->start_time);
current = current->parent; current = current->parent;
} }

File diff suppressed because it is too large Load diff

View file

@ -82,7 +82,7 @@ namespace Duality {
if(rpfp) if(rpfp)
dealloc(rpfp); dealloc(rpfp);
if(ls) if(ls)
dealloc(ls); (ls);
} }
}; };
@ -268,15 +268,15 @@ lbool dl_interface::query(::expr * query) {
::ast *fa = pinned[i]; ::ast *fa = pinned[i];
if(is_func_decl(fa)){ if(is_func_decl(fa)){
::func_decl *fd = to_func_decl(fa); ::func_decl *fd = to_func_decl(fa);
if(m_ctx.is_predicate(fd)) { if (m_ctx.is_predicate(fd)) {
func_decl f(_d->ctx,fd); func_decl f(_d->ctx, fd);
if(!heads.contains(fd)){ if (!heads.contains(fd)) {
int arity = f.arity(); int arity = f.arity();
std::vector<expr> args; std::vector<expr> args;
for(int j = 0; j < arity; j++) for (int j = 0; j < arity; j++)
args.push_back(_d->ctx.fresh_func_decl("X",f.domain(j))()); args.push_back(_d->ctx.fresh_func_decl("X", f.domain(j))());
expr c = implies(_d->ctx.bool_val(false),f(args)); expr c = implies(_d->ctx.bool_val(false), f(args));
c = _d->ctx.make_quant(Forall,args,c); c = _d->ctx.make_quant(Forall, args, c);
clauses.push_back(c); clauses.push_back(c);
bounds.push_back(UINT_MAX); bounds.push_back(UINT_MAX);
} }
@ -483,17 +483,17 @@ void dl_interface::display_certificate_non_const(std::ostream& out) {
model orig_model = _d->cex.get_tree()->dualModel; model orig_model = _d->cex.get_tree()->dualModel;
for(unsigned i = 0; i < orig_model.num_consts(); i++){ for(unsigned i = 0; i < orig_model.num_consts(); i++){
func_decl cnst = orig_model.get_const_decl(i); func_decl cnst = orig_model.get_const_decl(i);
if(locals.find(cnst) == locals.end()){ if (locals.find(cnst) == locals.end()) {
expr thing = orig_model.get_const_interp(cnst); expr thing = orig_model.get_const_interp(cnst);
mod.register_decl(to_func_decl(cnst.raw()),to_expr(thing.raw())); mod.register_decl(to_func_decl(cnst.raw()), to_expr(thing.raw()));
} }
} }
for(unsigned i = 0; i < orig_model.num_funcs(); i++){ for(unsigned i = 0; i < orig_model.num_funcs(); i++){
func_decl cnst = orig_model.get_func_decl(i); func_decl cnst = orig_model.get_func_decl(i);
if(locals.find(cnst) == locals.end()){ if (locals.find(cnst) == locals.end()) {
func_interp thing = orig_model.get_func_interp(cnst); func_interp thing = orig_model.get_func_interp(cnst);
::func_interp *thing_raw = thing; ::func_interp *thing_raw = thing;
mod.register_decl(to_func_decl(cnst.raw()),thing_raw->copy()); mod.register_decl(to_func_decl(cnst.raw()), thing_raw->copy());
} }
} }
model_v2_pp(out,mod); model_v2_pp(out,mod);