Added garbage to L

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

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index ae371c78f5b7efdd269b38ff04e1c6048eb8b71b..800322677a102f3aa324df8ddb35ca4daa6afcda 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -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
@@ -23,17 +23,18 @@ let mk_app' = function
 ;;\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 = 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
@@ -44,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
@@ -59,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
@@ -122,7 +128,7 @@ let parse_many strs =
   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 ([], ([], [])) (* index zero is reserved *)\r
+  in let aux = List.fold_left f ([], ([], []))\r
   in let (tms, (_, free)) = aux strs\r
   in (List.rev tms, free)\r
 ;;\r