Ajout syntaxe '>'

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

2 files changed, 24 insertions, 22 deletions

diff --git a/theories/Reals/Rsyntax.v b/theories/Reals/Rsyntax.v
index 77ecf144df..96cb568f26 100644
--- a/theories/Reals/Rsyntax.v
+++ b/theories/Reals/Rsyntax.v
@@ -200,24 +200,24 @@ Syntax constr
 Module R_scope.
 
 Delimits Scope R_scope with R.
-Infix NONA 5 "<=" Rle : R_scope.
-Infix NONA 5 "<"  Rlt : R_scope.
-Infix NONA 5 ">=" Rge : R_scope.
-(*Infix NONA 5 ">"  Rgt : R_scope. (* Conflicts with "<..>Cases ... " *) *)
-Infix 4 "+" Rplus : R_scope.
-Infix 4 "-" Rminus : R_scope.
-Infix 3 "*" Rmult : R_scope.
-Infix LEFTA 3 "/" Rdiv : R_scope.
+Infix "<=" Rle (at level 5, no associativity) : R_scope.
+Infix "<"  Rlt (at level 5, no associativity) : R_scope.
+Infix ">=" Rge (at level 5, no associativity) : R_scope.
+Infix ">" Rgt (at level 5, no associativity) : R_scope.
+Infix "+" Rplus (at level 4) : R_scope.
+Infix "-" Rminus (at level 4) : R_scope.
+Infix "*" Rmult (at level 3) : R_scope.
+Infix "/" Rdiv (at level 3) : R_scope.
 Distfix 0 "- _" Ropp : R_scope.
 Notation "x == y == z" := (eqT R x y)/\(eqT R y z)
   (at level 5, y at level 4): R_scope.
-Notation "x <= y <= z" := (Rle x y)/\(Rle y z)
+Notation "x  <=  y  <=  z" := (Rle x y)/\(Rle y z)
   (at level 5, y at level 4) : R_scope.
-Notation "x <= y < z"  := (Rle x y)/\(Rlt y z)
+Notation "x  <=  y  <  z"  := (Rle x y)/\(Rlt y z)
   (at level 5, y at level 4) : R_scope.
-Notation  "x < y < z"  := (Rlt x y)/\(Rlt y z)
+Notation  "x  <  y  <  z"  := (Rlt x y)/\(Rlt y z)
   (at level 5, y at level 4) : R_scope.
-Notation  "x < y <= z" := (Rlt x y)/\(Rle y z)
+Notation  "x  <  y  <=  z" := (Rlt x y)/\(Rle y z)
   (at level 5, y at level 4) : R_scope.
 Notation "x <> y" := ~(eqT R x y) (at level 5) : R_scope.
 Distfix 0 "/ _" Rinv : R_scope.
@@ -225,12 +225,13 @@ Distfix 0 "/ _" Rinv : R_scope.
 (* Warning: this hides sum and prod and breaks sumor symbolic notation *)
 Open Scope R_scope.
 
+(*
 Syntax constr
   level 0:
     Rzero' [ R0 ] -> [ _:"r_printer_R0" ]
   | Rone' [ R1 ] -> [ _:"r_printer_R1" ]
   | Rconst' [(Rplus R1 $r)] -> [$r:"r_printer_Rplus1"]
   | Ropp' [(Ropp $n)] -> [ $n:"r_printer_Ropp" ]
-.
+*)
 
 End R_scope.
diff --git a/theories/ZArith/Zsyntax.v b/theories/ZArith/Zsyntax.v
index 8d65afb680..f05ddeb4c8 100644
--- a/theories/ZArith/Zsyntax.v
+++ b/theories/ZArith/Zsyntax.v
@@ -226,15 +226,15 @@ Module Z_scope.
 Delimits Scope positive_scope with P.
 Delimits Scope Z_scope with Z.
 
-Infix LEFTA 4 "+" Zplus : Z_scope.
-Infix LEFTA 4 "-" Zminus : Z_scope.
-Infix LEFTA 3 "*" Zmult : Z_scope.
+Infix "+" Zplus (at level 4) : Z_scope.
+Infix "-" Zminus (at level 4) : Z_scope.
+Infix "*" Zmult (at level 4) : Z_scope.
 Distfix 0 "- _" Zopp : Z_scope.
-Infix 5 "<=" Zle : Z_scope.
-Infix 5 "<"  Zlt : Z_scope.
-Infix 5 ">=" Zge : Z_scope.
-(*Infix NONA 5 ">"  Zgt : Z_scope. (* Conflicts with "<..>Cases ... " *) *)
-Infix 5 "?=" Zcompare : Z_scope.
+Infix "<=" Zle (at level 5, no associativity) : Z_scope.
+Infix "<"  Zlt (at level 5, no associativity) : Z_scope.
+Infix ">=" Zge (at level 5, no associativity) : Z_scope.
+Infix ">"  Zgt (at level 5, no associativity) : Z_scope.
+Infix "?=" Zcompare (at level 5, no associativity) : Z_scope.
 Notation "x <= y <= z" := (Zle x y)/\(Zle y z)
   (at level 5, y at level 4):Z_scope.
 Notation "x <= y < z"  := (Zle x y)/\(Zlt y z)
@@ -248,7 +248,6 @@ Notation  "x = y = z" := x=y/\y=z
 
 Notation "x <> y" := ~(eq Z x y) (at level 5) : Z_scope.
 (* Notation "| x |" (Zabs x) : Z_scope.(* "|" conflicts with THENS *)*)
-Notation "|| x ||" := (Zabs x) (at level 1) : Z_scope.
 
 (* Overwrite the printing of "`x = y`" *)
 Syntax constr level 0:
@@ -258,11 +257,13 @@ Syntax constr level 0:
 (* Warning: this hides sum and prod and breaks sumor symbolic notation *)
 Open Scope Z_scope.
 
+(*
 Syntax constr
   level 0:
   | ZZero' [ ZERO ] -> [dummy:"z_printer_ZERO"]
   | ZPos' [ (POS $r) ] -> [$r:"z_printer_POS":9]
   | ZNeg' [ (NEG $r) ] -> [$r:"z_printer_NEG":9]
 .
+*)
 
 End Z_scope.