Improved parsing

- removed unused parse'
- fixed bug which was ignoring the first problems in some files

(cherry picked from commit 2d56686ea25883e77d0a69f1245e6e840fc8be5f)

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index abd4309f5fd591d5208109bcd82e0f2cd422d86a..1e69acb82328cd6d363dccdd728e86e1fb908a34 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -118,7 +118,7 @@ let parse x =
   | _, _, _ -> raise (ParsingError "???")\r
 ;;\r
 \r
-let var_zero = "ω";; (* w is an invalid variable name *)\r
+let var_zero = "Z";; (* the name for the zero *)\r
 \r
 let parse_many strs =\r
   let f (x, y) z = match read_smt y (explode z) with\r
@@ -129,83 +129,53 @@ let parse_many strs =
   in (List.rev tms, free)\r
 ;;\r
 \r
-(**********************************************************************\r
-\r
-let rec string_of_term = function\r
-  | Tvar n -> string_of_int n\r
-  | Tapp(t1, t2) -> "(" ^ string_of_term t1 ^ " " ^ string_of_term t2 ^ ")"\r
-  | Tlam(t1) -> "(\\" ^ string_of_term t1 ^ ")"\r
-;;\r
-\r
-let _ = prerr_endline (">>>" ^ string_of_term (parse "(\\x. x y z z1 k) z1 z j"));;\r
-\r
-\r
-**********************************************************************)\r
-\r
- let parse' strs =\r
-   let (tms, free) = parse_many strs in\r
-   (* Replace pacmans and bottoms *)\r
-   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 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
-   | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> aux lev t) args)\r
-   | `Var(n,_) -> fix lev n\r
-   | `Lam(_,t) -> `Lam (true, aux (lev+1) t)\r
-   | `Match _ | `N _ -> assert false in\r
- List.map (aux 0) (tms :> Num.nf list), free\r
-;;\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 head, lines = List.hd lines, List.tl lines in\r
+ let name = String.trim (String.sub head 1 (String.length head - 1)) 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 aux (last, div, conv, ps) line =\r
   let chr = String.sub line 0 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
+  if line = "" then chr, div, conv, ps else\r
   let rec aux' chr line =\r
    if chr = "#"\r
-    then chr, name, div, conv, ps\r
-   else if chr = "$"\r
-    then "#", line, div, conv, ps\r
+    then chr, div, conv, ps\r
    else if chr = "D"\r
-    then chr, name, line, conv, ps\r
+    then chr, line, conv, ps\r
    else if chr = "C"\r
-    then chr, name, div, line::conv, ps\r
+    then chr, div, line::conv, ps\r
    else if chr = "N"\r
-    then chr, name, div, conv, line::ps\r
+    then chr, div, conv, line::ps\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 ("#", "no label", "", [], []) lines in\r
+ let _, div, conv, ps = List.fold_left aux ("#", "", [], []) 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
+ if List.length ps = 0 && List.length conv = 0\r
   then raise (ParsingError "empty problem");\r
 \r
  (* parse' *)\r
  let (tms, free) = parse_many strs in\r
+ 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 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 if v = lev then `Var(v, min_int) (* 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
  | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> aux lev t) args)\r
- | `Var(n,_) -> `Var(n,1)\r
+ | `Var(n,_) -> fix lev n\r
  | `Lam(_,t) -> `Lam (true, aux (lev+1) t)\r
  | `Match _ | `N _ -> assert false in\r
 let all_tms = List.map (aux 0) (tms :> Num.nf list) in\r
@@ -234,7 +204,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

diff --git a/ocaml/parser.mli b/ocaml/parser.mli
index 47cfb28aaee6f814d43d319c99e754a68e2b0256..d131edbf79b65b46315d19510ec9e96583b9f58e 100644 (file)
--- a/ocaml/parser.mli
+++ b/ocaml/parser.mli
@@ -1,6 +1,5 @@
 exception ParsingError of string\r
 \r
-val parse': string list -> Num.nf list * string list\r
 val problem_of_string:\r
  string ->\r
   string (* problem label *)\r

diff --git a/ocaml/problems/w b/ocaml/problems/w
index d55e1b83dd9efe6b49811244731e37cce8d3eef5..c603cfb13cbfe0b421ea9a1d86c47083e32ad8b3 100644 (file)
--- a/ocaml/problems/w
+++ b/ocaml/problems/w
@@ -70,6 +70,7 @@ N c (k. l. l b k) (k. l. d) (e f (k. k) (g e)) (k. l. m. n. n b m) (k. b (b (k e
 \r
 $! new failing problem\r
 # it is backtracking, but it shouldn't\r
+# why? well, D occurs in some C's\r
 D (a b)\r
 C ((((((((a (v (y. y))) (v c)) ((x ((a (v (y. y))) (v c))) y)) (((a (v (y. y))) (((v c) ((((z z) b) (c. a)) (w (c. (v c))))) (w. (v. (z. (v (y. y))))))) (((v (x. (v c))) (v (x. (v c)))) (((((z z) b) (c. a)) (z z)) (b c))))) (a. ((((z z) b)(c. a)) (z z)))) (y. (z z))) (((a (v (y. y))) w) (z. x))) (w. (z. (v (y. y)))))\r
 C ((((((((z z) b) (c. a)) (z z)) ((v (y. y)) a)) (v (y. y))) ((((a (v (y. y))) (v c)) (z z)) ((a (v (y. y))) (((v c) ((((z z) b) (c. a)) (w (c. (v c))))) (w. (v. (z. (v (y. y))))))))) (z. ((v (y. y)) a)))\r