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

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

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