From a59fe9d45a14c04c0165102c144e4036817e5b03 Mon Sep 17 00:00:00 2001
From: herbelin
Date: Thu, 22 Jun 2006 22:17:43 +0000
Subject: Correction bug du polymorphisme de sort des inductifs (cas où les
 variables d'univers associées aux arités des paramètres ne sont pas
 distinctes)

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@8972 85f007b7-540e-0410-9357-904b9bb8a0f7
---
 kernel/inductive.ml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'kernel')

diff --git a/kernel/inductive.ml b/kernel/inductive.ml
index 52f2ea3db7..a6a605d2d2 100644
--- a/kernel/inductive.ml
+++ b/kernel/inductive.ml
@@ -135,16 +135,22 @@ let sort_as_univ = function
 | Prop Null -> neutral_univ
 | Prop Pos -> base_univ
 
+let cons_subst u su subst =
+  try (u, sup su (List.assoc u subst)) :: List.remove_assoc u subst
+  with Not_found -> (u, su) :: subst
+
 let rec make_subst env exp act =
   match exp, act with
   (* Bind expected levels of parameters to actual levels *)
   | None :: exp, _ :: act ->
       make_subst env exp act
-  | Some u :: exp, t :: act -> 
-      (u, sort_as_univ (snd (dest_arity env t))) :: make_subst env exp act
+  | Some u :: exp, t :: act ->
+      let su = sort_as_univ (snd (dest_arity env t)) in
+      cons_subst u su (make_subst env exp act)
   (* Not enough parameters, create a fresh univ *)
   | Some u :: exp, [] ->
-      (u, fresh_local_univ ()) :: make_subst env exp []
+      let su = fresh_local_univ () in
+      cons_subst u su (make_subst env exp [])
   | None :: exp, [] ->
       make_subst env exp []
   (* Uniform parameters are exhausted *)
-- 
cgit v1.2.3