problems now contain a label and the names of the original free variables

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

diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml
index 0db3c16707994d8f45ba925758da2c14ee0169a0..4108ea57af1773e71c84ff8e25861f82a73e43f7 100644 (file)
--- a/ocaml/lambda4.ml
+++ b/ocaml/lambda4.ml
@@ -27,6 +27,8 @@ type problem =
  ; sigma: (int * nf) list (* the computed substitution *)
  ; deltas: (int * nf) list ref list (* collection of all branches *)
  ; initialSpecialK: int
+ ; label : string
+ ; var_names : string list (* names of the original free variables *)
 };;
 
 let all_terms p =
@@ -747,7 +749,7 @@ let append_zero =
   | `N _ -> raise (Parser.ParsingError " numbers in ps")
 ;;
 
-let problem_of_2 (label, div, conv, nums, var_names) =
+let tmp (label, div, conv, nums, var_names) =
  (* DA SPOSTARE NEI TEST: *)
  let ps = List.map append_zero nums in (* crea lista applicando zeri o dummies *)
  let ps = sort_uniq ~compare:eta_compare (ps :> nf list) in
@@ -762,7 +764,7 @@ let problem_of_2 (label, div, conv, nums, var_names) =
  let deltas =
   let dummy = `Var (max_int / 2, -666) in
    [ ref (Array.to_list (Array.init (List.length ps) (fun i -> i, dummy))) ] in
- {freshno; div; conv; ps; sigma=[] ; deltas; initialSpecialK=special_k}
+ {freshno; div; conv; ps; sigma=[]; deltas; initialSpecialK=special_k; var_names; label}
 ;;
 
 let problem_of ~div ~conv ~nums =
@@ -788,10 +790,5 @@ let problem_of ~div ~conv ~nums =
    | #i_n_var as y -> y
    | _ -> raise (Parser.ParsingError "A term in num is not i_n_var")
   ) ps in
- problem_of_2("missing label", div, conv, ps, var_names)
-;;
-
-let problem_of_string_tmp s =
- let x = Parser.problem_of_string s in
- problem_of_2  x
+ tmp("missing label", div, conv, ps, var_names)
 ;;