X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=ocaml%2Fparser.ml;h=15c72bd7df1fdd139c0e9f6b2826d42257564ffa;hb=7051416c234181eaf79dedfd18005cdf0a3e0863;hp=726d076357f77539add48e69cdb04b9efb975367;hpb=71f8eb7befd85ff4911658136597b41ed177ff8c;p=fireball-separation.git

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 726d076..15c72bd 100644
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -118,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,66 +140,39 @@ 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 =
-prerr_endline (s);
  let lines = Str.split (Str.regexp "[\n\r\x0c\t;]+") s in
- let lines = List.map String.trim lines 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 (last, 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 line = "" then chr, name, div, conv, ps else
+  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, name, div, conv, ps
-   else if chr = "$"
-    then "#", line, div, conv, ps
+    then chr, div, conv, ps
    else if chr = "D"
-    then chr, name, line, conv, ps
+    then chr, line, conv, ps
    else if chr = "C"
-    then chr, name, div, line::conv, ps
+    then chr, div, line::conv, ps
    else if chr = "N"
-    then chr, name, div, conv, line::ps
-   else if last = ""
-    then raise (ParsingError ("Unexpected at beginning of problem: " ^ chr))
-   else aux' last (chr ^ line) in
+    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 _, name, div, conv, ps = List.fold_left aux ("#", "?", "", [], []) lines 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 *)
@@ -210,6 +183,7 @@ prerr_endline (s);
   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
@@ -251,7 +225,7 @@ let ps = List.map (
 
 
 let from_file path =
- let lines = ref [] in
+ let lines = ref ["#"] in
  let chan = open_in path in
  let _ = try
   while true; do
@@ -260,6 +234,6 @@ let from_file path =
  with End_of_file ->
   close_in chan in
  let txt = String.concat "\n" (List.rev !lines) in
- let problems = Str.split (Str.regexp "\\$") txt in
+ let problems = Str.split (Str.regexp "[\n\r]+\\$") txt in
  List.map problem_of_string (List.tl (List.map ((^) "$") problems))
 ;;