Logging options to display measure of single terms in string_of_problem

[fireball-separation.git] / ocaml / num.ml

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 7e5248258253b2cbff117aca792e2bd54da1c4fd..aa9338c4c8d2d777fa45c5d0b74a85c376032dc7 100644 (file)
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -250,11 +250,14 @@ and subst truelam delift_by_one what (with_what : nf(*_nob*)) (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 = aux_i_num_var l t in
        mk_match body v bs_lift bs (List.map (aux l) (args :> nf list))
  and aux l(*lift*) =
@@ -292,8 +295,8 @@ let eta_compare x y =
   | `Pacman, `Pacman -> 0
   | `Lam _, `N _ -> -1
   | `N _, `Lam _ -> 1
-  | `Bottom, `Lam _
-  | `Lam _, `Bottom -> assert false (* TO BE UNDERSTOOD *)
+  | `Bottom, `Lam(_,t) -> -1
+  | `Lam(_,t), `Bottom ->  1
   | `Lam(_,t1), `Lam(_,t2) -> aux t1 t2
   | `Lam(_,t1), t2 -> - aux t1 (mk_app (lift 1 t2) (`Var(0,-666)))
   | t2, `Lam(_,t1) ->   aux t1 (mk_app (lift 1 t2) (`Var(0,-666)))