From 6d3ee54fd076f61ced0eabb0f5f31f519b186931 Mon Sep 17 00:00:00 2001 From: acondolu Date: Sun, 23 Jul 2017 09:59:00 +0200 Subject: [PATCH] Revert subst in branches of matches Actually, it could be moved in susbt_in_problem, hence doing it only once (on the deltas), instead of replacing multiple times like now (useless). (cherry picked from commit bd3a8ee424e495ab4003f6d4cb88579f29e3bc3a) --- ocaml/num.ml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/ocaml/num.ml b/ocaml/num.ml index 66e8a2d..56ae90a 100644 --- a/ocaml/num.ml +++ b/ocaml/num.ml @@ -230,13 +230,16 @@ and subst truelam delift_by_one what (with_what : nf) (where : nf) = | `N _ as x -> x | `Match(t,v,bs_lift,bs,args) -> let bs_lift = bs_lift + if delift_by_one then -1 else 0 in - (* let l' = l - bs_lift in *) - (* let with_what' = lift l' (with_what :> nf) in *) + (* Warning! It now applies again the substitution in branches of matches. + But careful, it does it many times, for every occurrence of + the match. This is okay because what does not occur in with_what. *) + let l' = l - bs_lift in + let with_what' = lift l' (with_what :> nf) in (* The following line should be the identity when delift_by_one = true because we are assuming the ts to not contain lambda-bound variables. *) - (* bs := List.map (fun (n,t) -> n,subst truelam false what with_what' t) !bs ; *) + bs := List.map (fun (n,t) -> n,subst truelam false what with_what' t) !bs ; let body = cast_to_i_num_var (aux_i_num_var l t) in - mk_match body v bs_lift bs (List.map (aux l) args) + mk_match body v bs_lift bs (List.map (aux l) (args :> nf list)) and aux l(*lift*) = (*function iii -> let res = match iii with*) function -- 2.39.2