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. --- dev/top_printers.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'dev') diff --git a/dev/top_printers.ml b/dev/top_printers.ml index 6bf2949677..2cbac21753 100644 --- a/dev/top_printers.ml +++ b/dev/top_printers.ml @@ -239,7 +239,7 @@ let constr_display csr = | Construct (((sp,i),j),u) -> "MutConstruct(("^(string_of_mind sp)^","^(string_of_int i)^")," ^","^(universes_display u)^(string_of_int j)^")" - | Proj (p, c) -> "Proj("^(string_of_con p)^","^term_display c ^")" + | Proj (p, c) -> "Proj("^(string_of_con (Projection.constant p))^","^term_display c ^")" | Case (ci,p,c,bl) -> "MutCase(,"^(term_display p)^","^(term_display c)^"," ^(array_display bl)^")" @@ -328,7 +328,7 @@ let print_pure_constr csr = print_string ","; universes_display u; print_string ")" | Proj (p,c') -> print_string "Proj("; - sp_con_display p; + sp_con_display (Projection.constant p); print_string ","; box_display c'; print_string ")" -- cgit v1.2.3