diff options
author | Enrico Tassi <gareuselesinge@debian.org> | 2016-01-26 16:56:33 +0100 |
---|---|---|
committer | Enrico Tassi <gareuselesinge@debian.org> | 2016-01-26 16:56:33 +0100 |
commit | 164c6861860e6b52818c031f901ffeff91fca16a (patch) | |
tree | 4f91d20c890c25915e7b28226c663b94a8cfb0d3 /theories/Compat | |
parent | 91dbeab8eef959c3f64960909ca69d4e68c8198d (diff) |
Imported Upstream version 8.5upstream/8.5
Diffstat (limited to 'theories/Compat')
-rw-r--r-- | theories/Compat/AdmitAxiom.v | 15 | ||||
-rw-r--r-- | theories/Compat/Coq84.v | 6 | ||||
-rw-r--r-- | theories/Compat/Coq85.v | 2 | ||||
-rw-r--r-- | theories/Compat/vo.itarget | 1 |
4 files changed, 18 insertions, 6 deletions
diff --git a/theories/Compat/AdmitAxiom.v b/theories/Compat/AdmitAxiom.v new file mode 100644 index 00000000..4d9f55cf --- /dev/null +++ b/theories/Compat/AdmitAxiom.v @@ -0,0 +1,15 @@ +(************************************************************************) +(* 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 the admit tactic act similar to Coq v8.4. In +8.4, [admit] created a new axiom; in 8.5, it just shelves the goal. This +compatibility definition is not in the Coq84.v file to avoid loading an +inconsistent axiom implicitly. *) + +Axiom proof_admitted : False. +Ltac admit := clear; abstract case proof_admitted. diff --git a/theories/Compat/Coq84.v b/theories/Compat/Coq84.v index b04d5168..90083b00 100644 --- a/theories/Compat/Coq84.v +++ b/theories/Compat/Coq84.v @@ -1,6 +1,6 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015 *) +(* <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 *) @@ -18,10 +18,6 @@ Global Set Asymmetric Patterns. (** See bug 3545 *) Global Set Universal Lemma Under Conjunction. -(** In 8.4, [admit] created a new axiom; in 8.5, it just shelves the goal. *) -Axiom proof_admitted : False. -Ltac admit := clear; abstract case proof_admitted. - (** In 8.5, [refine] leaves over dependent subgoals. *) Tactic Notation "refine" uconstr(term) := refine term; shelve_unifiable. diff --git a/theories/Compat/Coq85.v b/theories/Compat/Coq85.v index 1622f2ae..6e2b3564 100644 --- a/theories/Compat/Coq85.v +++ b/theories/Compat/Coq85.v @@ -1,6 +1,6 @@ (************************************************************************) (* v * The Coq Proof Assistant / The Coq Development Team *) -(* <O___,, * INRIA - CNRS - LIX - LRI - PPS - Copyright 1999-2015 *) +(* <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 *) diff --git a/theories/Compat/vo.itarget b/theories/Compat/vo.itarget index c0c40ab1..43b19700 100644 --- a/theories/Compat/vo.itarget +++ b/theories/Compat/vo.itarget @@ -1,2 +1,3 @@ +AdmitAxiom.vo Coq84.vo Coq85.vo |