diff options
| author | herbelin | 2000-07-01 17:54:35 +0000 |
|---|---|---|
| committer | herbelin | 2000-07-01 17:54:35 +0000 |
| commit | 16c90ce785f83d5fdb86ec0bf42aa89b541a8552 (patch) | |
| tree | 5f7e1612efa5926a2f66828dd00eaa9dc6c302e6 /kernel | |
| parent | a51f67a717a93cf61bfed79e70da9f35555dcab7 (diff) | |
Plus de env et sigma dans get_arity, plus de sigma dans make_arity
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/coq/trunk@549 85f007b7-540e-0410-9357-904b9bb8a0f7
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/safe_typing.ml | 4 | ||||
| -rw-r--r-- | kernel/typeops.ml | 11 |
2 files changed, 5 insertions, 10 deletions
diff --git a/kernel/safe_typing.ml b/kernel/safe_typing.ml index 8435b6d74b..48692008cb 100644 --- a/kernel/safe_typing.ml +++ b/kernel/safe_typing.ml @@ -402,7 +402,7 @@ let type_one_constructor env_ar nparams arsort c = let type_one_inductive i env_ar env_par nparams ninds (id,ar,cnames,vc) = let arsort = sort_of_arity env_ar ar in - let (constrsinfos,jlc,cst') = + let (constrsinfos,jlc,cst) = List.fold_right (fun c (infosl,jl,cst) -> let (infos,jc,cst') = type_one_constructor env_ar nparams arsort c in @@ -413,7 +413,7 @@ let type_one_inductive i env_ar env_par nparams ninds (id,ar,cnames,vc) = let vc' = Array.of_list jlc in let issmall,isunit = small_unit constrsinfos (env_par,nparams,ar) in let (_,tyar) = lookup_rel (ninds+1-i) env_ar in - ((id,tyar,cnames,issmall,isunit,vc'), cst') + ((id,tyar,cnames,issmall,isunit,vc'), cst) let add_mind sp mie env = mind_check_names mie; diff --git a/kernel/typeops.ml b/kernel/typeops.ml index 720061fa59..a22e5715b3 100644 --- a/kernel/typeops.ml +++ b/kernel/typeops.ml @@ -99,11 +99,6 @@ let type_of_inductive env sigma i = (* Constructors. *) -(* -let type_mconstructs env sigma mind = - mis_type_mconstructs (lookup_mind_specif mind env) -*) - let type_mconstruct env sigma i mind = mis_type_mconstruct i (lookup_mind_specif mind env) @@ -167,8 +162,8 @@ in try srec (pt,t) with Arity kinds -> let listarity = - (List.map (make_arity env sigma true indf) kelim) - @(List.map (make_arity env sigma false indf) kelim) + (List.map (make_arity env true indf) kelim) + @(List.map (make_arity env false indf) kelim) in let ind = mis_inductive (fst (dest_ind_family indf)) in error_elim_arity CCI env ind listarity c p pt kinds @@ -176,7 +171,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 env sigma indf in + let arsign,s = get_arity indf in let glob_t = prod_it (mkSort s) arsign in let (dep,_) = is_correct_arity env sigma kelim (c,p) indf (typP,glob_t) in dep |