Added label to problem

(cherry picked from commit c7e39970b94c93db45f2629af3fdb1e08371eca1)

diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml
index a8899bcbebc2bb31d20b14b6834c94eb449e50fb..1e978f281336137234264b00068e869fa43ade8d 100644 (file)
--- a/ocaml/lambda4.ml
+++ b/ocaml/lambda4.ml
@@ -31,6 +31,8 @@ type problem =
  ; var_names : string list (* names of the original free variables *)
 };;
 
+let label_of_problem {label} = label;;
+
 let all_terms p =
  (match p.div with None -> [] | Some t -> [(t :> i_n_var)])
  @ p.conv
@@ -67,7 +69,7 @@ let string_of_measure = string_of_int;;
 
 let string_of_problem label ({freshno; div; conv; ps; deltas} as p) =
  Console.print_hline ();
- prerr_string ("\n(* DISPLAY PROBLEM (" ^ label ^ ") - ");
+ prerr_string ("\n(* DISPLAY PROBLEM (" ^ p.label ^ " - " ^ label ^ ") ");
  let nl = "\n" in
  let deltas = String.concat (nl^"   ") (List.map (fun r -> String.concat " <> " (List.map (fun (i,_) -> string_of_int i) !r)) deltas) in
  let l = Array.to_list (Array.init (freshno + 1) string_of_var) in

diff --git a/ocaml/lambda4.mli b/ocaml/lambda4.mli
index af249e34972fb5cfa028dad87af48590757d5062..c8a40bfa8c719694f0796ec429c13943ac3cf200 100644 (file)
--- a/ocaml/lambda4.mli
+++ b/ocaml/lambda4.mli
@@ -1,5 +1,7 @@
 type problem\r
 \r
+val label_of_problem : problem -> string\r
+\r
 type result = [\r
  | `Separable of (int * Num.nf) list\r
  | `Unseparable of string\r