Skip to content

Commit c6cd25c

Browse files
mico-tuning
1 parent 24d7b05 commit c6cd25c

File tree

2 files changed

+8
-13
lines changed

2 files changed

+8
-13
lines changed

src/ast/normal_forms/nnf.cpp

+3-2
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ class skolemizer {
6969
typedef act_cache cache;
7070

7171
ast_manager & m;
72+
var_subst m_subst;
7273
symbol m_sk_hack;
7374
bool m_sk_hack_enabled;
7475
cache m_cache;
@@ -128,7 +129,6 @@ class skolemizer {
128129
//
129130
// (VAR 0) should be in the last position of substitution.
130131
//
131-
var_subst s(m);
132132
SASSERT(is_well_sorted(m, q->get_expr()));
133133
expr_ref tmp(m);
134134
expr * body = q->get_expr();
@@ -146,7 +146,7 @@ class skolemizer {
146146
}
147147
}
148148
}
149-
r = s(body, substitution);
149+
r = m_subst(body, substitution);
150150
p = nullptr;
151151
if (m_proofs_enabled) {
152152
if (q->get_kind() == forall_k)
@@ -159,6 +159,7 @@ class skolemizer {
159159
public:
160160
skolemizer(ast_manager & m):
161161
m(m),
162+
m_subst(m),
162163
m_sk_hack("sk_hack"),
163164
m_sk_hack_enabled(false),
164165
m_cache(m),

src/ast/recfun_decl_plugin.cpp

+5-11
Original file line numberDiff line numberDiff line change
@@ -240,23 +240,18 @@ namespace recfun {
240240
{
241241
VERIFY(m_cases.empty() && "cases cannot already be computed");
242242
SASSERT(n_vars == m_domain.size());
243-
244243
TRACEFN("compute cases " << mk_pp(rhs, m));
245244

246-
unsigned case_idx = 0;
247-
248-
std::string name("case-");
249-
name.append(m_name.str());
250-
251-
m_vars.append(n_vars, vars);
252-
m_rhs = rhs;
253-
254245
if (!is_macro)
255246
for (expr* e : subterms::all(m_rhs))
256247
if (is_lambda(e))
257248
throw default_exception("recursive definitions with lambdas are not supported");
258-
249+
250+
251+
unsigned case_idx = 0;
259252
expr_ref_vector conditions(m);
253+
m_vars.append(n_vars, vars);
254+
m_rhs = rhs;
260255

261256
// is the function a macro (unconditional body)?
262257
if (is_macro || n_vars == 0 || !contains_ite(u, rhs)) {
@@ -265,7 +260,6 @@ namespace recfun {
265260
return;
266261
}
267262

268-
269263

270264
// analyze control flow of `rhs`, accumulating guards and
271265
// rebuilding a `ite`-free RHS on the fly for each path in `rhs`.

0 commit comments

Comments
 (0)