diff options
author | 2016-07-07 20:27:56 +0200 | |
---|---|---|
committer | 2016-07-07 20:31:30 +0200 | |
commit | 17d8a49247ad82ca59def4c577031101f61bbf08 (patch) | |
tree | 8ee004df8d6ff7e252f346e3593169e374de8796 /theories | |
parent | 21be7a5dba2fdfa40fd7b4a3d94610947d202bb7 (diff) | |
parent | 947b30150602ba951efa4717d30d4a380482a963 (diff) |
Merge branch 'v8.5' into v8.6
Diffstat (limited to 'theories')
-rw-r--r-- | theories/Compat/Coq84.v | 6 | ||||
-rw-r--r-- | theories/FSets/FMapFacts.v | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/theories/Compat/Coq84.v b/theories/Compat/Coq84.v index 39bc59a65..21b78b533 100644 --- a/theories/Compat/Coq84.v +++ b/theories/Compat/Coq84.v @@ -70,3 +70,9 @@ Coercion sigT_of_sig : sig >-> sigT. Coercion sig_of_sigT : sigT >-> sig. Coercion sigT2_of_sig2 : sig2 >-> sigT2. 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. diff --git a/theories/FSets/FMapFacts.v b/theories/FSets/FMapFacts.v index 9a227ad13..3c5690a72 100644 --- a/theories/FSets/FMapFacts.v +++ b/theories/FSets/FMapFacts.v @@ -24,6 +24,8 @@ Hint Extern 1 (Equivalence _) => constructor; congruence. Module WFacts_fun (E:DecidableType)(Import M:WSfun E). +Notation option_map := option_map (compat "8.4"). + Notation eq_dec := E.eq_dec. Definition eqb x y := if eq_dec x y then true else false. |