X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fnum.ml;h=aa9338c4c8d2d777fa45c5d0b74a85c376032dc7;hb=704fd9d9db0c01619264527d4174afe74bdff53d;hp=4e44c79731ec475477082a9418791329fb6a2176;hpb=8a90160900bb95133b8e204a4fcadaa2db2f11dd;p=fireball-separation.git

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 4e44c79..aa9338c 100644
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -132,7 +132,7 @@ let rec string_of_term =
   | `Lam _ as t -> "(" ^ string_of_term_no_pars_lam lev l t ^ ")"
   | `Match(t,(v,ar),bs_lift,bs,args) ->
       (* assert (bs_lift = lev); *)
-     "["^ varname lev l v ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^",match " ^ string_of_term_no_pars lev l (t :> nf) ^
+     "(["^ varname lev l v ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^",match " ^ string_of_term_no_pars lev l (t :> nf) ^
      " with " ^ String.concat " | " (List.map (fun (n,t) -> string_of_int n ^ " => " ^ string_of_term l (t :> nf)) !bs) ^ "] " ^
      String.concat " " (List.map (string_of_term l) (args :> nf list)) ^ ")"
   | `Bottom -> "BOT"
@@ -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)))