aboutsummaryrefslogtreecommitdiff
path: root/theories
diff options
context:
space:
mode:
authorherbelin2003-10-30 14:29:39 +0000
committerherbelin2003-10-30 14:29:39 +0000
commite52a9fa8835eddf70d0c8e454470fb12eebef7cd (patch)
treec78de69bd77ada9fe1eb6cbf58544c7c6b3e86e8 /theories
parenta3b23be4009e8b15dc0fd90d849445f35f759e3d (diff)
Parsing du moins unaire au niveau de l'application qui n'a pas besoin d'etre associative a gauche; gestion du signe dans le parseur pas dans l'interpreteur
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@4745 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'theories')
-rw-r--r--theories/Init/Notations.v5
-rw-r--r--theories/Reals/Rsyntax.v36
2 files changed, 18 insertions, 23 deletions
diff --git a/theories/Init/Notations.v b/theories/Init/Notations.v
index 00c35de84e..7fb43a703e 100644
--- a/theories/Init/Notations.v
+++ b/theories/Init/Notations.v
@@ -54,9 +54,10 @@ Uninterpreted Notation "x * y" (at level 3, right associativity)
Uninterpreted V8Notation "x / y" (at level 40, left associativity).
Uninterpreted Notation "x + y" (at level 4, left associativity).
Uninterpreted Notation "x - y" (at level 4, left associativity).
-Uninterpreted Notation "- x" (at level 0) V8only (at level 50).
+Uninterpreted Notation "- x" (at level 0)
+ V8only (at level 10, right associativity).
Uninterpreted Notation "/ x" (at level 0)
- V8only (at level 40, left associativity).
+ V8only (at level 10, right associativity).
Uninterpreted V8Notation "x ^ y" (at level 30, left associativity).
diff --git a/theories/Reals/Rsyntax.v b/theories/Reals/Rsyntax.v
index 3929acdf9f..53f8aec077 100644
--- a/theories/Reals/Rsyntax.v
+++ b/theories/Reals/Rsyntax.v
@@ -205,37 +205,31 @@ Syntax constr
(* For parsing/printing based on scopes *)
Module 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
- V8only (at level 50, left associativity).
-Infix "-" Rminus (at level 4) : R_scope
- V8only (at level 50, left associativity).
-Infix "*" Rmult (at level 3) : R_scope
- V8only (at level 40, left associativity).
-Infix "/" Rdiv (at level 3) : R_scope
- V8only (at level 40, left associativity).
-Notation "- x" := (Ropp x) (at level 0) : R_scope
- V8only (at level 50, left associativity).
+Infix "<=" Rle (at level 5, no associativity) : R_scope V8only.
+Infix "<" Rlt (at level 5, no associativity) : R_scope V8only.
+Infix ">=" Rge (at level 5, no associativity) : R_scope V8only.
+Infix ">" Rgt (at level 5, no associativity) : R_scope V8only.
+Infix "+" Rplus (at level 4) : R_scope V8only.
+Infix "-" Rminus (at level 4) : R_scope V8only.
+Infix "*" Rmult (at level 3) : R_scope V8only.
+Infix "/" Rdiv (at level 3) : R_scope V8only.
+Notation "- x" := (Ropp x) (at level 0) : R_scope V8only.
Notation "x == y == z" := (eqT R x y)/\(eqT R y z)
- (at level 5, y at level 4, no associtivity): R_scope
- V8only "x = y = z" (at level 70, y at next level, no associativity).
+ (at level 5, y at level 4, no associtivity): R_scope.
Notation "x <= y <= z" := (Rle x y)/\(Rle y z)
(at level 5, y at level 4) : R_scope
- V8only (at level 70, y at next level, no associativity).
+ V8only.
Notation "x <= y < z" := (Rle x y)/\(Rlt y z)
(at level 5, y at level 4) : R_scope
- V8only (at level 70, y at next level, no associativity).
+ V8only.
Notation "x < y < z" := (Rlt x y)/\(Rlt y z)
(at level 5, y at level 4) : R_scope
- V8only (at level 70, y at next level, no associativity).
+ V8only.
Notation "x < y <= z" := (Rlt x y)/\(Rle y z)
(at level 5, y at level 4) : R_scope
- V8only (at level 70, y at next level, no associativity).
+ V8only.
Notation "/ x" := (Rinv x) (at level 0): R_scope
- V8only (at level 40, left associativity).
+ V8only.
Open Local Scope R_scope.
End R_scope.