diff options
| author | Pierre-Marie Pédrot | 2016-09-14 10:27:38 +0200 |
|---|---|---|
| committer | Pierre-Marie Pédrot | 2016-09-14 11:10:25 +0200 |
| commit | 3e794be5f02ed438cdc5a351d09bdfb54c0be01a (patch) | |
| tree | 3bbed56609e021f5c560a10037bafdae62e0db14 /pretyping/pretyping.ml | |
| parent | 0e94cb62410354e5df4e65b34e7cbf8451b31d6e (diff) | |
| parent | 2aaa58c22e37b05e3637ac7161bb464da7db054a (diff) | |
Merge branch 'v8.5' into v8.6
Diffstat (limited to 'pretyping/pretyping.ml')
| -rw-r--r-- | pretyping/pretyping.ml | 17 |
1 files changed, 1 insertions, 16 deletions
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml index f466740036..46f0219f91 100644 --- a/pretyping/pretyping.ml +++ b/pretyping/pretyping.ml @@ -348,21 +348,6 @@ let process_inference_flags flags env initial_sigma (sigma,c) = (* Allow references to syntactically nonexistent variables (i.e., if applied on an inductive) *) let allow_anonymous_refs = ref false -(* Utilisé pour inférer le prédicat des Cases *) -(* Semble exagérement fort *) -(* Faudra préférer une unification entre les types de toutes les clauses *) -(* et autoriser des ? à rester dans le résultat de l'unification *) - -let evar_type_fixpoint loc env evdref lna lar vdefj = - let lt = Array.length vdefj in - if Int.equal (Array.length lar) lt then - for i = 0 to lt-1 do - if not (e_cumul env.ExtraEnv.env evdref (vdefj.(i)).uj_type - (lift lt lar.(i))) then - error_ill_typed_rec_body_loc loc env.ExtraEnv.env !evdref - i lna vdefj lar - done - (* coerce to tycon if any *) let inh_conv_coerce_to_tycon resolve_tc loc env evdref j = function | None -> j @@ -652,7 +637,7 @@ let rec pretype k0 resolve_tc (tycon : type_constraint) (env : ExtraEnv.t) evdre { uj_val = it_mkLambda_or_LetIn j.uj_val ctxt; uj_type = it_mkProd_or_LetIn j.uj_type ctxt }) ctxtv vdef in - evar_type_fixpoint loc env evdref names ftys vdefj; + Typing.check_type_fixpoint loc env.ExtraEnv.env evdref names ftys vdefj; let ftys = Array.map (nf_evar !evdref) ftys in let fdefs = Array.map (fun x -> nf_evar !evdref (j_val x)) vdefj in let fixj = match fixkind with |