X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fnum.ml;h=dda88a78fe8ddd34253ca7e5f0fe33a36837b327;hb=ae918f36c193172ce5316abeadf19cdaaec2cde2;hp=66bdd8598f0d3ced253a46bce4d66ac2088080bd;hpb=9ad3734756bdab9ea23884a7bddbfaa599dbd3ae;p=fireball-separation.git

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 66bdd85..dda88a7 100644
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -92,14 +92,23 @@ let free_vars = (List.map fst) ++ free_vars';;
 module ToScott =
 struct
 
+let delta = let open Pure in L(A(V 0, V 0))
+
+let bomb = ref(`Var(-1, -666));;
+
 let rec t_of_i_num_var =
  function
   | `N n -> Scott.mk_n n
-  | `Var(v,_) -> Pure.V v
+  | `Var(v,_) as x -> assert (x <> !bomb); Pure.V v
   | `Match(t,_,liftno,bs,args) ->
-      let bs = List.map (fun (n,t) -> n, t_of_nf (lift liftno t)) !bs in
+      let bs = List.map (
+        function (n,t) -> n,
+         (if t = !bomb then delta
+          else Pure.L (t_of_nf (lift (liftno+1) t)))
+        ) !bs in
       let t = t_of_i_num_var t in
       let m = Scott.mk_match t bs in
+      let m = Pure.A(m,delta) in
       List.fold_left (fun acc t -> Pure.A(acc,t_of_nf t)) m args
   | `I((v,_), args) -> Listx.fold_left (fun acc t -> Pure.A(acc,t_of_nf t)) (Pure.V v) args
 and t_of_nf =
@@ -114,11 +123,11 @@ end
 
 (* let rec string_of_term l  = fun _ -> "";; *)
 
-let rec string_of_term =
+let string_of_term =
  let boundvar x = "v" ^ string_of_int x in
  let varname lev l n =
   if n < lev then boundvar (lev-n-1)
-   else if n < List.length l then List.nth l (n-lev)
+   else if n - lev < List.length l then List.nth l (n-lev)
     else "`" ^ string_of_int (n-lev) in
  let rec string_of_term_w_pars lev l  = function
   | `Var(n,ar) -> varname lev l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "")
@@ -139,7 +148,8 @@ let rec string_of_term =
  and string_of_term_no_pars lev l = function
   | `Lam _ as t -> string_of_term_no_pars_lam lev l t
   | #nf as t -> string_of_term_no_pars_app lev l t
- in string_of_term_no_pars 0
+ and string_of_term t = string_of_term_no_pars 0 t in
+ string_of_term
 ;;
 
 let print ?(l=[]) = string_of_term l;;