diff options
| -rwxr-xr-x | theories/Init/Datatypes.v | 13 | ||||
| -rw-r--r-- | theories/Init/Notations.v | 10 |
2 files changed, 2 insertions, 21 deletions
diff --git a/theories/Init/Datatypes.v b/theories/Init/Datatypes.v index 7c199bbf35..353ba073ee 100755 --- a/theories/Init/Datatypes.v +++ b/theories/Init/Datatypes.v @@ -77,18 +77,7 @@ Inductive prod (A B:Set) : Set := Add Printing Let prod. Notation "x * y" := (prod x y) : type_scope. -Notation "( x , y )" := (pair x y) : core_scope. - -(* Temporary hack *) -Notation "( x1 , x2 , x3 )" := ((x1,x2),x3) : core_scope. -Notation "( x1 , x2 , x3 , x4 )" := ((x1,x2),x3,x4) : core_scope. -Notation "( x1 , x2 , x3 , x4 , x5 )" := ((x1,x2),x3,x4,x5) : core_scope. -Notation "( x1 , x2 , x3 , x4 , x5 , x6 )" - := ((x1,x2),x3,x4,x5,x6) : core_scope. -Notation "( x1 , x2 , x3 , x4 , x5 , x6 , x7 )" - := ((x1,x2),x3,x4,x5,x6,x7) : core_scope. -Notation "( x1 , x2 , x3 , x4 , x5 , x6 , x7 , x8 )" - := ((x1,x2),x3,x4,x5,x6,x7,x8) : core_scope. +Notation "( x , y , .. , z )" := (pair .. (pair x y) .. z) : core_scope. Section projections. Variables A B : Set. diff --git a/theories/Init/Notations.v b/theories/Init/Notations.v index 92e1a818b5..7915009865 100644 --- a/theories/Init/Notations.v +++ b/theories/Init/Notations.v @@ -51,15 +51,7 @@ Reserved Notation "x ^ y" (at level 30, right associativity). (** Notations for pairs *) -(* Temporary hack *) -Reserved Notation "( x , y )" (at level 0). -Reserved Notation "( x , y , z )" (at level 0). -Reserved Notation "( x1 , x2 , x3 )" (at level 0). -Reserved Notation "( x1 , x2 , x3 , x4 )" (at level 0). -Reserved Notation "( x1 , x2 , x3 , x4 , x5 )" (at level 0). -Reserved Notation "( x1 , x2 , x3 , x4 , x5 , x6 )" (at level 0). -Reserved Notation "( x1 , x2 , x3 , x4 , x5 , x6 , x7 )" (at level 0). -Reserved Notation "( x1 , x2 , x3 , x4 , x5 , x6 , x7 , x8 )" (at level 0). +Reserved Notation "( x , y , .. , z )" (at level 0). (** Notation "{ x }" is reserved and has a special status as component of other notations; it is at level 0 to factor with {x:A|P} etc *) |