Prise en compte de Let dans build_dependent_inductive

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@683 85f007b7-540e-0410-9357-904b9bb8a0f7

3 files changed, 15 insertions, 7 deletions

diff --git a/kernel/inductive.ml b/kernel/inductive.ml
index 3436bf9620..257305b006 100644
--- a/kernel/inductive.ml
+++ b/kernel/inductive.ml
@@ -260,27 +260,35 @@ let get_arity (IndFamily (mispec,params)) =
 
 (* Functions to build standard types related to inductive *)
 
+let local_rels =
+  let rec relrec acc n = function (* more recent arg in front *)
+    | [] -> acc
+    | (_,None,_)::l -> relrec (mkRel n :: acc) (n+1) l
+    | (_,Some _,_)::l -> relrec acc (n+1) l
+  in relrec [] 1
+
 let build_dependent_constructor cs =
   applist
     (mkMutConstruct cs.cs_cstr,
-     (List.map (lift cs.cs_nargs) cs.cs_params)@(rel_list 0 cs.cs_nargs))
+     (List.map (lift cs.cs_nargs) cs.cs_params)@(local_rels cs.cs_args))
 
-let build_dependent_inductive (IndFamily (mis, params)) =
+let build_dependent_inductive (IndFamily (mis, params) as indf) =
+  let arsign,_ = get_arity indf in
   let nrealargs = mis_nrealargs mis in
   applist 
     (mkMutInd (mis_inductive mis),
-     (List.map (lift nrealargs) params)@(rel_list 0 nrealargs))
+     (List.map (lift nrealargs) params)@(local_rels arsign))
 
 (* builds the arity of an elimination predicate in sort [s] *)
 let make_arity env dep indf s =
   let (arsign,_) = get_arity indf in
   if dep then
     (* We need names everywhere *)
-    it_prod_name env
+    it_mkProd_or_LetIn_name env
       (mkArrow (build_dependent_inductive indf) (mkSort s)) arsign
   else
     (* No need to enforce names *)
-    prod_it (mkSort s) arsign
+    it_mkProd_or_LetIn (mkSort s) arsign
 
 (* [p] is the predicate and [cs] a constructor summary *)
 let build_branch_type env dep p cs =
diff --git a/kernel/inductive.mli b/kernel/inductive.mli
index 727ccf4095..4f27c30b88 100644
--- a/kernel/inductive.mli
+++ b/kernel/inductive.mli
@@ -174,7 +174,7 @@ val get_constructor : inductive_family -> int -> constructor_summary
    of the products of the constructors types are not renamed when
    [Anonymous] *)
 
-val get_arity : inductive_family -> flat_arity
+val get_arity : inductive_family -> arity
 
 (* Examples: assume
   
diff --git a/kernel/typeops.ml b/kernel/typeops.ml
index 8421a05434..5aaa47847d 100644
--- a/kernel/typeops.ml
+++ b/kernel/typeops.ml
@@ -166,7 +166,7 @@ in
 let find_case_dep_nparams env sigma (c,p) (IndFamily (mis,_) as indf) typP =
   let kelim = mis_kelim mis in
   let arsign,s = get_arity indf in
-  let glob_t = prod_it (mkSort s) arsign in
+  let glob_t = it_mkProd_or_LetIn (mkSort s) arsign in
   let (dep,_) = is_correct_arity env sigma kelim (c,p) indf (typP,glob_t) in
   dep