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

refactor(library/tactic): move 'get_unused_name' to goal

Browse source
This commit is contained in:
Leonardo de Moura 2014-11-26 18:46:08 -08:00
parent 2a00647089
commit a311f05add
3 changed files with 29 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/library/tactic/goal.cpp
View file

@ -144,6 +144,29 @@ void goal::get_hyps(buffer<expr> & r) const {
get_app_args(m_meta, r);
}
name goal::get_unused_name(name const & prefix, unsigned & idx) const {
buffer<expr> locals;
get_app_rev_args(get_meta(), locals);
while (true) {
bool used = false;
name curr = prefix.append_after(idx);
idx++;
for (expr const & local : locals) {
if (is_local(local) && local_pp_name(local) == curr) {
used = true;
break;
}
}
if (!used)
return curr;
}
}
name goal::get_unused_name(name const & prefix) const {
unsigned idx = 1;
return get_unused_name(prefix, idx);
}
io_state_stream const & operator<<(io_state_stream const & out, goal const & g) {
options const & opts = out.get_options();
out.get_stream() << mk_pair(g.pp(out.get_formatter()), opts);

5
src/library/tactic/goal.h
View file

@ -88,6 +88,11 @@ public:
*/
void get_hyps(buffer<expr> & r) const;
/** \brief Return a "user" name that is not used by any local constant in the given goal */
name get_unused_name(name const & prefix, unsigned & idx) const;
name get_unused_name(name const & prefix) const;
format pp(formatter const & fmt, substitution const & s) const;
format pp(formatter const & fmt) const;
};

21
src/library/tactic/intros_tactic.cpp
View file

@ -10,25 +10,6 @@ Author: Leonardo de Moura
#include "library/tactic/expr_to_tactic.h"
namespace lean {
/** \brief Return a "user" name that is not used by any local constant in the given goal */
static name get_unused_name(goal const & g, name const & prefix, unsigned & idx) {
buffer<expr> locals;
get_app_rev_args(g.get_meta(), locals);
while (true) {
bool used = false;
name curr = prefix.append_after(idx);
idx++;
for (expr const & local : locals) {
if (is_local(local) && local_pp_name(local) == curr) {
used = true;
break;
}
}
if (!used)
return curr;
}
}
tactic intros_tactic(list<name> _ns, bool relax_main_opaque) {
auto fn = [=](environment const & env, io_state const &, proof_state const & s) {
list<name> ns = _ns;
@ -60,7 +41,7 @@ tactic intros_tactic(list<name> _ns, bool relax_main_opaque) {
new_name = head(ns);
ns = tail(ns);
} else {
new_name = get_unused_name(g, name("H"), nidx);
new_name = g.get_unused_name(name("H"), nidx);
}
expr new_local = mk_local(ngen.next(), new_name, binding_domain(t), binding_info(t));
t = instantiate(binding_body(t), new_local);