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 4b02b121e93faf1da7d2c24bdcda32af5b844929..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,29 +16,30 @@ 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
 \r
 let mk_app' = function\r
-  | [] ->  raise (ParsingError "bug")\r
+  | [] ->  assert false\r
   | t :: ts -> List.fold_left mk_app t ts\r
 ;;\r
 \r
 let explode s =\r
+ let len = String.length s in\r
   let rec aux i l =\r
-    if i < 0 then l else aux (i - 1) (s.[i] :: l)\r
-  in aux (String.length s - 1) []\r
+    if i >= len || s.[i] = '#' then l else aux (i+1) (s.[i] :: l)\r
+  in List.rev (aux 0 [])\r
 ;;\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
@@ -44,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
@@ -59,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
@@ -73,12 +85,12 @@ let rec read_smt vars =
       | Some varname, cs ->\r
       let vars' = (varname::bound, free) in\r
       (match strip_spaces cs with\r
-        | [] -> raise (ParsingError "manca dopo variabile lambda")\r
+        | [] -> raise (ParsingError "Lambda expression incomplete")\r
         | c::cs -> (if c = '.' then (match read_smt vars' cs with\r
-          | None, _, _ -> raise (ParsingError "manca corpo lambda")\r
+          | None, _, _ -> raise (ParsingError "Lambda body expected")\r
           | Some [x], y, (_, free) -> Some [mk_lam x], y, (bound, free)\r
-          | Some _, _, _ -> raise (ParsingError "???")\r
-          ) else raise (ParsingError "manca . nel lambda")\r
+          | Some _, _, _ -> assert false\r
+          ) else raise (ParsingError "Expected `.` after variable in lambda")\r
         ))\r
       | _, _ -> assert false\r
  ) in let rec aux vars cs =\r
@@ -96,7 +108,7 @@ let rec read_smt vars =
           | None, cs, vars -> Some [tm], cs, vars\r
           | Some ts, cs, vars -> Some (tm :: ts), cs, vars\r
         )\r
-      | Some _ -> raise (ParsingError "bug")\r
+      | Some _ -> assert false\r
       | None -> None, x, vars\r
   in fun cs -> match aux vars cs with\r
     | None, cs, vars -> None, cs, vars\r
@@ -108,21 +120,21 @@ and read_pars vars = function
     let cs = strip_spaces cs in\r
     match cs with\r
       | [] -> None, [], vars\r
-      | c::cs -> if c = ')' then tm, cs, vars else raise (ParsingError ") mancante")\r
-    ) else raise (ParsingError "???")\r
+      | c::cs -> if c = ')' then tm, cs, vars else raise (ParsingError "Missing `)`")\r
+    ) else assert false\r
 ;;\r
 \r
 let parse x =\r
   match read_smt ([],[]) (explode x) with\r
   | Some [y], [], _ -> y\r
-  | _, _, _ -> raise (ParsingError "???")\r
+  | _, _, _ -> assert false\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
-  | _, _, _ -> raise (ParsingError "???")\r
-  in let aux = List.fold_left f ([], ([], [])) (* index zero is reserved *)\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
@@ -140,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
@@ -169,7 +181,7 @@ let problem_of_string s =
  let strs = [div] @ ps @ conv in\r
 \r
  if List.length ps = 0 && List.length conv = 0\r
-  then raise (ParsingError "empty problem");\r
+  then raise (ParsingError "Parsed empty problem");\r
 \r
  (* parse' *)\r
  let (tms, free) = parse_many strs in\r
@@ -187,9 +199,10 @@ let problem_of_string s =
  let open Num in\r
  let exclude_bottom = function\r
  | #nf_nob as t -> t\r
+ (* actually, the following may be assert false *)\r
  | `Bottom -> raise (ParsingError "Input term not in normal form") in\r
  let rec aux_nob lev : nf_nob -> nf = function\r
- | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> exclude_bottom (aux_nob lev t)) args)\r
+ | `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)\r
  | `Var(n,_) -> fix lev n\r
  | `Lam(_,t) -> `Lam (true, aux (lev+1) t)\r
  | `Match _ | `N _ -> assert false\r
@@ -206,17 +219,17 @@ let div = if not div_provided || div = `Bottom
  then None\r
  else match div with\r
   | `I _ as t -> Some t\r
-  | _ -> raise (ParsingError "div is not an inert or BOT in the initial problem") in\r
+  | _ -> raise (ParsingError "D is not an inert in the initial problem") in\r
 let conv = Util.filter_map (\r
  function\r
  | #i_n_var as t -> Some t\r
  | `Lam _ -> None\r
- | _ -> raise (ParsingError "A term in conv is not i_n_var")\r
+ | _ -> raise (ParsingError "A C-term is not i_n_var")\r
  ) conv in\r
 let ps = List.map (\r
  function\r
   | #i_n_var as y -> y\r
-  | _ as y -> raise (ParsingError ("A term in num is not i_n_var" ^ Num.string_of_nf y))\r
+  | _ -> raise (ParsingError "An N-term is not i_n_var")\r
  ) ps in\r
  name, div, conv, ps, free\r
 ;;\r
@@ -234,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