Skip to content

Commit 805d579

Browse files
NikolajBjornerNikolajBjorner
committed
remove quotes from arguments to TRACE
Signed-off-by: Nikolaj Bjorner <[email protected]>
1 parent 84a5303 commit 805d579

File tree

577 files changed

+7210
-7210
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

577 files changed

+7210
-7210
lines changed

‎src/ackermannization/ackermannize_bv_tactic.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ class ackermannize_bv_tactic : public tactic {
3535
tactic_report report("ackermannize_bv", *g);
3636
fail_if_unsat_core_generation("ackermannize", g);
3737
fail_if_proof_generation("ackermannize", g);
38-
TRACE("goal", g->display(tout << "in\n"););
38+
TRACE(goal, g->display(tout << "in\n"););
3939

4040
ptr_vector<expr> flas;
4141
const unsigned sz = g->size();
@@ -46,7 +46,7 @@ class ackermannize_bv_tactic : public tactic {
4646
goal_ref resg(alloc(goal, *g, true));
4747
const bool success = lackr.mk_ackermann(resg, m_lemma_limit);
4848
if (!success) { // Just pass on the input unchanged
49-
TRACE("ackermannize", tout << "ackermannize not run due to limit" << std::endl;);
49+
TRACE(ackermannize, tout << "ackermannize not run due to limit" << std::endl;);
5050
result.reset();
5151
result.push_back(g.get());
5252
return;
@@ -58,7 +58,7 @@ class ackermannize_bv_tactic : public tactic {
5858
}
5959

6060
resg->inc_depth();
61-
TRACE("goal", resg->display(tout << "out\n"););
61+
TRACE(goal, resg->display(tout << "out\n"););
6262
}
6363

6464

‎src/ackermannization/ackr_bound_probe.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ackr_bound_probe : public probe {
6969
}
7070
p.prune_non_select();
7171
double total = ackr_helper::calculate_lemma_bound(p.m_fun2terms, p.m_sel2terms);
72-
TRACE("ackermannize", tout << "total=" << total << std::endl;);
72+
TRACE(ackermannize, tout << "total=" << total << std::endl;);
7373
return result(total);
7474
}
7575

‎src/ackermannization/ackr_model_converter.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,9 @@ class ackr_model_converter : public model_converter {
4343
void get_units(obj_map<expr, bool>& units) override { units.reset(); }
4444

4545
void operator()(model_ref & md) override {
46-
TRACE("ackermannize", tout << (fixed_model? "fixed" : "nonfixed") << "\n";);
47-
CTRACE("ackermannize", md, tout << *md << "\n");
48-
CTRACE("ackermannize", fixed_model, tout << *abstr_model << "\n");
46+
TRACE(ackermannize, tout << (fixed_model? "fixed" : "nonfixed") << "\n";);
47+
CTRACE(ackermannize, md, tout << *md << "\n");
48+
CTRACE(ackermannize, fixed_model, tout << *abstr_model << "\n");
4949

5050
model* new_model = alloc(model, m);
5151

@@ -96,7 +96,7 @@ void ackr_model_converter::convert(model * source, model * destination) {
9696
}
9797

9898
void ackr_model_converter::convert_constants(model * source, model * destination) {
99-
TRACE("ackermannize", tout << "converting constants\n";);
99+
TRACE(ackermannize, tout << "converting constants\n";);
100100
obj_map<func_decl, func_interp*> interpretations;
101101
obj_map<app, expr*> array_interpretations;
102102
model_evaluator evaluator(*source);
@@ -107,7 +107,7 @@ void ackr_model_converter::convert_constants(model * source, model * destination
107107
func_decl * const c = source->get_constant(i);
108108
app * const term = info->find_term(c);
109109
expr * value = source->get_const_interp(c);
110-
TRACE("ackermannize", tout << mk_ismt2_pp(c, m) << " " << mk_ismt2_pp(term, m) << "\n";);
110+
TRACE(ackermannize, tout << mk_ismt2_pp(c, m) << " " << mk_ismt2_pp(term, m) << "\n";);
111111
if (!term)
112112
destination->register_decl(c, value);
113113
else if (autil.is_select(term))
@@ -160,7 +160,7 @@ void ackr_model_converter::add_entry(model_evaluator & evaluator,
160160
void ackr_model_converter::add_entry(model_evaluator & evaluator,
161161
app* term, expr* value,
162162
obj_map<func_decl, func_interp*>& interpretations) {
163-
TRACE("ackermannize", tout << "add_entry"
163+
TRACE(ackermannize, tout << "add_entry"
164164
<< mk_ismt2_pp(term, m, 2)
165165
<< "->"
166166
<< mk_ismt2_pp(value, m, 2) << "\n";);
@@ -178,7 +178,7 @@ void ackr_model_converter::add_entry(model_evaluator & evaluator,
178178
args.push_back(evaluator(info->abstract(arg)));
179179
}
180180
if (fi->get_entry(args.data()) == nullptr) {
181-
TRACE("ackermannize",
181+
TRACE(ackermannize,
182182
tout << mk_ismt2_pp(declaration, m) << " args: " << std::endl;
183183
for (expr* arg : args) {
184184
tout << mk_ismt2_pp(arg, m) << std::endl;
@@ -187,7 +187,7 @@ void ackr_model_converter::add_entry(model_evaluator & evaluator,
187187
fi->insert_new_entry(args.data(), value);
188188
}
189189
else {
190-
TRACE("ackermannize", tout << "entry already present\n";);
190+
TRACE(ackermannize, tout << "entry already present\n";);
191191
}
192192

193193
}

‎src/ackermannization/lackr.cpp

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ lbool lackr::operator()() {
6565
if (rv == l_true) {
6666
m_solver->get_model(m_model);
6767
}
68-
CTRACE("ackermannize", rv == l_true, model_smt2_pp(tout << "abstr_model(\n", m, *(m_model.get()), 2); tout << ")\n"; );
68+
CTRACE(ackermannize, rv == l_true, model_smt2_pp(tout << "abstr_model(\n", m, *(m_model.get()), 2); tout << ")\n"; );
6969
return rv;
7070
}
7171

@@ -103,7 +103,7 @@ bool lackr::init() {
103103
// Introduce ackermann lemma for the two given terms.
104104
//
105105
bool lackr::ackr(app * const t1, app * const t2) {
106-
TRACE("ackermannize", tout << "ackr " << mk_ismt2_pp(t1, m, 2) << " , " << mk_ismt2_pp(t2, m, 2) << "\n";);
106+
TRACE(ackermannize, tout << "ackr " << mk_ismt2_pp(t1, m, 2) << " , " << mk_ismt2_pp(t2, m, 2) << "\n";);
107107
const unsigned sz = t1->get_num_args();
108108
SASSERT(t2->get_num_args() == sz);
109109
expr_ref_vector eqs(m);
@@ -112,7 +112,7 @@ bool lackr::ackr(app * const t1, app * const t2) {
112112
expr * const arg2 = t2->get_arg(i);
113113
if (m.are_equal(arg1, arg2)) continue; // quickly skip syntactically equal
114114
if (m.are_distinct(arg1, arg2)){ // quickly abort if there are two distinct (e.g. numerals)
115-
TRACE("ackermannize", tout << "never eq\n";);
115+
TRACE(ackermannize, tout << "never eq\n";);
116116
return false;
117117
}
118118
eqs.push_back(m.mk_eq(arg1, arg2));
@@ -125,7 +125,7 @@ bool lackr::ackr(app * const t1, app * const t2) {
125125
expr_ref cg(m.mk_implies(lhs, rhs), m);
126126
expr_ref cga = m_info->abstract(cg); // constraint needs abstraction due to nested applications
127127
m_simp(cga);
128-
TRACE("ackermannize",
128+
TRACE(ackermannize,
129129
tout << "abstr1 " << mk_ismt2_pp(a1, m, 2) << "\n";
130130
tout << "abstr2 " << mk_ismt2_pp(a2, m, 2) << "\n";
131131
tout << "ackr constr lhs" << mk_ismt2_pp(lhs, m, 2) << "\n";
@@ -144,7 +144,7 @@ bool lackr::ackr(app * const t1, app * const t2) {
144144
// Introduce the ackermann lemma for each pair of terms.
145145
//
146146
void lackr::eager_enc() {
147-
TRACE("ackermannize", tout << "#funs: " << m_fun2terms.size() << " #sels: " << m_sel2terms.size() << std::endl;);
147+
TRACE(ackermannize, tout << "#funs: " << m_fun2terms.size() << " #sels: " << m_sel2terms.size() << std::endl;);
148148
for (auto const& [k,v] : m_fun2terms) {
149149
checkpoint();
150150
ackr(v);
@@ -227,7 +227,7 @@ void lackr::push_abstraction() {
227227
lbool lackr::eager() {
228228
SASSERT(m_is_init);
229229
push_abstraction();
230-
TRACE("ackermannize", tout << "run sat 0\n"; );
230+
TRACE(ackermannize, tout << "run sat 0\n"; );
231231
lbool rv0 = m_solver->check_sat(0, nullptr);
232232
if (rv0 == l_false) {
233233
return l_false;
@@ -236,7 +236,7 @@ lbool lackr::eager() {
236236
expr_ref all = mk_and(m_ackrs);
237237
m_simp(all);
238238
m_solver->assert_expr(all);
239-
TRACE("ackermannize", tout << "run sat all\n"; );
239+
TRACE(ackermannize, tout << "run sat all\n"; );
240240
return m_solver->check_sat(0, nullptr);
241241
}
242242

@@ -248,7 +248,7 @@ lbool lackr::lazy() {
248248
while (true) {
249249
m_st.m_it++;
250250
checkpoint();
251-
TRACE("ackermannize", tout << "lazy check: " << m_st.m_it << "\n";);
251+
TRACE(ackermannize, tout << "lazy check: " << m_st.m_it << "\n";);
252252
const lbool r = m_solver->check_sat(0, nullptr);
253253
if (r == l_undef) return l_undef; // give up
254254
if (r == l_false) return l_false; // abstraction unsat

‎src/ackermannization/lackr_model_constructor.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -199,12 +199,12 @@ struct lackr_model_constructor::imp {
199199
for (unsigned i = 0; i < num; ++i) {
200200
expr * val = nullptr;
201201
const bool b = eval_cached(to_app(args[i]), val); // TODO: OK conversion to_app?
202-
CTRACE("model_constructor", m_conflicts.empty() && !b, tout << "fail arg val(\n" << mk_ismt2_pp(args[i], m, 2) << '\n'; );
202+
CTRACE(model_constructor, m_conflicts.empty() && !b, tout << "fail arg val(\n" << mk_ismt2_pp(args[i], m, 2) << '\n'; );
203203
if (!b) {
204204
// bailing out because args eval failed previously
205205
return false;
206206
}
207-
TRACE("model_constructor", tout <<
207+
TRACE(model_constructor, tout <<
208208
"arg val " << i << "(\n" << mk_ismt2_pp(args[i], m, 2)
209209
<< " : " << mk_ismt2_pp(val, m, 2) << '\n'; );
210210
SASSERT(b);
@@ -233,15 +233,15 @@ struct lackr_model_constructor::imp {
233233
bool mk_value(app * a) {
234234
if (is_val(a))
235235
return true; // skip numerals
236-
TRACE("model_constructor", tout << "mk_value(\n" << mk_ismt2_pp(a, m, 2) << ")\n";);
236+
TRACE(model_constructor, tout << "mk_value(\n" << mk_ismt2_pp(a, m, 2) << ")\n";);
237237
SASSERT(!m_app2val.contains(a));
238238
expr_ref result(m);
239239
if (!evaluate(a, result))
240240
return false;
241-
TRACE("model_constructor",
241+
TRACE(model_constructor,
242242
tout << "map term(\n" << mk_ismt2_pp(a, m, 2) << "\n->"
243243
<< mk_ismt2_pp(result.get(), m, 2)<< ")\n"; );
244-
CTRACE("model_constructor",
244+
CTRACE(model_constructor,
245245
!is_val(result.get()),
246246
tout << "eval didn't create a constant \n" << mk_ismt2_pp(a, m, 2) << " " << mk_ismt2_pp(result, m, 2) << "\n";
247247
);
@@ -284,7 +284,7 @@ struct lackr_model_constructor::imp {
284284
SASSERT(vi.source_term);
285285
const bool ok = vi.value == value;
286286
if (!ok) {
287-
TRACE("model_constructor",
287+
TRACE(model_constructor,
288288
tout << "already mapped by(\n" << mk_ismt2_pp(vi.source_term, m, 2) << "\n->"
289289
<< mk_ismt2_pp(vi.value, m, 2) << ")\n"; );
290290
m_conflicts.push_back(std::make_pair(a, vi.source_term));
@@ -315,7 +315,7 @@ struct lackr_model_constructor::imp {
315315
expr_ref term(m);
316316
term = m.mk_app(a->get_decl(), num, values.data());
317317
m_evaluator->operator() (term, result);
318-
TRACE("model_constructor",
318+
TRACE(model_constructor,
319319
tout << "eval(\n" << mk_ismt2_pp(term.get(), m, 2) << "\n->"
320320
<< mk_ismt2_pp(result.get(), m, 2) << ")\n"; );
321321
return;

0 commit comments

Comments
 (0)