diff options
| author | herbelin | 2003-09-21 22:05:23 +0000 |
|---|---|---|
| committer | herbelin | 2003-09-21 22:05:23 +0000 |
| commit | 45a33238f36b0d3ced493f83c2db9b9e150a214f (patch) | |
| tree | 732758a2b82777196e8e7fd482630cd2bf2a83c3 | |
| parent | efffc572428b14f1f59b5820b1f23d452d29a1e7 (diff) | |
Les notations 'x <= y <= z' sont réservées et s'appliquent maintenant aussi à nat
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4427 85f007b7-540e-0410-9357-904b9bb8a0f7
| -rw-r--r-- | theories/Init/Notations.v | 5 | ||||
| -rw-r--r-- | theories/Reals/Rdefinitions.v | 14 | ||||
| -rw-r--r-- | theories/ZArith/zarith_aux.v | 14 |
3 files changed, 13 insertions, 20 deletions
diff --git a/theories/Init/Notations.v b/theories/Init/Notations.v index 61f4daddcd..7f420dda06 100644 --- a/theories/Init/Notations.v +++ b/theories/Init/Notations.v @@ -39,6 +39,11 @@ Uninterpreted V8Notation "x < y" (at level 50, no associativity). Uninterpreted V8Notation "x >= y" (at level 50, no associativity). Uninterpreted V8Notation "x > y" (at level 50, no associativity). +Uninterpreted V8Notation "x <= y <= z" (at level 50, y at next level). +Uninterpreted V8Notation "x <= y < z" (at level 50, y at next level). +Uninterpreted V8Notation "x < y < z" (at level 50, y at next level). +Uninterpreted V8Notation "x < y <= z" (at level 50, y at next level). + (** Arithmetical notations (also used for type constructors) *) Uninterpreted Notation "x * y" (at level 3, right associativity) diff --git a/theories/Reals/Rdefinitions.v b/theories/Reals/Rdefinitions.v index 42a15c0318..96b682e048 100644 --- a/theories/Reals/Rdefinitions.v +++ b/theories/Reals/Rdefinitions.v @@ -64,15 +64,9 @@ V8Infix "<=" Rle : R_scope. V8Infix ">=" Rge : R_scope. V8Infix ">" Rgt : R_scope. -V8Notation "x = y = z" := (eqT R x y)/\(eqT R y z) - (at level 50, y at next level, no associativity) : R_scope. -V8Notation "x <= y <= z" := (Rle x y)/\(Rle y z) - (at level 50, y at next level, no associativity) : R_scope. -V8Notation "x <= y < z" := (Rle x y)/\(Rlt y z) - (at level 50, y at next level, no associativity) : R_scope. -V8Notation "x < y < z" := (Rlt x y)/\(Rlt y z) - (at level 50, y at next level, no associativity) : R_scope. -V8Notation "x < y <= z" := (Rlt x y)/\(Rle y z) - (at level 50, y at next level, no associativity) : R_scope. +V8Notation "x <= y <= z" := (Rle x y)/\(Rle y z) : R_scope. +V8Notation "x <= y < z" := (Rle x y)/\(Rlt y z) : R_scope. +V8Notation "x < y < z" := (Rlt x y)/\(Rlt y z) : R_scope. +V8Notation "x < y <= z" := (Rlt x y)/\(Rle y z) : R_scope. Hints Unfold Rgt : real. diff --git a/theories/ZArith/zarith_aux.v b/theories/ZArith/zarith_aux.v index c7fc10ee74..9798c47100 100644 --- a/theories/ZArith/zarith_aux.v +++ b/theories/ZArith/zarith_aux.v @@ -32,16 +32,10 @@ V8Infix "<" Zlt : Z_scope. V8Infix ">=" Zge : Z_scope. V8Infix ">" Zgt : Z_scope. -V8Notation "x <= y <= z" := (Zle x y)/\(Zle y z) - (at level 50, y at next level):Z_scope. -V8Notation "x <= y < z" := (Zle x y)/\(Zlt y z) - (at level 50, y at next level):Z_scope. -V8Notation "x < y < z" := (Zlt x y)/\(Zlt y z) - (at level 50, y at next level):Z_scope. -V8Notation "x < y <= z" := (Zlt x y)/\(Zle y z) - (at level 50, y at next level):Z_scope. -V8Notation "x = y = z" := x=y/\y=z - (at level 50, y at next level) : Z_scope. +V8Notation "x <= y <= z" := (Zle x y)/\(Zle y z) :Z_scope. +V8Notation "x <= y < z" := (Zle x y)/\(Zlt y z) :Z_scope. +V8Notation "x < y < z" := (Zlt x y)/\(Zlt y z) :Z_scope. +V8Notation "x < y <= z" := (Zlt x y)/\(Zle y z) :Z_scope. (** Sign function *) Definition Zsgn [z:Z] : Z := |