diff options
| author |  Jason Gross <jgross@mit.edu> | 2016-09-26 13:20:07 -0400 |
|---|---|---|
| committer |  Pierre-Marie Pédrot <pierre-marie.pedrot@inria.fr> | 2016-09-26 23:44:15 +0200 |
| commit | b04a1d6eb82f24844bfc0a07ab0801d3a4169c6b (patch) | |
| tree | 84b88bae6e5e4769115ef9e7f8d04788cd9a8fe3 | |
| parent | 53ac7ca0cd74b62d47472c0dabfcc8dc1cacd86c (diff) | |
Remove spaces from around list notations
| -rw-r--r-- | theories/Compat/Coq84.v | 4 | ||||
| -rw-r--r-- | theories/Lists/List.v | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/theories/Compat/Coq84.v b/theories/Compat/Coq84.v index 341be92d1..5eecdc64c 100644 --- a/theories/Compat/Coq84.v +++ b/theories/Compat/Coq84.v @@ -77,8 +77,8 @@ Coercion sig2_of_sigT2 : sigT2 >-> sig2. (** As per bug #4733 (https://coq.inria.fr/bugs/show_bug.cgi?id=4733), we want the user to be able to create custom list-like notatoins that work in both 8.4 and 8.5. This is necessary. These should become compat 8.4 notations in the relevant files, but these modify the parser (bug #4798), so this cannot happen until that bug is fixed. *) Require Coq.Lists.List. Require Coq.Vectors.VectorDef. -Notation " [ x ; .. ; y ] " := (cons x .. (cons y nil) ..) : list_scope. -Notation " [ x ; .. ; y ] " := (VectorDef.cons _ x _ .. (VectorDef.cons _ y _ (nil _)) ..) : vector_scope. +Notation "[ x ; .. ; y ]" := (cons x .. (cons y nil) ..) : list_scope. +Notation "[ x ; .. ; y ]" := (VectorDef.cons _ x _ .. (VectorDef.cons _ y _ (nil _)) ..) : vector_scope. (** In 8.4, the statement of admitted lemmas did not depend on the section variables. *) diff --git a/theories/Lists/List.v b/theories/Lists/List.v index 9886ae6a8..fc94d7e25 100644 --- a/theories/Lists/List.v +++ b/theories/Lists/List.v @@ -21,12 +21,12 @@ Set Implicit Arguments. Open Scope list_scope. -(** Standard notations for lists. +(** Standard notations for lists. In a special module to avoid conflicts. *) Module ListNotations. -Notation " [ ] " := nil (format "[ ]") : list_scope. -Notation " [ x ] " := (cons x nil) : list_scope. -Notation " [ x ; y ; .. ; z ] " := (cons x (cons y .. (cons z nil) ..)) : list_scope. +Notation "[ ]" := nil (format "[ ]") : list_scope. +Notation "[ x ]" := (cons x nil) : list_scope. +Notation "[ x ; y ; .. ; z ]" := (cons x (cons y .. (cons z nil) ..)) : list_scope. End ListNotations. Import ListNotations. @@ -195,7 +195,7 @@ Section Facts. Qed. Theorem app_nil_r : forall l:list A, l ++ [] = l. - Proof. + Proof. induction l; simpl; f_equal; auto. Qed. |