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/Strings/Ascii.v b/theories/Strings/Ascii.v
index 1ed9140a5..4f6fe3f86 100644
--- a/theories/Strings/Ascii.v
+++ b/theories/Strings/Ascii.v
@@ -65,7 +65,7 @@ Definition ascii_of_N (n : N) :=
 
 (** Same for [nat] *)
 
-Definition ascii_of_nat (a : nat) := ascii_of_N (N_of_nat a).
+Definition ascii_of_nat (a : nat) := ascii_of_N (N.of_nat a).
 
 (** The opposite functions *)
 
@@ -81,7 +81,7 @@ Definition N_of_ascii (a : ascii) : N :=
  let (a0,a1,a2,a3,a4,a5,a6,a7) := a in
  N_of_digits (a0::a1::a2::a3::a4::a5::a6::a7::nil).
 
-Definition nat_of_ascii (a : ascii) : nat := nat_of_N (N_of_ascii a).
+Definition nat_of_ascii (a : ascii) : nat := N.to_nat (N_of_ascii a).
 
 (** Proofs that we have indeed opposite function (below 256) *)
 
@@ -111,10 +111,10 @@ Theorem nat_ascii_embedding :
 Proof.
  intros. unfold nat_of_ascii, ascii_of_nat.
  rewrite N_ascii_embedding.
- apply nat_of_N_of_nat.
- unfold Nlt.
- change 256%N with (N_of_nat 256).
- rewrite <- N_of_nat_compare.
+ apply Nat2N.id.
+ unfold N.lt.
+ change 256%N with (N.of_nat 256).
+ rewrite <- Nat2N.inj_compare.
  rewrite <- Compare_dec.nat_compare_lt. auto.
 Qed.