diff options
author | 2009-10-08 13:39:01 +0000 | |
---|---|---|
committer | 2009-10-08 13:39:01 +0000 | |
commit | 93b74b4be215bd08ca7a123505177d6ec8ac7b4c (patch) | |
tree | cc5b80a8ba038a7c531afae977234f2afdc70699 /theories/FSets | |
parent | bdec9fddcdaa13800e04e718ffa52f87bddc52d9 (diff) |
Init/Tactics.v: tactic with nicer name 'exfalso' for 'elimtype False'
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@12380 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories/FSets')
-rw-r--r-- | theories/FSets/FMapFacts.v | 4 | ||||
-rw-r--r-- | theories/FSets/FMapFullAVL.v | 2 | ||||
-rw-r--r-- | theories/FSets/FSetFullAVL.v | 4 | ||||
-rw-r--r-- | theories/FSets/OrderedType.v | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/theories/FSets/FMapFacts.v b/theories/FSets/FMapFacts.v index 10924769e..5565c048c 100644 --- a/theories/FSets/FMapFacts.v +++ b/theories/FSets/FMapFacts.v @@ -1909,7 +1909,7 @@ Module OrdProperties (M:S). rewrite add_mapsto_iff; unfold O.eqke; simpl. intuition. destruct (E.eq_dec x t0); auto. - elimtype False. + exfalso. assert (In t0 m). exists e0; auto. generalize (H t0 H1). @@ -1939,7 +1939,7 @@ Module OrdProperties (M:S). rewrite add_mapsto_iff; unfold O.eqke; simpl. intuition. destruct (E.eq_dec x t0); auto. - elimtype False. + exfalso. assert (In t0 m). exists e0; auto. generalize (H t0 H1). diff --git a/theories/FSets/FMapFullAVL.v b/theories/FSets/FMapFullAVL.v index c4b8f2a8d..afac5af8c 100644 --- a/theories/FSets/FMapFullAVL.v +++ b/theories/FSets/FMapFullAVL.v @@ -108,7 +108,7 @@ Lemma height_0 : forall l, avl l -> height l = 0 -> l = Leaf _. Proof. destruct 1; intuition; simpl in *. - avl_nns; simpl in *; elimtype False; omega_max. + avl_nns; simpl in *; exfalso; omega_max. Qed. diff --git a/theories/FSets/FSetFullAVL.v b/theories/FSets/FSetFullAVL.v index d8a31ba5f..bc2b7b64e 100644 --- a/theories/FSets/FSetFullAVL.v +++ b/theories/FSets/FSetFullAVL.v @@ -98,7 +98,7 @@ Ltac avl_nns := Lemma height_0 : forall s, avl s -> height s = 0 -> s = Leaf. Proof. destruct 1; intuition; simpl in *. - avl_nns; simpl in *; elimtype False; omega_max. + avl_nns; simpl in *; exfalso; omega_max. Qed. (** * Results about [avl] *) @@ -755,7 +755,7 @@ Proof. intros s1 s2 B1 B2. generalize (ocaml_compare_Cmp s1 s2)(compare_Cmp s1 s2). unfold Cmp. - destruct ocaml_compare; destruct compare; auto; intros; elimtype False. + destruct ocaml_compare; destruct compare; auto; intros; exfalso. elim (lt_not_eq B1 B2 H0); auto. elim (lt_not_eq B2 B1 H0); auto. apply eq_sym; auto. diff --git a/theories/FSets/OrderedType.v b/theories/FSets/OrderedType.v index 4e5d39faf..f17eb43a9 100644 --- a/theories/FSets/OrderedType.v +++ b/theories/FSets/OrderedType.v @@ -149,7 +149,7 @@ Ltac abstraction := match goal with | H : eq ?x ?x |- _ => clear H; abstraction | H : ~lt ?x ?x |- _ => clear H; abstraction | |- eq ?x ?x => exact (eq_refl x) - | |- lt ?x ?x => elimtype False; abstraction + | |- lt ?x ?x => exfalso; abstraction | |- ~ _ => intro; abstraction | H1: ~lt ?x ?y, H2: ~eq ?x ?y |- _ => generalize (le_neq H1 H2); clear H1 H2; intro; abstraction @@ -240,7 +240,7 @@ Ltac order := propagate_lt; eauto. -Ltac false_order := elimtype False; order. +Ltac false_order := exfalso; order. Lemma gt_not_eq : forall x y, lt y x -> ~ eq x y. Proof. |