diff options
| author |  Maxime Dénès <mail@maximedenes.fr> | 2018-06-01 15:40:57 +0200 |
|---|---|---|
| committer | Maxime Dénès <mail@maximedenes.fr> | 2018-06-01 15:40:57 +0200 |
| commit | 04756f75bf54b1ccda8c180c62b14c5eaaaabb67 (patch) | |
| tree | adbf0a9beef9c5b804fdb4f3a0e7a58bb967a0e0 /pretyping | |
| parent | 3a36761a27487e8917e1b59b59abacc2a7e65b95 (diff) | |
| parent | c7bd285555153294ec077cfa05c36bb420716f3b (diff) | |
Merge PR #7234: Reduce circular dependency constants <-> projections
Diffstat (limited to 'pretyping')
| -rw-r--r-- | pretyping/inductiveops.ml | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/pretyping/inductiveops.ml b/pretyping/inductiveops.ml index 8e3c33ff7..b1ab2d2b7 100644 --- a/pretyping/inductiveops.ml +++ b/pretyping/inductiveops.ml @@ -629,6 +629,10 @@ let type_of_inductive_knowing_conclusion env sigma ((mib,mip),u) conclty = env evdref scl ar.template_level (ctx,ar.template_param_levels) in !evdref, EConstr.of_constr (mkArity (List.rev ctx,scl)) +let type_of_projection_constant env (p,u) = + let pb = lookup_projection p env in + Vars.subst_instance_constr u pb.proj_type + let type_of_projection_knowing_arg env sigma p c ty = let c = EConstr.Unsafe.to_constr c in let IndType(pars,realargs) = @@ -637,7 +641,7 @@ let type_of_projection_knowing_arg env sigma p c ty = raise (Invalid_argument "type_of_projection_knowing_arg_type: not an inductive type") in let (_,u), pars = dest_ind_family pars in - substl (c :: List.rev pars) (Typeops.type_of_projection_constant env (p,u)) + substl (c :: List.rev pars) (type_of_projection_constant env (p,u)) (***********************************************) (* Guard condition *) |