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

feat(library/tactic/intros_tactic): intro without argument should introduce a single variable

Browse source 
see #695
This commit is contained in:
Leonardo de Moura 2015-12-13 16:28:39 -08:00
parent 894875dc5c
commit d4e49a8434
5 changed files with 34 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
hott/init/tactic.hlean
View file

@ -74,7 +74,7 @@ definition apply (e : expr) : tactic := builtin
definition eapply (e : expr) : tactic := builtin
definition fapply (e : expr) : tactic := builtin
definition rename (a b : identifier) : tactic := builtin
definition intro (e : identifier_list) : tactic := builtin
definition intro (e : opt_identifier_list) : tactic := builtin
definition generalize_tac (e : expr) (id : identifier) : tactic := builtin
definition clear (e : identifier_list) : tactic := builtin
definition revert (e : identifier_list) : tactic := builtin

2
library/init/tactic.lean
View file

@ -75,7 +75,7 @@ definition apply (e : expr) : tactic := builtin
definition eapply (e : expr) : tactic := builtin
definition fapply (e : expr) : tactic := builtin
definition rename (a b : identifier) : tactic := builtin
definition intro (e : identifier_list) : tactic := builtin
definition intro (e : opt_identifier_list) : tactic := builtin
definition generalize_tac (e : expr) (id : identifier) : tactic := builtin
definition clear (e : identifier_list) : tactic := builtin
definition revert (e : identifier_list) : tactic := builtin

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

@ -11,7 +11,7 @@ Author: Leonardo de Moura
#include "library/tactic/expr_to_tactic.h"
namespace lean {
tactic intros_tactic(list<name> _ns) {
static tactic intro_intros_tactic(list<name> _ns, bool is_intros) {
auto fn = [=](environment const & env, io_state const &, proof_state const & s) {
list<name> ns = _ns;
goals const & gs = s.get_goals();
@ -24,10 +24,12 @@ tactic intros_tactic(list<name> _ns) {
auto tc = mk_type_checker(env, ngen.mk_child());
expr t = g.get_type();
expr m = g.get_meta();
bool gen_names = empty(ns);
bool gen_names = is_intros && empty(ns);
bool gen_one_name = !is_intros && empty(ns);
bool first = true;
try {
while (true) {
if (!gen_names && is_nil(ns))
if (!gen_names && (!gen_one_name || !first) && is_nil(ns))
break;
if (!is_pi(t)) {
if (!is_nil(ns)) {
@ -49,6 +51,7 @@ tactic intros_tactic(list<name> _ns) {
expr new_local = mk_local(ngen.next(), new_name, binding_domain(t), binding_info(t));
t = instantiate(binding_body(t), new_local);
m = mk_app(m, new_local);
first = false;
}
goal new_g(m, t);
return some(proof_state(s, goals(new_g, tail(gs)), ngen));
@ -59,14 +62,27 @@ tactic intros_tactic(list<name> _ns) {
return tactic01(fn);
}
tactic intro_tactic(list<name> const & ns) {
return intro_intros_tactic(ns, false);
}
tactic intros_tactic(list<name> const & ns) {
return intro_intros_tactic(ns, true);
}
void initialize_intros_tactic() {
auto fn = [](type_checker &, elaborate_fn const &, expr const & e, pos_info_provider const *) {
buffer<name> ns;
get_tactic_id_list_elements(app_arg(e), ns, "invalid 'intro' tactic, arguments must be identifiers");
return intros_tactic(to_list(ns.begin(), ns.end()));
};
register_tac(get_tactic_intro_name(), fn);
register_tac(get_tactic_intros_name(), fn);
register_tac(get_tactic_intro_name(),
[](type_checker &, elaborate_fn const &, expr const & e, pos_info_provider const *) {
buffer<name> ns;
get_tactic_id_list_elements(app_arg(e), ns, "invalid 'intro' tactic, arguments must be identifiers");
return intro_tactic(to_list(ns.begin(), ns.end()));
});
register_tac(get_tactic_intros_name(),
[](type_checker &, elaborate_fn const &, expr const & e, pos_info_provider const *) {
buffer<name> ns;
get_tactic_id_list_elements(app_arg(e), ns, "invalid 'intros' tactic, arguments must be identifiers");
return intros_tactic(to_list(ns.begin(), ns.end()));
});
}
void finalize_intros_tactic() {

2
src/library/tactic/intros_tactic.h
View file

@ -7,7 +7,7 @@ Author: Leonardo de Moura
#pragma once
#include "library/tactic/tactic.h"
namespace lean {
tactic intros_tactic(list<name> ns);
tactic intros_tactic(list<name> const & ns);
void initialize_intros_tactic();
void finalize_intros_tactic();
}

5
tests/lean/run/intro0.lean Normal file
View file

@ -0,0 +1,5 @@
example (a b : nat) : a = b → a = b :=
begin
intro,
assumption
end