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

(cherry picked from commit 15c305b0d106b39616bdeea9aec9febc7539c2c1)

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)
 ;;

diff --git a/ocaml/lambda4.mli b/ocaml/lambda4.mli
index 4af50606788f0f79e8f54b9b6742fc2e2ef35b0c..af249e34972fb5cfa028dad87af48590757d5062 100644 (file)
--- a/ocaml/lambda4.mli
+++ b/ocaml/lambda4.mli
@@ -7,5 +7,9 @@ type result = [
 \r
 val problem_of: div:(string option) -> conv:string list -> nums:string list -> problem\r
 (* the following will soon replace the one above *)\r
-val problem_of_string_tmp: string -> problem\r
+val tmp: (string (* problem label *)\r
+* Num.i_var option (* div *)\r
+* Num.i_n_var list (* conv *)\r
+* Num.i_n_var list (* ps *)\r
+* string list (* names of free variables *)) -> problem\r
 val solve: problem -> result\r

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 47c50d486538a72d48a5d924d0e9dd8ec6404d79..9e0e809c36b83feadef56ea275abaa7d113df55c 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -164,22 +164,29 @@ let _ = prerr_endline (">>>" ^ string_of_term (parse "(\\x. x y z z1 k) z1 z j")
 ;;\r
 \r
 let problem_of_string s =\r
+prerr_endline (s);\r
  let lines = Str.split (Str.regexp "[\n\r\x0c\t;]+") s in\r
+ let lines = List.map String.trim lines in\r
  let lines = List.filter ((<>) "") lines in\r
  prerr_endline("number of lines" ^ string_of_int (List.length lines));\r
- let aux (name, div, conv, ps) line =\r
+ let aux (last, name, div, conv, ps) line =\r
   let chr = String.sub line 0 1 in\r
   let line = String.sub line 1 (String.length line - 1) in\r
-  if chr = ":"\r
-   then line, div, conv, ps\r
-  else if chr = "D"\r
-   then name, line, conv, ps\r
-  else if chr = "C"\r
-   then name, div, line::conv, ps\r
-  else if chr = "N"\r
-   then name, div, conv, line::ps\r
-  else raise (ParsingError ("Unexpected at beginning of line: " ^ chr)) in\r
- let name, div, conv, ps = List.fold_left aux ("?", "", [], []) lines in\r
+  if line = "" then chr, name, div, conv, ps else\r
+  let rec aux' chr line =\r
+   if chr = "#"\r
+    then chr, line, div, conv, ps\r
+   else if chr = "D"\r
+    then chr, name, line, conv, ps\r
+   else if chr = "C"\r
+    then chr, name, div, line::conv, ps\r
+   else if chr = "N"\r
+    then chr, name, div, conv, line::ps\r
+   else if last = ""\r
+    then raise (ParsingError ("Unexpected at beginning of problem: " ^ chr))\r
+   else aux' last (chr ^ line) in\r
+  aux' chr line in\r
+ let _, name, div, conv, ps = List.fold_left aux ("#", "?", "", [], []) lines in\r
  let div_provided = div <> "" in\r
  let div = if div_provided then div else "BOT" in\r
  let strs = [div] @ ps @ conv in\r
@@ -221,8 +228,7 @@ let conv = Util.filter_map (
 let ps = List.map (\r
  function\r
   | #i_n_var as y -> y\r
-  | _ -> raise (ParsingError "A term in num is not i_n_var")\r
+  | _ as y -> raise (ParsingError ("A term in num is not i_n_var" ^ Num.string_of_nf y))\r
  ) ps in\r
-\r
  name, div, conv, ps, free\r
 ;;\r