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
;;\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
| 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
| 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
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