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

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index ea885d20434283ce72f1405487c8826d9af02a19..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
@@ -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
@@ -146,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
@@ -241,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

diff --git a/ocaml/parser.mli b/ocaml/parser.mli
index d131edbf79b65b46315d19510ec9e96583b9f58e..8dba8542ca4548e5f64201a1b80dcc7d88c3d202 100644 (file)
--- a/ocaml/parser.mli
+++ b/ocaml/parser.mli
@@ -1,6 +1,11 @@
+type term =\r
+  | Var of int\r
+  | App of term * term\r
+  | Lam of term\r
+\r
 exception ParsingError of string\r
 \r
-val problem_of_string:\r
+(* val problem_of_string:\r
  string ->\r
   string (* problem label *)\r
   * Num.i_var option (* div *)\r
@@ -12,4 +17,9 @@ val from_file : string ->
  * Num.i_var option (* div *)\r
  * Num.i_n_var list (* conv *)\r
  * Num.i_n_var list (* ps *)\r
- * string list (* names of free variables *)) list\r
+ * string list (* names of free variables *)) list *)\r
+\r
+ (* parses a string to a term *)\r
+ val parse: string -> term\r
+ (* parse many strings/terms, and returns the list of parsed terms + the list of free variables; variable 0 is not used *)\r
+ val parse_many: string list -> term list * string list\r