michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor(library/simplifier): cleanup

Browse source
This commit is contained in:
Leonardo de Moura 2015-07-22 08:39:55 -07:00
parent e74c6eef3d
commit b5c287d3d1
1 changed files with 40 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
src/library/simplifier/simp_tactic.cpp
View file

@ -123,6 +123,9 @@ expr mk_simp_tactic_expr(buffer<expr> const & ls, buffer<name> const & ns,
} }
class simp_tactic_fn { class simp_tactic_fn {
public:
enum res_kind { Simplified, Solved, DidNothing };
private:
environment m_env; environment m_env;
io_state m_ios; io_state m_ios;
name_generator m_ngen; name_generator m_ngen;
@ -131,6 +134,7 @@ class simp_tactic_fn {
// transient state // transient state
unsigned m_steps; unsigned m_steps;
goal m_g; goal m_g;
substitution m_subst;
// configuration options // configuration options
bool m_single_pass; bool m_single_pass;
@ -166,6 +170,16 @@ class simp_tactic_fn {
} }
} }
res_kind simp_goal() {
// TODO(Leo)
return DidNothing;
}
bool simp_hyp(unsigned hidx) {
// TODO(Leo)
return false;
}
public: public:
simp_tactic_fn(environment const & env, io_state const & ios, name_generator && ngen, simp_tactic_fn(environment const & env, io_state const & ios, name_generator && ngen,
buffer<expr> const & /* ls */, buffer<name> const & /* ns */, buffer<name> const & /* ex */, buffer<expr> const & /* ls */, buffer<name> const & /* ns */, buffer<name> const & /* ex */,
@ -173,14 +187,33 @@ public:
set_options(env, m_ios.get_options()); set_options(env, m_ios.get_options());
} }
enum res_kind { Simplified, Solved, DidNothing }; std::tuple<res_kind, goal, substitution> operator()(goal const & g, location const & loc, substitution const & s) {
std::tuple<res_kind, goal, substitution> operator()(goal const & g, location const & /* loc */, substitution const & s) {
m_g = g; m_g = g;
m_steps = 0; m_subst = s;
if (loc.is_goal_only()) {
// TODO(Leo) res_kind k = simp_goal();
return std::make_tuple(DidNothing, g, s); return std::make_tuple(k, m_g, m_subst);
} else {
buffer<expr> hyps;
m_g.get_hyps(hyps);
bool progress = false;
unsigned hidx = 0;
for (expr const & h : hyps) {
if (loc.includes_hypothesis(local_pp_name(h))) {
if (simp_hyp(hidx))
progress = true;
}
hidx++;
}
if (loc.includes_goal()) {
res_kind k = simp_goal();
if (k == DidNothing && progress)
k = Simplified;
return std::make_tuple(k, m_g, m_subst);
} else {
return std::make_tuple(progress ? Simplified : DidNothing, m_g, m_subst);
}
}
} }
}; };