diff options
author | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-18 00:46:03 +0000 |
---|---|---|
committer | letouzey <letouzey@85f007b7-540e-0410-9357-904b9bb8a0f7> | 2012-12-18 00:46:03 +0000 |
commit | 3ef9c2e14138b3b6e41325d86844691e8579ee55 (patch) | |
tree | 2ed51b82ee8e31934334c2bd1fd41d329001973e /theories | |
parent | 4c78cf0f68b8eeb040eb2267a3705fc236295f76 (diff) |
No more constant named "int" in Coq theories (cf bug #2878)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@16088 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories')
-rw-r--r-- | theories/FSets/FMapAVL.v | 1 | ||||
-rw-r--r-- | theories/MSets/MSetAVL.v | 1 | ||||
-rw-r--r-- | theories/ZArith/Int.v | 6 |
3 files changed, 3 insertions, 5 deletions
diff --git a/theories/FSets/FMapAVL.v b/theories/FSets/FMapAVL.v index a603751b2..f42f1e9e0 100644 --- a/theories/FSets/FMapAVL.v +++ b/theories/FSets/FMapAVL.v @@ -35,6 +35,7 @@ Module Raw (Import I:Int)(X: OrderedType). Local Open Scope pair_scope. Local Open Scope lazy_bool_scope. Local Open Scope Int_scope. +Local Notation int := I.t. Definition key := X.t. Hint Transparent key. diff --git a/theories/MSets/MSetAVL.v b/theories/MSets/MSetAVL.v index 2182504dd..e719ae441 100644 --- a/theories/MSets/MSetAVL.v +++ b/theories/MSets/MSetAVL.v @@ -44,6 +44,7 @@ Local Unset Case Analysis Schemes. Module Ops (Import I:Int)(X:OrderedType) <: MSetInterface.Ops X. Local Open Scope Int_scope. +Local Notation int := I.t. (** ** Generic trees instantiated with integer height *) diff --git a/theories/ZArith/Int.v b/theories/ZArith/Int.v index 384c046f3..99ecd150b 100644 --- a/theories/ZArith/Int.v +++ b/theories/ZArith/Int.v @@ -25,9 +25,6 @@ Module Type Int. Parameter t : Set. Bind Scope Int_scope with t. - (** For compatibility *) - Definition int := t. - Parameter i2z : t -> Z. Parameter _0 : t. @@ -362,7 +359,6 @@ End MoreInt. Module Z_as_Int <: Int. Local Open Scope Z_scope. Definition t := Z. - Definition int := t. Definition _0 := 0. Definition _1 := 1. Definition _2 := 2. @@ -375,7 +371,7 @@ Module Z_as_Int <: Int. Definition gt_le_dec := Z_gt_le_dec. Definition ge_lt_dec := Z_ge_lt_dec. Definition eq_dec := Z.eq_dec. - Definition i2z : int -> Z := fun n => n. + Definition i2z : t -> Z := fun n => n. Lemma i2z_eq : forall n p, i2z n=i2z p -> n = p. Proof. auto. Qed. Lemma i2z_0 : i2z _0 = 0. Proof. auto. Qed. Lemma i2z_1 : i2z _1 = 1. Proof. auto. Qed. |