From aee2672094ae2dc02d7bbafd566b279e3c1c53f5 Mon Sep 17 00:00:00 2001 From: acondolu Date: Sun, 16 Jul 2017 16:01:21 +0200 Subject: [PATCH] subst does not replace anymore in branches of maches It was unnecessary: a match cannot expand to a previous branch (cherry picked from commit 8a90160900bb95133b8e204a4fcadaa2db2f11dd) --- ocaml/num.ml | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ocaml/num.ml b/ocaml/num.ml index 69c87e0..4f3c575 100644 --- a/ocaml/num.ml +++ b/ocaml/num.ml @@ -230,12 +230,13 @@ 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 in + (* 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 ; - mk_match (cast_to_i_num_var (aux_i_num_var l t)) v bs_lift bs (List.map (aux l) args) + (* 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) and aux l(*lift*) = (*function iii -> let res = match iii with*) function -- 2.39.2