Cleanup in w, added names, uncommented test for low special_k

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

diff --git a/ocaml/parser.ml b/ocaml/parser.ml
index 15c72bd7df1fdd139c0e9f6b2826d42257564ffa..6bcb70d909fd0b6117292aa2cdcb3b9a7d88da0f 100644 (file)
--- a/ocaml/parser.ml
+++ b/ocaml/parser.ml
@@ -29,10 +29,10 @@ 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
+    | c :: l -> Bytes.set res i c; aux (i + 1) l in\r
   aux 0 l\r
 ;;\r
 \r
@@ -118,13 +118,11 @@ let parse x =
   | _, _, _ -> raise (ParsingError "???")\r
 ;;\r
 \r
-let var_zero = "Z";; (* the name for the zero *)\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 ([], ([], [var_zero])) (* index zero is reserved *)\r
+  in let aux = List.fold_left f ([], ([], [])) (* index zero is reserved *)\r
   in let (tms, (_, free)) = aux strs\r
   in (List.rev tms, free)\r
 ;;\r
@@ -191,7 +189,7 @@ let problem_of_string s =
  | #nf_nob as t -> t\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