From 84544396cbbf34848be2240acf181b4d5f1f42d2 Mon Sep 17 00:00:00 2001 From: Matthieu Sozeau Date: Sat, 27 Sep 2014 16:08:02 +0200 Subject: Add a boolean to indicate the unfolding state of a primitive projection, so as to reproduce correctly the reduction behavior of existing projections, i.e. delta + iota. Make [projection] an abstract datatype in Names.ml, most of the patch is about using that abstraction. Fix unification.ml which tried canonical projections too early in presence of primitive projections. --- pretyping/nativenorm.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'pretyping/nativenorm.ml') diff --git a/pretyping/nativenorm.ml b/pretyping/nativenorm.ml index 829fa106c..60db95e25 100644 --- a/pretyping/nativenorm.ml +++ b/pretyping/nativenorm.ml @@ -268,7 +268,7 @@ and nf_atom env atom = | Aevar (ev,_) -> mkEvar ev | Aproj(p,c) -> let c = nf_accu env c in - mkProj(p,c) + mkProj(Projection.make p false,c) | _ -> fst (nf_atom_type env atom) and nf_atom_type env atom = @@ -342,7 +342,7 @@ and nf_atom_type env atom = | Aproj(p,c) -> let c,tc = nf_accu_type env c in let cj = make_judge c tc in - let uj = Typeops.judge_of_projection env p cj in + let uj = Typeops.judge_of_projection env (Projection.make p true) cj in uj.uj_val, uj.uj_type -- cgit v1.2.3