let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in\r
let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in\r
let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in\r
+ let n_z = try Util.index_of "Z" free with Not_found -> min_int in\r
let fix lev v =\r
if v = lev + n_bot then failwith "Example with `Bottom"\r
else if v = lev + n_pac then failwith "Example with `Pacman"\r
else if v = lev + n_bomb then failwith "Example with `Bomb"\r
- else `Var(v,1) in (* 1 by default when variable not applied *)\r
+ else if v = lev + n_z then `Var(lev, 0) (* FIXME why zero? *)\r
+ else `Var(v,1) in (* 1 by default when variable not applied *)\r
(* Fix arity *)\r
let open Num in\r
let rec aux lev : nf -> nf = function\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.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
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
\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
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]+\\$") txt in\r
List.map problem_of_string (List.tl (List.map ((^) "$") problems))\r
;;\r