X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fnum.ml;h=c88a101312b3b4d1a0db272d11081bc05be1d228;hb=7051416c234181eaf79dedfd18005cdf0a3e0863;hp=1b121efaec576a8cbd0c2ee6b3769af3902ba964;hpb=d0d409e139db96fc72f7d1e31a2526776c56f691;p=fireball-separation.git

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 1b121ef..c88a101 100644
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -118,31 +118,36 @@ end
 
 (* let rec string_of_term l  = fun _ -> "";; *)
 
-let rec string_of_term l  =
- let rec string_of_term_w_pars l  = function
-  | `Var(n,ar) -> List.nth l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "")
+let rec 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 "`" ^ 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 "")
   | `N n -> string_of_int n
-  | `I _ as t -> "(" ^ string_of_term_no_pars_app l t ^ ")"
+  | `I _ as t -> "(" ^ string_of_term_no_pars_app lev l t ^ ")"
   | `Lam(_,`Bottom) -> "BOMB"
-  | `Lam _ as t -> "(" ^ string_of_term_no_pars_lam l t ^ ")"
+  | `Lam _ as t -> "(" ^ string_of_term_no_pars_lam lev l t ^ ")"
   | `Match(t,(v,ar),bs_lift,bs,args) ->
-     "["^ List.nth l v ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^",match " ^ string_of_term_no_pars l (t :> nf) ^
-     " with " ^ String.concat " | " (List.map (fun (n,t) -> string_of_int n ^ " => " ^ string_of_term l (lift bs_lift (t :> nf))) !bs) ^ "] " ^
+      (* 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) ^
+     " 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"
   | `Pacman -> "PAC"
- and string_of_term_no_pars_app l  = function
-  | `I((n,ar), args) -> List.nth l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "") ^ " " ^ String.concat " " (List.map (string_of_term_w_pars l) (Listx.to_list args :> nf list))
-  | #nf as t -> string_of_term_w_pars l t
- and string_of_term_no_pars_lam l  = function
+ and string_of_term_no_pars_app lev l  = function
+  | `I((n,ar), args) -> varname lev l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "") ^ " " ^ String.concat " " (List.map (string_of_term_w_pars lev l) (Listx.to_list args :> nf list))
+  | #nf as t -> string_of_term_w_pars lev l t
+ and string_of_term_no_pars_lam lev l  = function
   | `Lam(_,`Bottom) -> "BOMB"
-  | `Lam(_,t) -> let name = "x" ^ string_of_int (List.length l) in
-     "λ" ^ name ^ ". " ^ (string_of_term_no_pars_lam (name::l) t)
-  | _ as t -> string_of_term_no_pars l t
- and string_of_term_no_pars l  = function
-  | `Lam _ as t -> string_of_term_no_pars_lam l t
-  | #nf as t -> string_of_term_no_pars_app l t
- in string_of_term_no_pars l
+  | `Lam(_,t) -> "λ" ^ boundvar lev ^ ". " ^ (string_of_term_no_pars_lam (lev+1) l t)
+  | _ as t -> string_of_term_no_pars lev l t
+ 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
 ;;
 
 let print ?(l=[]) = string_of_term l;;