From 4627d2b89b5a96e09b1921e033a5c1d7dd50dbc6 Mon Sep 17 00:00:00 2001 From: acondolu Date: Wed, 12 Jul 2017 23:28:46 +0200 Subject: [PATCH] Fixes to printing --- ocaml/lambda4.ml | 10 +++++----- ocaml/num.ml | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml index db743ff..583d99e 100644 --- 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 443dcdc..93115a5 100644 --- 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" -- 2.39.2