diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2017-04-04 16:55:56 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2017-04-04 16:55:56 +0200 |
| commit | c112063ba5f562d511ed0cbd754a41539fc48fe1 (patch) | |
| tree | 1f7e244b3d3b0963d07463604d77bdf35001e67c /pretyping/pretyping.ml | |
| parent | b824d8ad00001f6c41d0fc8bbf528dccb937c887 (diff) | |
| parent | ea10a2da9ac11ea57e9eb80d0d6baf9321886da4 (diff) | |
Merge branch 'trunk' into pr379
Diffstat (limited to 'pretyping/pretyping.ml')
| -rw-r--r-- | pretyping/pretyping.ml | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/pretyping/pretyping.ml b/pretyping/pretyping.ml index c673851c8..4a73a9e0c 100644 --- a/pretyping/pretyping.ml +++ b/pretyping/pretyping.ml @@ -812,14 +812,14 @@ let rec pretype k0 resolve_tc (tycon : type_constraint) (env : ExtraEnv.t) evdre iraise (e, info) in inh_conv_coerce_to_tycon loc env evdref resj tycon - | GLetIn(loc,name,c1,c2) -> - let j = - match c1 with - | GCast (loc, c, CastConv t) -> - let tj = pretype_type empty_valcon env evdref lvar t in - pretype (mk_tycon tj.utj_val) env evdref lvar c - | _ -> pretype empty_tycon env evdref lvar c1 - in + | GLetIn(loc,name,c1,t,c2) -> + let tycon1 = + match t with + | Some t -> + mk_tycon (pretype_type empty_valcon env evdref lvar t).utj_val + | None -> + empty_tycon in + let j = pretype tycon1 env evdref lvar c1 in let t = evd_comb1 (Evarsolve.refresh_universes ~onlyalg:true ~status:Evd.univ_flexible (Some false) env.ExtraEnv.env) evdref j.uj_type in |