Fixes to parser

(cherry picked from commit 666a228779e465d08a0deea2e35c0cccf5722b40)

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index e410d751fc5ed0d2e007fcb4e54b2e3d5255644e..27323229035957d99b78200cd93325a535a77185 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -166,12 +166,12 @@ let _ = prerr_endline (">>>" ^ string_of_term (parse "(\\x. x y z z1 k) z1 z j")
 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.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 (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
+  let line = String.trim (String.sub line 1 (String.length line - 1)) in\r
   if line = "" then chr, name, div, conv, ps else\r
   let rec aux' chr line =\r
    if chr = "#"\r
@@ -184,15 +184,19 @@ prerr_endline (s);
     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
+   else if chr = " "\r
+    then aux' last line\r
+   else raise (ParsingError\r
+     ("Unexpected at beginning of problem: `" ^ chr ^ "` " ^ line)) in\r
   aux' chr line in\r
- let _, name, div, conv, ps = List.fold_left aux ("#", "?", "", [], []) lines in\r
+ let _, name, div, conv, ps = List.fold_left aux ("#", "no label", "", [], []) lines in\r
  let div_provided = div <> "" in\r
  let div = if div_provided then div else "xxxxxx" in\r
  let strs = [div] @ ps @ conv in\r
 \r
+ if strs = ["BOT"]\r
+  then raise (ParsingError "empty problem");\r
+\r
  (* parse' *)\r
  let (tms, free) = parse_many strs in\r
  (* Fix arity *)\r
@@ -228,7 +232,7 @@ let ps = List.map (
 \r
 \r
 let from_file path =\r
- let lines = ref [] in\r
+ let lines = ref [""] in\r
  let chan = open_in path in\r
  let _ = try\r
   while true; do\r
@@ -237,6 +241,6 @@ let from_file path =
  with End_of_file ->\r
   close_in chan in\r
  let txt = String.concat "\n" (List.rev !lines) in\r
- let problems = Str.split (Str.regexp "\n\\$") txt in\r
+ let problems = Str.split (Str.regexp "[\n\r\x0c\t]+\\$") txt in\r
  List.map problem_of_string (List.tl (List.map ((^) "$") problems))\r
 ;;\r

diff --git a/ocaml/problems.ml b/ocaml/problems.ml
index cd57451a70230816031c6264b75c7c16ab9f3dfe..cb4218c49068a8f29a0331c4bedcadbaf5f41f03 100644 (file)
--- a/ocaml/problems.ml
+++ b/ocaml/problems.ml
@@ -1,6 +1,22 @@
 open Lambda4;;
 open Util;;
 
+(* Syntax for problem files in problem/ folder:
+
+- dollar ($) on newline
+  begin new problem
+  $! means that the problem is expected to be separable,
+  $? means that it is expected to be unseparable
+
+- (#) on new line
+  comment line
+
+- (D) (C) (N) stand respectively for divergent, convergent, numeric
+
+- lines starting with spaces inherit the type from the last line
+
+*)
+
 let assert_separable x =
  match solve x with
  | `Separable _ -> ()

diff --git a/ocaml/problems/p b/ocaml/problems/p
index 6f1e0622cf6c636630114c87d6a9d3ac02969944..a2155a6d2a79c617fbffde7c94ccd3a69d742215 100644 (file)
--- a/ocaml/problems/p
+++ b/ocaml/problems/p
@@ -1,3 +1,4 @@
+\r
 $! p2\r
 N x y\r
   x z\r