X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fparser.ml;h=6bcb70d909fd0b6117292aa2cdcb3b9a7d88da0f;hb=5682bf463b89edb7756020fe7b838eb846d6c771;hp=d7a1b36d31d3dd30d0f8d63f8f2182ff93f22a0d;hpb=123d64bb5ae7127f6a51cbf44b63341de001a187;p=fireball-separation.git

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index d7a1b36..6bcb70d 100644
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -29,10 +29,10 @@ let explode s =
 ;;
 
 let implode l =
-  let res = String.create (List.length l) in
+  let res = Bytes.create (List.length l) in
   let rec aux i = function
     | [] -> res
-    | c :: l -> res.[i] <- c; aux (i + 1) l in
+    | c :: l -> Bytes.set res i c; aux (i + 1) l in
   aux 0 l
 ;;
 
@@ -118,13 +118,11 @@ 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)
 ;;
@@ -140,34 +138,100 @@ let rec string_of_term = function
 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 `Bottom
-     else if v = lev + n_pac then `Pacman
-      else if v = lev + n_bomb then `Lam(true, `Bottom)
-       else `Var(v,1) in (* 1 by default when variable not applied *)
-   (* Fix arity *)
-   let open Num in
-   let exclude_bottom = function
-   | #nf_nob as t -> t
-   | `Bottom -> raise (ParsingError "Input term not in normal form") in
-   let rec aux_nob lev : nf_nob -> nf = function
-   | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> exclude_bottom (aux_nob lev t)) args)
-   | `Var(n,_) -> fix lev n
-   | `Lam(_,t) -> `Lam (true, aux (lev+1) t)
-   | `Match _ | `N _ -> assert false
-   | `Pacman -> assert false
-   and aux lev : Num.nf -> Num.nf = function
-    | #nf_nob as t -> aux_nob lev t
-    | `Bottom -> 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
+ let aux (last, div, conv, ps) line =
+  let chr = String.sub line 0 1 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 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 `Bottom
+   else if v = lev + n_pac then `Pacman
+    else if v = lev + n_bomb then `Lam(true, `Bottom)
+    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 exclude_bottom = function
+ | #nf_nob as t -> t
+ | `Bottom -> raise (ParsingError "Input term not in normal form") in
+ let rec aux_nob lev : nf_nob -> nf = function
+ | `I((n,_), args) -> `I((n,(if lev = 0 then 0 else 1) + Listx.length args), Listx.map (fun t -> exclude_bottom (aux_nob lev t)) args)
+ | `Var(n,_) -> fix lev n
+ | `Lam(_,t) -> `Lam (true, aux (lev+1) t)
+ | `Match _ | `N _ -> assert false
+ | `Pacman -> `Pacman
+ and aux lev : Num.nf -> Num.nf = function
+  | #nf_nob as t -> aux_nob lev t
+  | `Bottom -> assert false in
+let all_tms = List.map (aux 0) (tms :> Num.nf list) in
+
+(* problem_of *)
+let div, (ps, conv) = List.hd all_tms, Util.list_cut (List.length ps, List.tl all_tms) in
+
+let div = if not div_provided || div = `Bottom
+ then None
+ else match div with
+  | `I _ as t -> Some t
+  | _ -> raise (ParsingError "div is not an inert or BOT in the initial problem") in
+let conv = Util.filter_map (
+ function
+ | #i_n_var as t -> Some t
+ | `Lam _ -> None
+ | _ -> raise (ParsingError "A term in conv is not i_n_var")
+ ) conv in
+let ps = List.map (
+ function
+  | #i_n_var as y -> y
+  | _ 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 parse_problem s = failwith "TODO";
+
+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))
+;;