Implemented garbage in Num

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

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 10da3a40d909fcc2013f8e3e69c26a4306bdcac7..f9e7989176ce0402bf25c056124fa08c0ebe3433 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -1,7 +1,7 @@
 exception ParsingError of string;;\r
 \r
 let mk_app x y = Num.mk_app x y;;\r
-let mk_lam x = `Lam(true, x);;\r
+let mk_lam x g = `Lam(true, x, g);;\r
 let mk_var x = `Var(x, -666);;\r
 \r
 let isAlphaNum c = let n = Char.code c in\r
@@ -10,9 +10,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,11 +30,11 @@ let explode s =
 ;;\r
 \r
 let implode l =\r
-  let res = String.create (List.length l) in\r
+  let res = Bytes.create (List.length l) in\r
   let rec aux i = function\r
     | [] -> res\r
-    | c :: l -> res.[i] <- c; aux (i + 1) l in\r
-  aux 0 l\r
+    | c :: l -> Bytes.set res i c; aux (i + 1) l in\r
+  Bytes.to_string (aux 0 l)\r
 ;;\r
 \r
 let rec strip_spaces = function\r
@@ -45,7 +45,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 +65,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
@@ -69,18 +74,27 @@ let rec read_smt vars =
     | Some x, cs -> match strip_spaces cs with\r
       | [] -> false\r
       | c::_ -> c = '.'\r
+  in let rec read_garbage (bound, free) = function\r
+  | ',' :: cs ->\r
+     (match read_smt (bound,free) cs with\r
+     | Some [x], cs, (_, free) ->\r
+       let g, cs, free = read_garbage (bound,free) cs in x::g, cs, free\r
+     | _, _, _ -> raise (ParsingError "Garbage expected after ','"))\r
+  | cs -> [], cs, free\r
   in let read_lambda (bound, free) cs = (\r
     match read_var (strip_spaces cs) with\r
       | Some varname, cs ->\r
-      let vars' = (varname::bound, free) in\r
+      let bound' = varname::bound in\r
       (match strip_spaces cs with\r
         | [] -> raise (ParsingError "Lambda expression incomplete")\r
-        | c::cs -> (if c = '.' then (match read_smt vars' cs with\r
+        | '.' :: cs -> (match read_smt (bound', free) cs with\r
           | None, _, _ -> raise (ParsingError "Lambda body expected")\r
-          | Some [x], y, (_, free) -> Some [mk_lam x], y, (bound, free)\r
+          | Some [t], cs, (_, free) ->\r
+             let g, cs, free = read_garbage (bound', free) (strip_spaces cs) in\r
+             Some [mk_lam t g], cs, (bound, free)\r
           | Some _, _, _ -> assert false\r
-          ) else raise (ParsingError "Expected `.` after variable in lambda")\r
-        ))\r
+          )\r
+        | _::_ -> raise (ParsingError "Expected `.` after variable in lambda"))\r
       | _, _ -> assert false\r
  ) in let rec aux vars cs =\r
   match strip_spaces cs with\r
@@ -88,7 +102,7 @@ let rec read_smt vars =
   | c::_ as x ->\r
       let tms, cs, vars = (\r
            if c = '(' then read_pars vars x\r
-      else if c = ')' then (None, x, vars)\r
+      else if c = ')' || c = ',' then (None, x, vars)\r
       else if check_if_lambda x then read_lambda vars x\r
       else read_var' vars x) in\r
       match tms with\r
@@ -175,7 +189,7 @@ let problem_of_string s =
  let rec aux lev : nf -> nf = function\r
  | `I((n,_), args) -> `I((n,(if lev = 0 then 0 else 1) + Listx.length args), Listx.map (aux lev) args)\r
  | `Var(n,_) -> fix lev n\r
- | `Lam(_,t) -> `Lam (true, aux (lev+1) t)\r
+ | `Lam(_,t,g) -> `Lam (true, aux (lev+1) t, List.map (aux (lev+1)) g)\r
  | `Match _ | `N _ -> assert false in\r
 let all_tms = List.map (aux 0) (tms :> Num.nf list) in\r
 \r