diff options
| author |  Matthieu Sozeau <mattam@mattam.org> | 2013-11-08 11:31:22 +0100 |
|---|---|---|
| committer | Matthieu Sozeau <mattam@mattam.org> | 2014-05-06 09:58:58 +0200 |
| commit | 1ed00e4f8cded2a2024b66c3f7f4deee6ecd7c83 (patch) | |
| tree | 471afc13a25bfe689d30447a6042c9f62c72f92e /theories/Lists | |
| parent | 62fb849cf9410ddc2d9f355570f4fb859f3044c3 (diff) | |
- Fix bug preventing apply from unfolding Fixpoints.
- Remove Universe Polymorphism flags everywhere.
- Properly infer, discharge template arities and fix substitution inside them
(kernel code to check for correctness).
- Fix tactics that were supposing universe polymorphic constants/inductives to
be parametric on that status. Required to make interp_constr* return the whole evar
universe context now.
- Fix the univ/level/instance hashconsing to respect the fact that marshalling doesn't preserve sharing,
sadly losing most of its benefits.
Short-term solution is to add hashes to these for faster comparison, longer term requires rewriting
all serialization code.
Conflicts:
kernel/univ.ml
tactics/tactics.ml
theories/Logic/EqdepFacts.v
Diffstat (limited to 'theories/Lists')
| -rw-r--r-- | theories/Lists/List.v | 4 | ||||
| -rw-r--r-- | theories/Lists/SetoidList.v | 2 | ||||
| -rw-r--r-- | theories/Lists/SetoidPermutation.v | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/theories/Lists/List.v b/theories/Lists/List.v index f6a0382c2..2062f3861 100644 --- a/theories/Lists/List.v +++ b/theories/Lists/List.v @@ -10,7 +10,7 @@ Require Import Le Gt Minus Bool. Require Setoid. Set Implicit Arguments. -Set Universe Polymorphism. +(* Set Universe Polymorphism. *) (******************************************************************) (** * Basics: definition of polymorphic lists and some operations *) @@ -2036,4 +2036,4 @@ Notation AllS := Forall (only parsing). (* was formerly in TheoryList *) Hint Resolve app_nil_end : datatypes v62. (* end hide *) -Unset Universe Polymorphism. +(* Unset Universe Polymorphism. *) diff --git a/theories/Lists/SetoidList.v b/theories/Lists/SetoidList.v index ba62fa7fd..644d479c6 100644 --- a/theories/Lists/SetoidList.v +++ b/theories/Lists/SetoidList.v @@ -11,7 +11,7 @@ Require Export Sorted. Require Export Setoid Basics Morphisms. Set Implicit Arguments. Unset Strict Implicit. -Set Universe Polymorphism. +(* Set Universe Polymorphism. *) (** * Logical relations over lists with respect to a setoid equality or ordering. *) diff --git a/theories/Lists/SetoidPermutation.v b/theories/Lists/SetoidPermutation.v index 05f03ea56..afc7c25bd 100644 --- a/theories/Lists/SetoidPermutation.v +++ b/theories/Lists/SetoidPermutation.v @@ -7,7 +7,7 @@ (***********************************************************************) Require Import SetoidList. -Set Universe Polymorphism. +(* Set Universe Polymorphism. *) Set Implicit Arguments. Unset Strict Implicit. |