diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2016-07-06 11:42:35 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2016-07-06 12:25:03 +0200 |
| commit | 9a1eb2f4fefcc52f56785f20831e854bb626ae95 (patch) | |
| tree | f08dd10e4d4dde5e9450eb005b8b8e60d64c66e7 | |
| parent | b2dd4dd979577e4f384750872f7f0e7f9bd8df94 (diff) | |
Fix #4793: Coq 8.6 should accept -compat 8.6
We also add a Coq86.v compat file.
| -rw-r--r-- | doc/stdlib/index-list.html.template | 1 | ||||
| -rw-r--r-- | theories/Compat/Coq85.v | 4 | ||||
| -rw-r--r-- | theories/Compat/Coq86.v | 9 | ||||
| -rw-r--r-- | theories/Compat/vo.itarget | 1 | ||||
| -rw-r--r-- | toplevel/coqinit.ml | 3 | ||||
| -rw-r--r-- | toplevel/coqtop.ml | 1 |
6 files changed, 18 insertions, 1 deletions
diff --git a/doc/stdlib/index-list.html.template b/doc/stdlib/index-list.html.template index fb45777e7..9216c81fc 100644 --- a/doc/stdlib/index-list.html.template +++ b/doc/stdlib/index-list.html.template @@ -616,5 +616,6 @@ through the <tt>Require Import</tt> command.</p> theories/Compat/AdmitAxiom.v theories/Compat/Coq84.v theories/Compat/Coq85.v + theories/Compat/Coq86.v </dd> </dl> diff --git a/theories/Compat/Coq85.v b/theories/Compat/Coq85.v index 1e30ab919..54621cc1c 100644 --- a/theories/Compat/Coq85.v +++ b/theories/Compat/Coq85.v @@ -8,6 +8,10 @@ (** Compatibility file for making Coq act similar to Coq v8.5 *) +(** Any compatibility changes to make future versions of Coq behave like Coq 8.6 + are likely needed to make them behave like Coq 8.5. *) +Require Export Coq.Compat.Coq86. + (* In 8.5, "intros [|]", taken e.g. on a goal "A\/B->C", does not behave as "intros [H|H]" but leave instead hypotheses quantified in the goal, here producing subgoals A->C and B->C. *) diff --git a/theories/Compat/Coq86.v b/theories/Compat/Coq86.v new file mode 100644 index 000000000..6952fdf19 --- /dev/null +++ b/theories/Compat/Coq86.v @@ -0,0 +1,9 @@ +(************************************************************************) +(* v * The Coq Proof Assistant / The Coq Development Team *) +(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2016 *) +(* \VV/ **************************************************************) +(* // * This file is distributed under the terms of the *) +(* * GNU Lesser General Public License Version 2.1 *) +(************************************************************************) + +(** Compatibility file for making Coq act similar to Coq v8.6 *)
\ No newline at end of file diff --git a/theories/Compat/vo.itarget b/theories/Compat/vo.itarget index 43b197004..7ffb86ebb 100644 --- a/theories/Compat/vo.itarget +++ b/theories/Compat/vo.itarget @@ -1,3 +1,4 @@ AdmitAxiom.vo Coq84.vo Coq85.vo +Coq86.vo diff --git a/toplevel/coqinit.ml b/toplevel/coqinit.ml index 5438b163a..d9cd574a0 100644 --- a/toplevel/coqinit.ml +++ b/toplevel/coqinit.ml @@ -130,7 +130,8 @@ let init_ocaml_path () = [ "grammar" ]; [ "ide" ]; [ "ltac" ]; ] let get_compat_version = function - | "8.5" -> Flags.Current + | "8.6" -> Flags.Current + | "8.5" -> Flags.V8_5 | "8.4" -> Flags.V8_4 | "8.3" -> Flags.V8_3 | "8.2" -> Flags.V8_2 diff --git a/toplevel/coqtop.ml b/toplevel/coqtop.ml index 7c0b9bec2..d141cd8ec 100644 --- a/toplevel/coqtop.ml +++ b/toplevel/coqtop.ml @@ -200,6 +200,7 @@ let require () = let add_compat_require v = match v with | Flags.V8_4 -> add_require "Coq.Compat.Coq84" + | Flags.V8_5 -> add_require "Coq.Compat.Coq85" | _ -> () let compile_list = ref ([] : (bool * string) list) |