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
(* 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 = 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
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
| 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
| 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 "manca dopo variabile lambda")\r
- | c::cs -> (if c = '.' then (match read_smt vars' cs with\r
- | None, _, _ -> raise (ParsingError "manca corpo lambda")\r
- | Some [x], y, (_, free) -> Some [mk_lam x], y, (bound, free)\r
- | Some _, _, _ -> raise (ParsingError "???")\r
- ) else raise (ParsingError "manca . nel lambda")\r
- ))\r
+ | [] -> raise (ParsingError "Lambda expression incomplete")\r
+ | '.' :: cs -> (match read_smt (bound', free) cs with\r
+ | None, _, _ -> raise (ParsingError "Lambda body expected")\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
+ )\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
| 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
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 var_zero = "ω";; (* w is an invalid variable name *)\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
+ | _, _, _ -> 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
\r
-(**********************************************************************\r
-\r
-let rec string_of_term = function\r
- | Tvar n -> string_of_int n\r
- | Tapp(t1, t2) -> "(" ^ string_of_term t1 ^ " " ^ string_of_term t2 ^ ")"\r
- | Tlam(t1) -> "(\\" ^ string_of_term t1 ^ ")"\r
-;;\r
-\r
-let _ = prerr_endline (">>>" ^ string_of_term (parse "(\\x. x y z z1 k) z1 z j"));;\r
-\r
-\r
-**********************************************************************)\r
-\r
- let parse' strs =\r
- let (tms, free) = parse_many strs in\r
- (* Replace pacmans and bottoms *)\r
- let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in\r
- let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in\r
- let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in\r
- let fix lev v =\r
- if v = lev + n_bot then failwith "Example with `Bottom"\r
- else if v = lev + n_pac then failwith "Example with `Pacman"\r
- else if v = lev + n_bomb then failwith "Example with `Bomb"\r
- else `Var(v,1) in (* 1 by default when variable not applied *)\r
- (* Fix arity *)\r
- let open Num in\r
- let rec aux lev : nf -> nf = function\r
- | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> aux lev t) args)\r
- | `Var(n,_) -> fix lev n\r
- | `Lam(_,t) -> `Lam (true, aux (lev+1) t)\r
- | `Match _ | `N _ -> assert false in\r
- List.map (aux 0) (tms :> Num.nf list), free\r
-;;\r
-\r
let problem_of_string s =\r
-prerr_endline (s);\r
let lines = Str.split (Str.regexp "[\n\r\x0c\t;]+") s in\r
- (* let lines = List.map String.trim lines 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
let lines = List.filter ((<>) "") lines in\r
- prerr_endline("number of lines" ^ string_of_int (List.length lines));\r
- let aux (last, name, div, conv, ps) line =\r
+ let aux (last, div, conv, ps) line =\r
let chr = String.sub line 0 1 in\r
let line = String.trim (String.sub line 1 (String.length line - 1)) in\r
- if line = "" then chr, name, div, conv, ps else\r
+ if line = "" then chr, div, conv, ps else\r
let rec aux' chr line =\r
if chr = "#"\r
- then chr, name, div, conv, ps\r
- else if chr = "$"\r
- then "#", line, div, conv, ps\r
+ then chr, div, conv, ps\r
else if chr = "D"\r
- then chr, name, line, conv, ps\r
+ then chr, line, conv, ps\r
else if chr = "C"\r
- then chr, name, div, line::conv, ps\r
+ then chr, div, line::conv, ps\r
else if chr = "N"\r
- then chr, name, div, conv, line::ps\r
+ then chr, div, conv, line::ps\r
else if chr = " "\r
then aux' last line\r
else raise (ParsingError\r
("Unexpected at beginning of problem: `" ^ chr ^ "` " ^ line)) in\r
aux' chr line in\r
- let _, name, div, conv, ps = List.fold_left aux ("#", "no label", "", [], []) lines in\r
+ let _, div, conv, ps = List.fold_left aux ("#", "", [], []) lines in\r
let div_provided = div <> "" in\r
let div = if div_provided then div else "xxxxxx" in\r
let strs = [div] @ ps @ conv in\r
\r
- if strs = ["BOT"]\r
- then raise (ParsingError "empty problem");\r
+ if List.length ps = 0 && List.length conv = 0\r
+ then raise (ParsingError "Parsed empty problem");\r
\r
(* parse' *)\r
let (tms, free) = parse_many strs in\r
+ let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in\r
+ let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in\r
+ let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in\r
+ let fix lev v =\r
+ if v = lev + n_bot then failwith "Example with `Bottom"\r
+ else if v = lev + n_pac then failwith "Example with `Pacman"\r
+ else if v = lev + n_bomb then failwith "Example with `Bomb"\r
+ else if v = lev then `Var(v, min_int) (* zero *)\r
+ else `Var(v,1) in (* 1 by default when variable not applied *)\r
(* Fix arity *)\r
let open Num in\r
let rec aux lev : nf -> nf = function\r
- | `I((n,_), args) -> `I((n,1 + Listx.length args), Listx.map (fun t -> aux lev t) args)\r
- | `Var(n,_) -> `Var(n,1)\r
- | `Lam(_,t) -> `Lam (true, aux (lev+1) t)\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,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
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
\r
\r
let from_file path =\r
- let lines = ref [""] in\r
+ let lines = ref ["#"] in\r
let chan = open_in path in\r
let _ = try\r
while true; do\r
projects / fireball-separation.git / blobdiff