X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fparser.ml;h=79650955de2f5c5f7fa73606dee2e68a9613f73d;hb=4674dd787b5141c8aa22339d497ba671f4435da5;hp=47c50d486538a72d48a5d924d0e9dd8ec6404d79;hpb=1b3b3eb5c68d4b1ca28ef911b81e6757db080187;p=fireball-separation.git

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 47c50d4..7965095 100644
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -118,87 +118,61 @@ let parse x =
   | _, _, _ -> raise (ParsingError "???")
 ;;
 
-let var_zero = "ω";; (* w is an invalid variable name *)
-
 let parse_many strs =
   let f (x, y) z = match read_smt y (explode z) with
   | Some[tm], [], vars -> (tm :: x, vars)
   | _, _, _ -> raise (ParsingError "???")
-  in let aux = List.fold_left f ([], ([], [var_zero])) (* index zero is reserved *)
+  in let aux = List.fold_left f ([], ([], [])) (* index zero is reserved *)
   in let (tms, (_, free)) = aux strs
   in (List.rev tms, free)
 ;;
 
-(**********************************************************************
-
-let rec string_of_term = function
-  | Tvar n -> string_of_int n
-  | Tapp(t1, t2) -> "(" ^ string_of_term t1 ^ " " ^ string_of_term t2 ^ ")"
-  | Tlam(t1) -> "(\\" ^ string_of_term t1 ^ ")"
-;;
-
-let _ = prerr_endline (">>>" ^ string_of_term (parse "(\\x. x y z z1 k) z1 z j"));;
-
-
-**********************************************************************)
-
- let parse' strs =
-   let (tms, free) = parse_many strs in
-   (* Replace pacmans and bottoms *)
-   let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in
-   let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in
-   let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in
-   let fix lev v =
-    if v = lev + n_bot then failwith "Example with `Bottom"
-     else if v = lev + n_pac then failwith "Example with `Pacman"
-      else if v = lev + n_bomb then failwith "Example with `Bomb"
-       else `Var(v,1) in (* 1 by default when variable not applied *)
-   (* Fix arity *)
-   let open Num in
-   let rec aux lev : nf -> nf = function
-   | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> aux lev t) args)
-   | `Var(n,_) -> fix lev n
-   | `Lam(_,t) -> `Lam (true, aux (lev+1) t)
-   | `Match _ | `N _ -> assert false in
- List.map (aux 0) (tms :> Num.nf list), free
-;;
-
 let problem_of_string s =
  let lines = Str.split (Str.regexp "[\n\r\x0c\t;]+") s in
+ let head, lines = List.hd lines, List.tl lines in
+ let name = String.trim (String.sub head 1 (String.length head - 1)) in
  let lines = List.filter ((<>) "") lines in
- prerr_endline("number of lines" ^ string_of_int (List.length lines));
- let aux (name, div, conv, ps) line =
+ let aux (last, div, conv, ps) line =
   let chr = String.sub line 0 1 in
-  let line = String.sub line 1 (String.length line - 1) in
-  if chr = ":"
-   then line, div, conv, ps
-  else if chr = "D"
-   then name, line, conv, ps
-  else if chr = "C"
-   then name, div, line::conv, ps
-  else if chr = "N"
-   then name, div, conv, line::ps
-  else raise (ParsingError ("Unexpected at beginning of line: " ^ chr)) in
- let name, div, conv, ps = List.fold_left aux ("?", "", [], []) lines in
+  let line = String.trim (String.sub line 1 (String.length line - 1)) in
+  if line = "" then chr, div, conv, ps else
+  let rec aux' chr line =
+   if chr = "#"
+    then chr, div, conv, ps
+   else if chr = "D"
+    then chr, line, conv, ps
+   else if chr = "C"
+    then chr, div, line::conv, ps
+   else if chr = "N"
+    then chr, div, conv, line::ps
+   else if chr = " "
+    then aux' last line
+   else raise (ParsingError
+     ("Unexpected at beginning of problem: `" ^ chr ^ "` " ^ line)) in
+  aux' chr line in
+ let _, div, conv, ps = List.fold_left aux ("#", "", [], []) lines in
  let div_provided = div <> "" in
- let div = if div_provided then div else "BOT" in
+ let div = if div_provided then div else "xxxxxx" in
  let strs = [div] @ ps @ conv in
 
+ if List.length ps = 0 && List.length conv = 0
+  then raise (ParsingError "empty problem");
+
  (* parse' *)
  let (tms, free) = parse_many strs in
- (* Replace pacmans and bottoms *)
  let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in
  let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in
  let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in
  let fix lev v =
-  if v = lev + n_bot then assert false
-   else if v = lev + n_pac then assert false
-    else if v = lev + n_bomb then assert false
-     else `Var(v,1) in (* 1 by default when variable not applied *)
+ if v = lev + n_bot then failwith "Example with `Bottom"
+  else if v = lev + n_pac then failwith "Example with `Pacman"
+   else if v = lev + n_bomb then failwith "Example with `Bomb"
+    else if v = lev then `Var(v, min_int) (* zero *)
+      else `Var(v,1) in (* 1 by default when variable not applied *)
  (* Fix arity *)
  let open Num in
  let rec aux lev : nf -> nf = function
- | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> aux lev t) args)
+ | `I((n,_), args) -> `I((n,(if lev = 0 then 0 else 1) + Listx.length args), Listx.map (aux lev) args)
  | `Var(n,_) -> fix lev n
  | `Lam(_,t) -> `Lam (true, aux (lev+1) t)
  | `Match _ | `N _ -> assert false in
@@ -221,8 +195,22 @@ let conv = Util.filter_map (
 let ps = List.map (
  function
   | #i_n_var as y -> y
-  | _ -> raise (ParsingError "A term in num is not i_n_var")
+  | _ as y -> raise (ParsingError ("A term in num is not i_n_var" ^ Num.string_of_nf y))
  ) ps in
-
  name, div, conv, ps, free
 ;;
+
+
+let from_file path =
+ let lines = ref ["#"] in
+ let chan = open_in path in
+ let _ = try
+  while true; do
+    lines := input_line chan :: !lines
+  done
+ with End_of_file ->
+  close_in chan in
+ let txt = String.concat "\n" (List.rev !lines) in
+ let problems = Str.split (Str.regexp "[\n\r]+\\$") txt in
+ List.map problem_of_string (List.tl (List.map ((^) "$") problems))
+;;