ZArith + other : favor the use of modern names instead of compat notations

 - For instance, refl_equal --> eq_refl
 - Npos, Zpos, Zneg now admit more uniform qualified aliases
   N.pos, Z.pos, Z.neg.
 - A new module BinInt.Pos2Z with results about injections from
   positive to Z
 - A result about Z.pow pushed in the generic layer
 - Zmult_le_compat_{r,l} --> Z.mul_le_mono_nonneg_{r,l}
 - Using tactic Z.le_elim instead of Zle_lt_or_eq
 - Some cleanup in ring, field, micromega
   (use of "Equivalence", "Proper" ...)
 - Some adaptions in QArith (for instance changed Qpower.Qpower_decomp)
 - In ZMake and ZMake, functor parameters are now named NN and ZZ
   instead of N and Z for avoiding confusions

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@15515 85f007b7-540e-0410-9357-904b9bb8a0f7

1 files changed, 6 insertions, 6 deletions

diff --git a/theories/ZArith/Zpower.v b/theories/ZArith/Zpower.v
index 5052d01a0..880c4376d 100644
--- a/theories/ZArith/Zpower.v
+++ b/theories/ZArith/Zpower.v
@@ -78,7 +78,7 @@ Proof.
 Qed.
 
 Hint Immediate Zpower_nat_is_exp Zpower_pos_is_exp : zarith.
-Hint Unfold Zpower_pos Zpower_nat: zarith.
+Hint Unfold Z.pow_pos Zpower_nat: zarith.
 
 Theorem Zpower_exp x n m :
   n >= 0 -> m >= 0 -> x ^ (n + m) = x ^ n * x ^ m.
@@ -181,7 +181,7 @@ Section Powers_of_2.
   Qed.
 
   Theorem shift_pos_correct p x :
-    Zpos (shift_pos p x) = Zpower_pos 2 p * Zpos x.
+    Zpos (shift_pos p x) = Z.pow_pos 2 p * Zpos x.
   Proof.
    now rewrite shift_pos_nat, Zpower_pos_nat, shift_nat_correct.
   Qed.
@@ -266,13 +266,13 @@ Section power_div_with_rest.
    apply Pos.iter_invariant; [|omega].
    intros ((q,r),d) (H,H'). unfold Zdiv_rest_aux.
    destruct q as [ |[q|q| ]|[q|q| ]]; try omega.
-   - rewrite Z.pos_xI, Z.mul_add_distr_r in H.
+   - rewrite Pos2Z.inj_xI, Z.mul_add_distr_r in H.
      rewrite Z.mul_shuffle3, Z.mul_assoc. omega.
-   - rewrite Z.pos_xO in H.
+   - rewrite Pos2Z.inj_xO in H.
      rewrite Z.mul_shuffle3, Z.mul_assoc. omega.
-   - rewrite Z.neg_xI, Z.mul_sub_distr_r in H.
+   - rewrite Pos2Z.neg_xI, Z.mul_sub_distr_r in H.
      rewrite Z.mul_sub_distr_r, Z.mul_shuffle3, Z.mul_assoc. omega.
-   - rewrite Z.neg_xO in H.
+   - rewrite Pos2Z.neg_xO in H.
      rewrite Z.mul_shuffle3, Z.mul_assoc. omega.
   Qed.