diff options
| author |  barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2002-03-05 10:58:08 +0000 |
|---|---|---|
| committer | barras <barras@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2002-03-05 10:58:08 +0000 |
| commit | 4dbf6842e0b2b43c5f8c15817942dfecaab5cd2e (patch) | |
| tree | f81b47df039aed8471726bfb635b6a675602ecab | |
| parent | 21cd39996cabdf280f4cc99557c54f6c7c73bbc8 (diff) | |
petits changements afin de profiter du nouveau Rewrite/in
(l'unification marche mieux)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@2512 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | theories/IntMap/Adalloc.v | 6 | ||||
| -rw-r--r-- | theories/ZArith/Zcomplements.v | 2 | ||||
| -rw-r--r-- | theories/ZArith/Zlogarithm.v | 12 | ||||
| -rw-r--r-- | theories/ZArith/auxiliary.v | 2 |
4 files changed, 11 insertions, 11 deletions
diff --git a/theories/IntMap/Adalloc.v b/theories/IntMap/Adalloc.v index 8fe68376b..32bebd257 100644 --- a/theories/IntMap/Adalloc.v +++ b/theories/IntMap/Adalloc.v @@ -58,7 +58,7 @@ Section AdAlloc. Lemma nat_le_complete_conv : (m,n:nat) (nat_le n m)=false -> (lt m n). Proof. - Intros. Elim (le_or_lt n m). Intro. Rewrite (nat_le_correct ? ? H0) in H. Discriminate H. + Intros. Elim (le_or_lt n m). Intro. Conditional Trivial Rewrite nat_le_correct in H. Discriminate H. Trivial. Qed. @@ -70,8 +70,8 @@ Section AdAlloc. Lemma ad_of_nat_of_ad : (a:ad) (ad_of_nat (nat_of_ad a))=a. Proof. Induction a. Reflexivity. - Intro. Simpl. Elim (ZL4 p). Intros p' H. Rewrite H. Simpl. Rewrite <- (bij1 p') in H. - Rewrite (convert_intro ? ? H). Reflexivity. + Intro. Simpl. Elim (ZL4 p). Intros p' H. Rewrite H. Simpl. Rewrite <- bij1 in H. + Rewrite convert_intro with 1:=H. Reflexivity. Qed. Lemma nat_of_ad_of_nat : (n:nat) (nat_of_ad (ad_of_nat n))=n. diff --git a/theories/ZArith/Zcomplements.v b/theories/ZArith/Zcomplements.v index ce9691450..ef479c831 100644 --- a/theories/ZArith/Zcomplements.v +++ b/theories/ZArith/Zcomplements.v @@ -51,7 +51,7 @@ Intros. Generalize (Zeq_Zminus H0). Intro. Apply Zminus_Zeq. -Rewrite <- (Zmult_Zminus_distr_r x y z) in H1. +Rewrite <- Zmult_Zminus_distr_r in H1. Elim (Zmult_zero H1). Omega. Trivial. diff --git a/theories/ZArith/Zlogarithm.v b/theories/ZArith/Zlogarithm.v index e219e0eae..c33b1f157 100644 --- a/theories/ZArith/Zlogarithm.v +++ b/theories/ZArith/Zlogarithm.v @@ -54,15 +54,15 @@ Theorem log_inf_correct : (x:positive) ` 0 <= (log_inf x)` /\ Induction x; Intros; Simpl; [ Elim H; Intros Hp HR; Clear H; Split; [ Auto with zarith - | Rewrite (two_p_S (Zs (log_inf p)) (Zle_le_S `0` (log_inf p) Hp)); - Rewrite (two_p_S (log_inf p) Hp); - Rewrite (two_p_S (log_inf p) Hp) in HR; + | Conditional (Apply Zle_le_S; Trivial) Rewrite two_p_S with x:=(Zs (log_inf p)); + Conditional Trivial Rewrite two_p_S; + Conditional Trivial Rewrite two_p_S in HR; Rewrite (POS_xI p); Omega ] | Elim H; Intros Hp HR; Clear H; Split; [ Auto with zarith - | Rewrite (two_p_S (Zs (log_inf p)) (Zle_le_S `0` (log_inf p) Hp)); - Rewrite (two_p_S (log_inf p) Hp); - Rewrite (two_p_S (log_inf p) Hp) in HR; + | Conditional (Apply Zle_le_S; Trivial) Rewrite two_p_S with x:=(Zs (log_inf p)); + Conditional Trivial Rewrite two_p_S; + Conditional Trivial Rewrite two_p_S in HR; Rewrite (POS_xO p); Omega ] | Unfold two_power_pos; Unfold shift_pos; Simpl; Omega ]. diff --git a/theories/ZArith/auxiliary.v b/theories/ZArith/auxiliary.v index e6edf81a5..b6505d6bb 100644 --- a/theories/ZArith/auxiliary.v +++ b/theories/ZArith/auxiliary.v @@ -713,7 +713,7 @@ Theorem OMEGA20: (x,y,z:Z)(Zne x ZERO) -> (y=ZERO) -> (Zne (Zplus x (Zmult y z)) ZERO). Unfold Zne not; Intros x y z H1 H2 H3; Apply H1; Rewrite H2 in H3; -Simpl in H3; Rewrite (Zero_right x) in H3; Trivial with arith. +Simpl in H3; Rewrite Zero_right in H3; Trivial with arith. Save. Definition fast_Zplus_sym := |