Remplacement des fichiers .v ancienne syntaxe de theories, contrib et states par les fichiers nouvelle syntaxe

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

1 files changed, 46 insertions, 63 deletions

diff --git a/theories/Init/Notations.v b/theories/Init/Notations.v
index 624f6c902..ce1d4d7c9 100644
--- a/theories/Init/Notations.v
+++ b/theories/Init/Notations.v
@@ -12,97 +12,80 @@
 
 (** Notations for logical connectives *)
 
-Uninterpreted Notation "x <-> y" (at level 8, right associativity)
-  V8only (at level 95, no associativity).
-Uninterpreted Notation "x /\ y" (at level 6, right associativity) 
-  V8only (at level 80, right associativity).
-Uninterpreted Notation "x \/ y" (at level 7, right associativity)
-  V8only (at level 85, right associativity).
-Uninterpreted Notation "~ x" (at level 5, right associativity)
-  V8only (at level 75, right associativity).
+Reserved Notation "x <-> y" (at level 95, no associativity).
+Reserved Notation "x /\ y" (at level 80, right associativity).
+Reserved Notation "x \/ y" (at level 85, right associativity).
+Reserved Notation "~ x" (at level 75, right associativity).
 
 (** Notations for equality and inequalities *)
 
-Uninterpreted Notation "x = y  :> T" 
-  (at level 5, y at next level, no associativity).
-Uninterpreted Notation "x = y"
-  (at level 5, no associativity).
-Uninterpreted Notation "x = y = z"
-  (at level 5, no associativity, y at next level).
+Reserved Notation "x = y  :> T"
+(at level 70, y at next level, no associativity).
+Reserved Notation "x = y" (at level 70, no associativity).
+Reserved Notation "x = y = z"
+(at level 70, no associativity, y at next level).
 
-Uninterpreted Notation "x <> y  :> T" 
-  (at level 5, y at next level, no associativity).
-Uninterpreted Notation "x <> y"
-  (at level 5, no associativity).
+Reserved Notation "x <> y  :> T"
+(at level 70, y at next level, no associativity).
+Reserved Notation "x <> y" (at level 70, no associativity).
 
-Uninterpreted V8Notation "x <= y" (at level 70, no associativity).
-Uninterpreted V8Notation "x < y" (at level 70, no associativity).
-Uninterpreted V8Notation "x >= y" (at level 70, no associativity).
-Uninterpreted V8Notation "x > y" (at level 70, no associativity).
+Reserved Notation "x <= y" (at level 70, no associativity).
+Reserved Notation "x < y" (at level 70, no associativity).
+Reserved Notation "x >= y" (at level 70, no associativity).
+Reserved Notation "x > y" (at level 70, no associativity).
 
-Uninterpreted V8Notation "x <= y <= z" (at level 70, y at next level).
-Uninterpreted V8Notation "x <= y < z"  (at level 70, y at next level).
-Uninterpreted V8Notation "x < y < z"   (at level 70, y at next level).
-Uninterpreted V8Notation "x < y <= z"  (at level 70, y at next level).
+Reserved Notation "x <= y <= z" (at level 70, y at next level).
+Reserved Notation "x <= y < z" (at level 70, y at next level).
+Reserved Notation "x < y < z" (at level 70, y at next level).
+Reserved Notation "x < y <= z" (at level 70, y at next level).
 
 (** Arithmetical notations (also used for type constructors) *)
 
-Uninterpreted Notation "x + y" (at level 4, left associativity).
-Uninterpreted V8Notation "x - y" (at level 50, left associativity).
-Uninterpreted Notation "x * y" (at level 3, right associativity)
-  V8only (at level 40, left associativity).
-Uninterpreted V8Notation "x / y" (at level 40, left associativity).
-Uninterpreted V8Notation "- x" (at level 35, right associativity).
-Uninterpreted V8Notation "/ x" (at level 35, right associativity).
-Uninterpreted V8Notation "x ^ y" (at level 30, left associativity).
+Reserved Notation "x + y" (at level 50, left associativity).
+Reserved Notation "x - y" (at level 50, left associativity).
+Reserved Notation "x * y" (at level 40, left associativity).
+Reserved Notation "x / y" (at level 40, left associativity).
+Reserved Notation "- x" (at level 35, right associativity).
+Reserved Notation "/ x" (at level 35, right associativity).
+Reserved Notation "x ^ y" (at level 30, left associativity).
 
 (** Notations for pairs *)
 
-Uninterpreted Notation "( x , y )" (at level 0)
-  V8only "x , y" (at level 250, left associativity).
+Reserved Notation "x , y" (at level 250, left associativity).
 
 (** Notations for sum-types *)
 
 (* Home-made factorization at level 4 to parse B+{x:A|P} without parentheses *)
 
-Uninterpreted Notation "B + { x : A | P }"
-  (at level 4, left associativity, only parsing)
-  V8only (at level 50, x at level 99, left associativity, only parsing).
+Reserved Notation "B + { x : A | P }"
+(at level 50, x at level 99, left associativity, only parsing).
 
-Uninterpreted Notation "B + { x : A | P & Q }"
-  (at level 4, left associativity, only parsing)
-  V8only (at level 50, x at level 99, left associativity, only parsing).
+Reserved Notation "B + { x : A | P & Q }"
+(at level 50, x at level 99, left associativity, only parsing).
 
-Uninterpreted Notation "B + { x : A & P }"
-  (at level 4, left associativity, only parsing)
-  V8only (at level 50, x at level 99, left associativity, only parsing).
+Reserved Notation "B + { x : A & P }"
+(at level 50, x at level 99, left associativity, only parsing).
 
-Uninterpreted Notation "B + { x : A & P & Q }"
-  (at level 4, left associativity, only parsing)
-  V8only (at level 50, x at level 99, left associativity, only parsing).
+Reserved Notation "B + { x : A & P & Q }"
+(at level 50, x at level 99, left associativity, only parsing).
 
 (* At level 1 to factor with {x:A|P} etc *)
 
-Uninterpreted Notation "{ A }  + { B }" (at level 1)
-  V8only (at level 0, A at level 99).
+Reserved Notation "{ A }  + { B }" (at level 0, A at level 99).
 
-Uninterpreted Notation "A + { B }" (at level 4, left associativity)
-  V8only (at level 50, B at level 99, left associativity).
+Reserved Notation "A + { B }"
+(at level 50, B at level 99, left associativity).
 
 (** Notations for sigma-types or subsets *)
 
-Uninterpreted Notation "{ x : A  |  P }" (at level 1)
-  V8only (at level 0, x at level 99).
-Uninterpreted Notation "{ x : A  |  P  &  Q }" (at level 1)
-  V8only (at level 0, x at level 99).
+Reserved Notation "{ x : A  |  P }" (at level 0, x at level 99).
+Reserved Notation "{ x : A  |  P  &  Q }" (at level 0, x at level 99).
 
-Uninterpreted Notation "{ x : A  &  P }" (at level 1)
-  V8only (at level 0, x at level 99).
-Uninterpreted Notation "{ x : A  &  P  &  Q }" (at level 1)
-  V8only (at level 0, x at level 99).
+Reserved Notation "{ x : A  &  P }" (at level 0, x at level 99).
+Reserved Notation "{ x : A  &  P  &  Q }" (at level 0, x at level 99).
 
-Delimits Scope type_scope with type.
-Delimits Scope core_scope with core.
+Delimit Scope type_scope with type.
+Delimit Scope core_scope with core.
 
 Open Scope core_scope.
-Open Scope type_scope.
+Open Scope type_scope.
\ No newline at end of file