Fixes to printing

diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml
index db743ffebb4df474e6b4a4ef91d5209efac7a9a4..583d99eb89ca9f77777cd6a653f0cda135f61d95 100644 (file)
--- a/ocaml/lambda4.ml
+++ b/ocaml/lambda4.ml
@@ -75,11 +75,11 @@ let string_of_problem label ({freshno; div; conv; ps; deltas} as p) =
  let l = Array.to_list (Array.init (freshno + 1) string_of_var) in
  "measure="^string_of_measure(problem_measure p) (* ^ " freshno = " ^ string_of_int freshno*)
  ^ nl ^ "   Discriminating sets (deltas):"
- ^ nl ^ "   " ^ deltas ^ (if deltas = " " then "" else nl) ^ "*)" ^ nl
- ^"  (* DIVERGENT  *)" ^ nl
- ^"     "^ (match div with None -> "None" | Some div -> "(Some\""^ print ~l (div :> nf) ^"\" ") ^ nl
- ^"  (* CONVERGENT *) [" ^ nl
- ^ String.concat "\n   " (List.map (fun t -> "(* _: *) " ^ (if t = `N (-1) then "" else "\""^ print ~l (t :> nf) ^"\";")) conv) ^
+ ^ nl ^ "   " ^ deltas ^ (if deltas = " " then "" else nl) ^ "*)"
+ ^"(* DIVERGENT  *)" ^ nl
+ ^"     "^ (match div with None -> "None" | Some div -> "(Some\""^ print ~l (div :> nf) ^"\")") ^ nl
+ ^"  (* CONVERGENT *) [" ^ nl ^ "  "
+ ^ String.concat "\n  " (List.map (fun t -> "(* _ *) " ^ (if t = `N (-1) then "" else "\""^ print ~l (t :> nf) ^"\";")) conv) ^
  (if conv = [] then "" else nl)
  ^ "] (* NUMERIC    *) [" ^ nl ^ " "
  ^ String.concat "\n " (List.mapi (fun i t -> " (* "^ string_of_int i ^" *) \"" ^ print ~l (t :> nf) ^ "\";") ps)

diff --git a/ocaml/num.ml b/ocaml/num.ml
index 443dcdc0272c75fd4806ca18d255e413e008c502..93115a539975b5b6402fd3df1d2328f7ab29c3e0 100644 (file)
--- a/ocaml/num.ml
+++ b/ocaml/num.ml
@@ -126,7 +126,7 @@ let rec string_of_term l  =
   | `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 ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^"_ " ^ string_of_term_no_pars l (t :> nf) ^
+     "["^ string_of_var 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) ^ "] " ^
      String.concat " " (List.map (string_of_term l) (args :> nf list)) ^ ")"
   | `Bottom -> "BOT"