Simplified arity_of, precompute_edible_data, critical_showsteppers

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

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 69c87e046c9ab64093579be1868d8083419b30c6..66e8a2df7ccb6ebd3e3cf98f741b043d910c5bbe 100644 (file)
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -127,7 +127,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)) ^ ")"
  and string_of_term_no_pars_app lev l  = function
@@ -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