Prettier-printing: string_of_problem outputs OCaml code

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

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 3e198642b6914d119ff58849b714901f0179ca2f..57cb19d068dee18d7df1cc070bc99cf448513e38 100644 (file)
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -2,6 +2,9 @@ open Util
 open Util.Vars
 open Pure
 
+(* debug options *)
+let debug_display_arities = false;;
+
 (************ Syntax ************************************)
 
 (* Normal forms*)
@@ -118,22 +121,24 @@ end
 
 let rec string_of_term l  =
  let rec string_of_term_w_pars l  = function
-  | `Var(n,ar) -> print_name l n ^ ":" ^ string_of_int ar
+  | `Var(n,ar) -> print_name 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 ^ ")"
+  | `Lam(_,`Bottom) -> "BOMB"
   | `Lam _ as t -> "(" ^ string_of_term_no_pars_lam l t ^ ")"
   | `Match(t,(v,ar),bs_lift,bs,args) ->
-     "[match("^ string_of_var v ^":"^ string_of_int ar ^") " ^ string_of_term_no_pars l (t :> nf) ^
+     "[match_"^ string_of_var v ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^"_ " ^ 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) ^ "] " ^
      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) -> print_name l n  ^ ":" ^ string_of_int ar ^ " " ^ String.concat " " (List.map (string_of_term_w_pars l) (Listx.to_list args :> nf list))
+  | `I((n,ar), args) -> print_name 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
+  | `Lam(_,`Bottom) -> "BOMB"
   | `Lam(_,t) -> let name = string_of_var (List.length l) in
-   "λ" ^ name ^ ". " ^ (string_of_term_no_pars_lam (name::l) t)
+     "λ" ^ 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
@@ -270,10 +275,12 @@ let parse' strs =
   (* Replace pacmans and bottoms *)
   let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in
   let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in
+  let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in
   let fix lev v =
    if v = lev + n_bot then `Bottom
     else if v = lev + n_pac then `Pacman
-     else `Var(v,1) in (* 1 by default when variable not applied *)
+     else if v = lev + n_bomb then `Lam(true, `Bottom)
+      else `Var(v,1) in (* 1 by default when variable not applied *)
   (* Fix arity *)
   let rec aux lev = function
    | Parser.Lam t -> `Lam (true, aux (lev+1) t)