X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ocaml%2Fparser.ml;h=1e69acb82328cd6d363dccdd728e86e1fb908a34;hb=3f5fd50fbe0c585e1d9aad84007fdbd82c573fa7;hp=90cda05bd2313d661d51c009919eccdf9c1407cd;hpb=65e597bdbc2ba91e8199642dc56fd2a2b1fc127a;p=fireball-separation.git

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 90cda05..1e69acb 100644
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -1,30 +1,19 @@
-type term =
-  | Var of int
-  | App of term * term
-  | Lam of term
-;;
-
-let mk_app x y = App(x, y);;
-let mk_lam x = Lam x;;
-let mk_var x = Var x;;
-
 exception ParsingError of string;;
 
+let mk_app x y = Num.mk_app x y;;
+let mk_lam x = `Lam(true, x);;
+let mk_var x = `Var(x, -666);;
+
 let isAlphaNum c = let n = Char.code c in
  (48 <= n && n <= 90) || (95 <= n && n <= 122) ;;
 let isSpace c = c = ' ' || c = '\n' || c = '\t' ;;
 
-let rec index_of x =
-  function
-  | [] -> raise (Failure "index_of: Not Found")
-  | h::t -> if x = h then 0 else 1 + index_of x t
-;;
 (* FIXME *)
 let mk_var' (bound, free) x =
   if List.mem x bound
-  then free, mk_var (index_of x bound)
+  then free, mk_var (Util.index_of x bound)
   else if List.mem x free
-       then free, mk_var (List.length bound + index_of x free)
+       then free, mk_var (List.length bound + Util.index_of x free)
        else (free @ [x]), mk_var (List.length bound + List.length free)
 ;;
 
@@ -129,7 +118,7 @@ let parse x =
   | _, _, _ -> raise (ParsingError "???")
 ;;
 
-let var_zero = "ω";; (* w is an invalid variable name *)
+let var_zero = "Z";; (* the name for the zero *)
 
 let parse_many strs =
   let f (x, y) z = match read_smt y (explode z) with
@@ -140,15 +129,90 @@ let parse_many 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 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 "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
+ 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 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)
+ | `Var(n,_) -> fix lev n
+ | `Lam(_,t) -> `Lam (true, aux (lev+1) t)
+ | `Match _ | `N _ -> 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
+ 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 _ = prerr_endline (">>>" ^ string_of_term (parse "(\\x. x y z z1 k) z1 z j"));;
 
-
-**********************************************************************)
+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))
+;;