Copied old code back in parser, to make andrea8 great again

[fireball-separation.git] / ocaml / parser.ml

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 2b0e04dd0104ad79b71ca9a55c20030c31050e5f..fbce730c78915d11457b701ee46691fef2cae988 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -1,8 +1,14 @@
-exception ParsingError of string;;\r
+type term =\r
+  | Var of int\r
+  | App of term * term\r
+  | Lam of term\r
+;;\r
 \r
-let mk_app x y = Num.mk_app x y;;\r
-let mk_lam x = `Lam(true, x);;\r
-let mk_var x = `Var(x, -666);;\r
+let mk_app x y = App(x, y);;\r
+let mk_lam x = Lam x;;\r
+let mk_var x = Var x;;\r
+\r
+exception ParsingError of string;;\r
 \r
 let isAlphaNum c = let n = Char.code c in\r
  (48 <= n && n <= 90) || (95 <= n && n <= 122) ;;\r
@@ -10,9 +16,9 @@ let isSpace c = c = ' ' || c = '\n' || c = '\t' ;;
 \r
 (* FIXME *)\r
 let mk_var' (bound, free) x =\r
-  if List.mem x bound\r
+  if x <> "@" && List.mem x bound\r
   then free, mk_var (Util.index_of x bound)\r
-  else if List.mem x free\r
+  else if x <> "@" && List.mem x free\r
        then free, mk_var (List.length bound + Util.index_of x free)\r
        else (free @ [x]), mk_var (List.length bound + List.length free)\r
 ;;\r
@@ -30,10 +36,10 @@ let explode s =
 ;;\r
 \r
 let implode l =\r
-  let res = Bytes.create (List.length l) in\r
+  let res = String.create (List.length l) in\r
   let rec aux i = function\r
     | [] -> res\r
-    | c :: l -> Bytes.set res i c; aux (i + 1) l in\r
+    | c :: l -> String.set res i c; aux (i + 1) l in\r
   aux 0 l\r
 ;;\r
 \r
@@ -45,7 +51,12 @@ let rec strip_spaces = function
 let read_var s =\r
   let rec aux = function\r
   | [] -> None, []\r
-  | c::cs as x -> if isAlphaNum c\r
+  | c::cs as x ->\r
+    if c = '@' then\r
+     (if cs <> [] && (let hd = List.hd cs in hd = '@' || isAlphaNum hd)\r
+     then raise (ParsingError ("Unexpected `"^String.make 1 (List.hd cs)^"` after `@`."))\r
+     else Some['@'], cs)\r
+    else if isAlphaNum c\r
     then match aux cs with\r
          | (Some x), cs' -> Some (c :: x), cs'\r
          | None, cs' -> (Some [c]), cs'\r
@@ -60,7 +71,7 @@ let read_var' (bound, free as vars) s =
   | Some varname, cs ->\r
     let free, v = mk_var' vars varname in\r
     Some [v], cs, (bound, free)\r
-  | _, _ -> raise (ParsingError ("Can't read variable"))\r
+  | None, _ -> raise (ParsingError ("Can't read variable"))\r
 ;;\r
 \r
 let rec read_smt vars =\r
@@ -141,7 +152,7 @@ let _ = prerr_endline (">>>" ^ string_of_term (parse "(\\x. x y z z1 k) z1 z j")
 \r
 *******************************************************************************)\r
 \r
-let problem_of_string s =\r
+(* let problem_of_string s =\r
  let lines = Str.split (Str.regexp "[\n\r\x0c\t;]+") s 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
@@ -236,4 +247,20 @@ let from_file path =
  let txt = String.concat "\n" (List.rev !lines) in\r
  let problems = Str.split (Str.regexp "[\n\r]+\\$") txt in\r
  List.map problem_of_string (List.tl (List.map ((^) "$") problems))\r
+;; *)\r
+\r
+let parse x =\r
+  match read_smt ([],[]) (explode x) with\r
+  | Some [y], [], _ -> y\r
+  | _, _, _ -> assert false\r
+;;\r
+\r
+\r
+let parse_many strs =\r
+  let f (x, y) z = match read_smt y (explode z) with\r
+  | Some[tm], [], vars -> (tm :: x, vars)\r
+  | _, _, _ -> assert false\r
+  in let aux = List.fold_left f ([], ([], []))\r
+  in let (tms, (_, free)) = aux strs\r
+  in (List.rev tms, free)\r
 ;;\r