max/lean4-htt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

feat(init/meta/simp_tactic) tactics that revert hypotheses should allow elet expressions

Browse source 
Conflicts:

	library/init/meta/simp_tactic.lean
This commit is contained in:
Scott Morrison 2017-04-30 09:55:09 +10:00 • committed by Leonardo de Moura
parent 6aba80d389
commit 629d5ebbe8
2 changed files with 28 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
library/init/meta/interactive.lean
View file

@ -164,8 +164,8 @@ meta def change (q : parse texpr) : parse (tk "with" *> texpr)? → parse locati
| none _ := fail "change-at does not support multiple locations"
| (some w) l :=
do hs ← l.get_locals,
u ← mk_meta_univ,
ty ← mk_meta_var (sort u),
u ← mk_meta_univ,
ty ← mk_meta_var (sort u),
eq ← i_to_expr ``(%%q : %%ty),
ew ← i_to_expr ``(%%w : %%ty),
let repl := λe : expr, e.replace (λ a n, if a = eq then some ew else none),
@ -781,8 +781,9 @@ private meta def unfold_projections_hyps : list name → tactic unit
This tactic unfolds all structure projections.
-/
meta def unfold_projections : parse location → tactic unit
| [] := tactic.unfold_projections
| hs := unfold_projections_hyps hs
| (loc.ns []) := tactic.unfold_projections
| (loc.ns hs) := unfold_projections_hyps hs
| (loc.wildcard) := do ls ← local_context, unfold_projections_hyps (ls.map expr.local_pp_name)
meta def apply_opt_param : tactic unit :=
tactic.apply_opt_param

52
library/init/meta/simp_tactic.lean
View file

@ -129,19 +129,25 @@ meta def dunfold : list name → tactic unit :=
meta def dunfold_occs_of (occs : list nat) (c : name) : tactic unit :=
target >>= dunfold_occs_core transparency.instances default_max_steps (occurrences.pos occs) [c] >>= unsafe_change
meta def dunfold_core_at (occs : occurrences) (cs : list name) (h : expr) : tactic unit :=
do num_reverted ← revert h,
(expr.pi n bi d b : expr) ← target,
new_d ← dunfold_occs_core transparency.instances default_max_steps occs cs d,
unsafe_change $ expr.pi n bi new_d b,
meta def revert_and_transform (transform : expr → tactic expr) (h : expr) : tactic unit :=
do num_reverted : ℕ ← revert h,
t ← target,
match t with
| expr.pi n bi d b :=
do h_simp ← transform d,
unsafe_change $ expr.pi n bi h_simp b
| expr.elet n g e f :=
do h_simp ← transform g,
unsafe_change $ expr.elet n h_simp e f
| _ := fail "reverting hypothesis created neither a pi nor an elet expr (unreachable?)"
end,
intron num_reverted
meta def dunfold_at (cs : list name) (h : expr) : tactic unit :=
do num_reverted ← revert h,
(expr.pi n bi d b : expr) ← target,
new_d ← dunfold_core transparency.instances default_max_steps cs d,
unsafe_change $ expr.pi n bi new_d b,
intron num_reverted
meta def dunfold_core_at (occs : occurrences) (cs : list name) : expr → tactic unit :=
revert_and_transform (dunfold_occs_core transparency.instances default_max_steps occs cs)
meta def dunfold_at (cs : list name) : expr → tactic unit :=
revert_and_transform (dunfold_core transparency.instances default_max_steps cs)
structure delta_config :=
(max_steps := default_max_steps)
@ -170,12 +176,8 @@ in do (c, new_e) ← dsimplify_core () cfg.max_steps cfg.visit_instances (λ c e
meta def delta (cs : list name) : tactic unit :=
target >>= delta_core {} cs >>= unsafe_change
meta def delta_at (cs : list name) (h : expr) : tactic unit :=
do num_reverted ← revert h,
(expr.pi n bi d b : expr) ← target,
new_d ← delta_core {} cs d,
unsafe_change $ expr.pi n bi new_d b,
intron num_reverted
meta def delta_at (cs : list name) : expr → tactic unit :=
revert_and_transform (delta_core {} cs)
meta def unfold_projections_core (m : transparency) (max_steps : nat) (e : expr) : tactic expr :=
let unfold (changed : bool) (e : expr) : tactic (bool × expr × bool) := do
@ -187,12 +189,8 @@ in do (tt, new_e) ← dsimplify_core ff default_max_steps tt (λ c e, failed) un
meta def unfold_projections : tactic unit :=
target >>= unfold_projections_core semireducible default_max_steps >>= change
meta def unfold_projections_at (h : expr) : tactic unit :=
do num_reverted ← revert h,
(expr.pi n bi d b : expr) ← target,
new_d ← unfold_projections_core semireducible default_max_steps d,
change $ expr.pi n bi new_d b,
intron num_reverted
meta def unfold_projections_at : expr → tactic unit :=
revert_and_transform (unfold_projections_core semireducible default_max_steps)
structure simp_config :=
(max_steps : nat := default_max_steps)
@ -274,12 +272,8 @@ target >>= s.dsimplify >>= unsafe_change
meta def dsimp : tactic unit :=
simp_lemmas.mk_default >>= dsimp_core
meta def dsimp_at_core (s : simp_lemmas) (h : expr) : tactic unit :=
do num_reverted : ℕ ← revert h,
expr.pi n bi d b ← target,
h_simp ← s.dsimplify d,
unsafe_change $ expr.pi n bi h_simp b,
intron num_reverted
meta def dsimp_at_core (s : simp_lemmas) : expr → tactic unit :=
revert_and_transform s.dsimplify
meta def dsimp_at (h : expr) : tactic unit :=
do s ← simp_lemmas.mk_default, dsimp_at_core s h