From 1ed00e4f8cded2a2024b66c3f7f4deee6ecd7c83 Mon Sep 17 00:00:00 2001
From: Matthieu Sozeau
Date: Fri, 8 Nov 2013 11:31:22 +0100
Subject: - 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
---
 kernel/typeops.ml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'kernel/typeops.ml')

diff --git a/kernel/typeops.ml b/kernel/typeops.ml
index 1a7d96b55d..c6355b3eab 100644
--- a/kernel/typeops.ml
+++ b/kernel/typeops.ml
@@ -427,11 +427,11 @@ let rec execute env cstr =
         let jl = execute_array env args in
 	let j =
 	  match kind_of_term f with
-	    | Ind ind when Environ.template_polymorphic_ind ind env ->
+	    | Ind ind when Environ.template_polymorphic_pind ind env ->
 		(* Sort-polymorphism of inductive types *)
 	      let args = Array.map (fun j -> lazy j.uj_type) jl in
 		judge_of_inductive_knowing_parameters env ind args
-	    | Const cst when Environ.template_polymorphic_constant cst env ->
+	    | Const cst when Environ.template_polymorphic_pconstant cst env ->
 		(* Sort-polymorphism of constant *)
 	      let args = Array.map (fun j -> lazy j.uj_type) jl in
 		judge_of_constant_knowing_parameters env cst args
-- 
cgit v1.2.3