open Util.Vars
open Pure
+(* debug options *)
+let debug_display_arities = false;;
+
(************ Syntax ************************************)
(* Normal forms*)
module ToScott =
struct
-let rec scott_of_nf =
- function
- | `N n -> Scott.mk_n n
- | `Var(v,_) -> Pure.V v
- | `Match(t,_,liftno,bs,args) ->
- let bs = List.map (fun (n,t) -> n, scott_of_nf (lift liftno (t :> nf))) !bs in
- let t = scott_of_nf (t :> nf) in
- let m = Scott.mk_match t bs in
- List.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) m (args :> nf list)
- | `I((v,_), args) -> Listx.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) (Pure.V v) (args :> nf Listx.listx)
- | `Lam(b,f) -> Pure.L (scott_of_nf f)
- | `Bottom -> let f x = Pure.A (x,x) in f (Pure.L (f (Pure.V 0)))
- | `Pacman -> let f x = Pure.A (x,x) in f (Pure.L (Pure.L (f (Pure.V 0))))
+let rec scott_of_nf = function
+ | `N n -> Scott.mk_n n
+ | `Var(v,_) -> Pure.V v
+ | `Match(t,_,liftno,bs,args) ->
+ let bs = List.map (fun (n,t) -> n, scott_of_nf (lift liftno (t :> nf))) !bs in
+ let t = scott_of_nf (t :> nf) in
+ let m = Scott.mk_match t bs in
+ List.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) m (args :> nf list)
+ | `I((v,_), args) -> Listx.fold_left (fun acc t -> Pure.A(acc,scott_of_nf t)) (Pure.V v) (args :> nf Listx.listx)
+ | `Lam(_,t) -> Pure.L (scott_of_nf t)
+ | `Bottom -> Pure.B
+ | `Pacman -> let f x = Pure.A (x,x) in f (Pure.L (Pure.L (f (Pure.V 0))))
end
let rec string_of_term l =
let rec string_of_term_w_pars l = function
- | `Var(n,ar) -> print_name l n ^ ":" ^ string_of_int ar
+ | `Var(n,ar) -> print_name l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "")
| `N n -> string_of_int n
| `I _ as t -> "(" ^ string_of_term_no_pars_app l t ^ ")"
+ | `Lam(_,`Bottom) -> "BOMB"
| `Lam _ as t -> "(" ^ string_of_term_no_pars_lam l t ^ ")"
| `Match(t,(v,ar),bs_lift,bs,args) ->
- "[match("^ string_of_var v ^":"^ string_of_int ar ^") " ^ string_of_term_no_pars l (t :> nf) ^
+ "["^ string_of_var v ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^",match " ^ string_of_term_no_pars l (t :> nf) ^
" with " ^ String.concat " | " (List.map (fun (n,t) -> string_of_int n ^ " => " ^ string_of_term l (lift bs_lift (t :> nf))) !bs) ^ "] " ^
String.concat " " (List.map (string_of_term l) (args :> nf list)) ^ ")"
- | `Bottom -> "TNT"
+ | `Bottom -> "BOT"
| `Pacman -> "PAC"
and string_of_term_no_pars_app l = function
- | `I((n,ar), args) -> print_name l n ^ ":" ^ string_of_int ar ^ " " ^ String.concat " " (List.map (string_of_term_w_pars l) (Listx.to_list args :> nf list))
+ | `I((n,ar), args) -> print_name l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "") ^ " " ^ String.concat " " (List.map (string_of_term_w_pars l) (Listx.to_list args :> nf list))
| #nf as t -> string_of_term_w_pars l t
and string_of_term_no_pars_lam l = function
+ | `Lam(_,`Bottom) -> "BOMB"
| `Lam(_,t) -> let name = string_of_var (List.length l) in
- "λ" ^ name ^ ". " ^ (string_of_term_no_pars_lam (name::l) t)
+ "λ" ^ name ^ ". " ^ (string_of_term_no_pars_lam (name::l) t)
| _ as t -> string_of_term_no_pars l t
and string_of_term_no_pars l = function
| `Lam _ as t -> string_of_term_no_pars_lam l t
(*prerr_endline ("MK_MATCH: ([" ^ print t ^ "] " ^ String.concat " " (Listx.to_list (Listx.map (fun (n,t) -> string_of_int n ^ " => " ^ print t) bs)) ^ ") " ^ String.concat " " (List.map print args));*)
let m =
match t with
- `N m ->
+ `N m as t ->
(try
let h = List.assoc m !bs in
let h = set_arity (minus1 ar) h in
h
with Not_found ->
`Match (t,(n,ar),bs_lift,bs,[]))
- | `I _ | `Var _ | `Match _ -> `Match(t,(n,ar),bs_lift,bs,[]) in
+ (* We are assuming that the econding of matches is s.t.:
+ - match PAC.. --> PAC
+ - match BOT.. --> BOT *)
+ | `Bottom -> `Bottom
+ | `Pacman -> `Pacman
+ | `Lam _ -> assert false
+ | `I _ | `Var _ | `Match _ as t -> `Match(t,(n,ar),bs_lift,bs,[]) in
mk_appl m args
and subst truelam delift_by_one what (with_what : nf(*_nob*)) (where : nf) =
(* The following line should be the identity when delift_by_one = true because we
are assuming the ts to not contain lambda-bound variables. *)
bs := List.map (fun (n,t) -> n,subst truelam false what with_what' t) !bs ;
- mk_match (cast_to_i_num_var (aux_i_num_var l t)) v bs_lift bs (List.map (aux l) (args :> nf list))
+ let body = aux_i_num_var l t in
+ mk_match body v bs_lift bs (List.map (aux l) (args :> nf list))
and aux l(*lift*) =
(*function iii -> let res = match iii with*)
function
let parse' strs =
let fix_arity = function
- | `I((n,_),args) -> `I((n,1+Listx.length args),args)
- | _ -> assert false in
- let rec aux = function
- | Parser.Lam t -> `Lam (true, aux t)
- | Parser.App (t1, t2) -> fix_arity (mk_app (aux t1) (aux t2))
- | Parser.Var v -> `Var(v,1) in
+ | `I((n,_),args) -> `I((n,1+Listx.length args),args)
+ | _ -> assert false in
let (tms, free) = Parser.parse_many strs in
- List.map aux tms, free
+ (* Replace pacmans and bottoms *)
+ let n_bot = try Util.index_of "BOT" free with Not_found -> min_int in
+ let n_pac = try Util.index_of "PAC" free with Not_found -> min_int in
+ let n_bomb = try Util.index_of "BOMB" free with Not_found -> min_int in
+ let fix lev v =
+ if v = lev + n_bot then `Bottom
+ else if v = lev + n_pac then `Pacman
+ else if v = lev + n_bomb then `Lam(true, `Bottom)
+ else `Var(v,1) in (* 1 by default when variable not applied *)
+ (* Fix arity *)
+ let rec aux lev = function
+ | Parser.Lam t -> `Lam (true, aux (lev+1) t)
+ | Parser.App (t1, t2) -> fix_arity (mk_app (aux lev t1) (aux lev t2))
+ | Parser.Var v -> fix lev v in
+ List.map (aux 0) tms, free
;;
(************** Algorithm(s) ************************)
| `Match(u,_,_,bs,args) -> max (max (aux l (u :> nf)) (aux_tms l (args :> nf list))) (aux_tms l (List.map snd !bs))
| `N _ | `Bottom | `Pacman -> None
and aux_tms l =
- List.fold_left (fun acc t -> Pervasives.max acc (aux l t)) None in
+ List.fold_left (fun acc t -> max acc (aux l t)) None in
fun tms -> aux_tms 0 (tms :> nf list)
;;
projects / fireball-separation.git / blobdiff