aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Jason Gross <jgross@mit.edu>2015-12-29 13:27:36 -0500
committerGravatar Jason Gross <jgross@mit.edu>2015-12-29 13:27:36 -0500
commit5b4e3ace20eb2ab569d172a1f358f26f451d361c (patch)
tree6ed71e7b603ea8a24cd14ed4673fbcaad57302c3
parentb2eaecf0e748e3c286e1ef337f72cee6d3475162 (diff)
Move compatibility notations to their proper files
-rw-r--r--theories/Compat/Coq84.v16
-rw-r--r--theories/ZArith/Int.v4
2 files changed, 4 insertions, 16 deletions
diff --git a/theories/Compat/Coq84.v b/theories/Compat/Coq84.v
index 1c70a894a..62b8a0398 100644
--- a/theories/Compat/Coq84.v
+++ b/theories/Compat/Coq84.v
@@ -53,21 +53,5 @@ Tactic Notation "esplit" := esplit.
Global Set Regular Subst Tactic.
-(** Some names have changed in the standard library, so we add aliases. *)
-Require Coq.ZArith.Int.
-Module Export Coq.
- Module Export ZArith.
- Module Int.
- Module Z_as_Int.
- Include Coq.ZArith.Int.Z_as_Int.
- (* FIXME: Should these get a (compat "8.4")? Or be moved to Z_as_Int, probably? *)
- Notation plus := Coq.ZArith.Int.Z_as_Int.add (only parsing).
- Notation minus := Coq.ZArith.Int.Z_as_Int.sub (only parsing).
- Notation mult := Coq.ZArith.Int.Z_as_Int.mul (only parsing).
- End Z_as_Int.
- End Int.
- End ZArith.
-End Coq.
-
(** Many things now import [PeanoNat] rather than [NPeano], so we require it so that the old absolute names in [NPeano.Nat] are available. *)
Require Coq.Numbers.Natural.Peano.NPeano.
diff --git a/theories/ZArith/Int.v b/theories/ZArith/Int.v
index d210792f9..b78891c71 100644
--- a/theories/ZArith/Int.v
+++ b/theories/ZArith/Int.v
@@ -451,4 +451,8 @@ Module Z_as_Int <: Int.
Lemma i2z_ltb n p : ltb n p = Z.ltb (i2z n) (i2z p).
Proof. reflexivity. Qed.
+ (** Compatibility notations for Coq v8.4 *)
+ Notation plus := Coq.ZArith.Int.Z_as_Int.add (compat "8.4").
+ Notation minus := Coq.ZArith.Int.Z_as_Int.sub (compat "8.4").
+ Notation mult := Coq.ZArith.Int.Z_as_Int.mul (compat "8.4").
End Z_as_Int.