diff --git a/library/standard/tactic.lean b/library/standard/tactic.lean index ca0a262326..88d40df871 100644 --- a/library/standard/tactic.lean +++ b/library/standard/tactic.lean @@ -20,7 +20,7 @@ definition and_then (t1 t2 : tactic) : tactic := tactic_value definition or_else (t1 t2 : tactic) : tactic := tactic_value definition repeat (t : tactic) : tactic := tactic_value definition now : tactic := tactic_value -definition exact : tactic := tactic_value +definition assumption : tactic := tactic_value definition state : tactic := tactic_value definition fail : tactic := tactic_value definition id : tactic := tactic_value diff --git a/src/library/tactic/expr_to_tactic.cpp b/src/library/tactic/expr_to_tactic.cpp index e96248b5ae..e815f33cb8 100644 --- a/src/library/tactic/expr_to_tactic.cpp +++ b/src/library/tactic/expr_to_tactic.cpp @@ -83,7 +83,7 @@ register_unary_tac::register_unary_tac(name const & n, std::functionid_tac) definition id {A : Type} (a : A) := a definition simple {A : Bool} : tactic -:= unfold @id.{1}; exact +:= unfold @id.{1}; assumption theorem tst {A B : Bool} (H1 : A) (H2 : B) : id A := by simple diff --git a/tests/lean/run/tactic5.lean b/tests/lean/run/tactic5.lean index ac9919fd76..b4b8f520c4 100644 --- a/tests/lean/run/tactic5.lean +++ b/tests/lean/run/tactic5.lean @@ -4,6 +4,6 @@ using tactic (renaming id->id_tac) definition id {A : Type} (a : A) := a theorem tst {A B : Bool} (H1 : A) (H2 : B) : id A -:= by !(unfold @id; state); exact +:= by !(unfold @id; state); assumption check tst \ No newline at end of file diff --git a/tests/lean/run/tactic6.lean b/tests/lean/run/tactic6.lean index 455dbb3e7d..e111ed4474 100644 --- a/tests/lean/run/tactic6.lean +++ b/tests/lean/run/tactic6.lean @@ -4,6 +4,6 @@ using tactic (renaming id->id_tac) definition id {A : Type} (a : A) := a theorem tst {A B : Bool} (H1 : A) (H2 : B) : id A -:= by unfold id; exact +:= by unfold id; assumption check tst diff --git a/tests/lean/run/tactic7.lean b/tests/lean/run/tactic7.lean index fb21464743..c59864d5fb 100644 --- a/tests/lean/run/tactic7.lean +++ b/tests/lean/run/tactic7.lean @@ -2,11 +2,11 @@ import standard using tactic theorem tst {A B : Bool} (H1 : A) (H2 : B) : A ∧ B ∧ A -:= by apply and_intro; state; exact; apply and_intro; !exact +:= by apply and_intro; state; assumption; apply and_intro; !assumption check tst theorem tst2 {A B : Bool} (H1 : A) (H2 : B) : A ∧ B ∧ A -:= by !((apply @and_intro | exact) ; trace "STEP"; state; trace "----------") +:= by !((apply @and_intro | assumption) ; trace "STEP"; state; trace "----------") check tst2 diff --git a/tests/lean/run/tactic9.lean b/tests/lean/run/tactic9.lean index 4d2969139a..55d29d8166 100644 --- a/tests/lean/run/tactic9.lean +++ b/tests/lean/run/tactic9.lean @@ -2,5 +2,5 @@ import standard using tactic theorem tst {A B : Bool} (H1 : A) (H2 : B) : ((fun x : Bool, x) A) ∧ B ∧ A -:= by apply and_intro; beta; exact; apply and_intro; !exact +:= by apply and_intro; beta; assumption; apply and_intro; !assumption