From d3e73f866de30503a4c44d67cdd9e8ff77c15fc3 Mon Sep 17 00:00:00 2001 From: acondolu Date: Sun, 16 Jul 2017 15:41:16 +0200 Subject: [PATCH] Printing now preserves the names of the original free variables (cherry picked from commit 7051416c234181eaf79dedfd18005cdf0a3e0863) --- ocaml/lambda4.ml | 145 ++++++++++++++++++++++++----------------------- ocaml/num.ml | 41 ++++++++------ 2 files changed, 98 insertions(+), 88 deletions(-) diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml index 612e94c..8a5797c 100644 --- a/ocaml/lambda4.ml +++ b/ocaml/lambda4.ml @@ -33,6 +33,13 @@ type problem = let label_of_problem {label} = label;; +let string_of_var l x = + try + List.nth l x + with Failure "nth" -> "`" ^ string_of_int x +;; +let string_of_term p t = print ~l:p.var_names (t :> nf);; + let all_terms p = (match p.div with None -> [] | Some t -> [(t :> i_n_var)]) @ p.conv @@ -69,8 +76,7 @@ let string_of_measure = string_of_int;; let string_of_problem label ({freshno; div; conv; ps; deltas} as p) = let deltas = String.concat ("\n# ") (List.map (fun r -> String.concat " <> " (List.map (fun (i,_) -> string_of_int i) !r)) deltas) in - let nv = List.length p.var_names in - let l = p.var_names @ Array.to_list (Array.init (freshno + 1 - nv) (fun x -> "`" ^ string_of_int x)) in + let l = p.var_names in String.concat "\n" ([ ""; "# DISPLAY PROBLEM (" ^ label ^ ") " ^ "measure=" ^ string_of_measure (problem_measure p); @@ -82,7 +88,7 @@ let string_of_problem label ({freshno; div; conv; ps; deltas} as p) = "$" ^ p.label; (match div with None -> "# no D" | Some div -> "D " ^ print ~l (div :> nf)); ] - @ List.map (fun t -> "C " ^ (if t = convergent_dummy then " ... " else print ~l (t :> nf))) conv + @ List.map (fun t -> "C " ^ (if t = convergent_dummy then "#C" else "C " ^ print ~l (t :> nf))) conv @ List.mapi (fun i t -> string_of_int i ^ " " ^ print ~l (t :> nf)) ps @ [""]) ;; @@ -232,12 +238,11 @@ List.iter (fun x -> prerr_endline ("IN2: " ^ print (fst x :> nf))) super_simplif let div = option_map cast_to_i_var div in let ps = List.map cast_to_i_n_var (old_ps @ new_ps) in let conv = List.map cast_to_i_n_var conv in -(let l = Array.to_list (Array.init (freshno + 1) string_of_var) in -prerr_endline ("# INST: " ^ string_of_var x ^ " := " ^ print ~l inst)); let p = {p with freshno; div; conv; ps} in + prerr_endline ("# INST: " ^ string_of_var p.var_names x ^ " := " ^ string_of_term p inst); ( (* check if double substituting a variable *) if List.exists (fun (x',_) -> x = x') sigma - then failwithProblem p ("Variable "^ string_of_var x ^"replaced twice") + then failwithProblem p ("Variable "^ string_of_var p.var_names x ^"replaced twice") ); let p = {p with sigma = sigma@[x,inst]} in let p = super_simplify p in @@ -278,7 +283,7 @@ and dangerous_inert arities showstoppers k args more_args = Not_found -> () (* cut & paste from above *) -let rec dangerous_conv arities showstoppers = +let rec dangerous_conv p arities showstoppers = function `N _ | `Var _ @@ -286,21 +291,22 @@ let rec dangerous_conv arities showstoppers = | `Match(t,_,liftno,bs,args) -> (* CSC: XXX partial dependency on the encoding *) (match t with - `N _ -> concat_map (dangerous_conv arities showstoppers) args - | `Match _ as t -> dangerous_conv arities showstoppers t @ concat_map (dangerous_conv arities showstoppers) args - | `Var(x,_) -> dangerous_inert_conv arities showstoppers x [] args 2 - | `I((x,_),args') -> dangerous_inert_conv arities showstoppers x (Listx.to_list args') args 2 + `N _ -> concat_map (dangerous_conv p arities showstoppers) args + | `Match _ as t -> dangerous_conv p arities showstoppers t @ concat_map (dangerous_conv p arities showstoppers) args + | `Var(x,_) -> dangerous_inert_conv p arities showstoppers x [] args 2 + | `I((x,_),args') -> dangerous_inert_conv p arities showstoppers x (Listx.to_list args') args 2 ) - | `I((k,_),args) -> dangerous_inert_conv arities showstoppers k (Listx.to_list args) [] 0 + | `I((k,_),args) -> dangerous_inert_conv p arities showstoppers k (Listx.to_list args) [] 0 -and dangerous_inert_conv arities showstoppers k args match_args more_args = +and dangerous_inert_conv p arities showstoppers k args match_args more_args = let all_args = args @ match_args in - let dangerous_args = concat_map (dangerous_conv arities showstoppers) all_args in + let dangerous_args = concat_map (dangerous_conv p arities showstoppers) all_args in + let all_args = (all_args :> nf list) in if dangerous_args = [] then ( if List.mem k showstoppers then k :: concat_map free_vars all_args else try let arity = arity_of arities k in -prerr_endline ("dangerous_inert_conv: ar=" ^ string_of_int arity ^ " k="^string_of_var k ^ " listlenargs=" ^ (string_of_int (List.length args)) ^ " more_args=" ^ string_of_int more_args); +prerr_endline ("dangerous_inert_conv: ar=" ^ string_of_int arity ^ " k="^string_of_var p.var_names k ^ " listlenargs=" ^ (string_of_int (List.length args)) ^ " more_args=" ^ string_of_int more_args); if more_args > 0 (* match argument*) && List.length args = arity then [] else if List.length all_args + more_args > arity then k :: concat_map free_vars all_args else [] with @@ -308,7 +314,7 @@ prerr_endline ("dangerous_inert_conv: ar=" ^ string_of_int arity ^ " k="^string_ ) else k :: concat_map free_vars all_args (* inefficient algorithm *) -let rec edible arities div ps conv showstoppers = +let rec edible ({div; conv; ps} as p) arities showstoppers = let rec aux showstoppers = function [] -> showstoppers @@ -333,10 +339,10 @@ let rec edible arities div ps conv showstoppers = in let showstoppers = sort_uniq (aux showstoppers ps) in let dangerous_conv = - List.map (dangerous_conv arities showstoppers) (conv :> nf list) in + List.map (dangerous_conv p arities showstoppers) (conv :> nf list) in prerr_endline ("dangerous_conv lenght:" ^ string_of_int (List.length dangerous_conv)); -List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l))) dangerous_conv; +List.iter (fun l -> prerr_endline (String.concat " " (List.map (string_of_var p.var_names) l))) dangerous_conv; let showstoppers' = showstoppers @ List.concat dangerous_conv in let showstoppers' = sort_uniq (match div with @@ -344,7 +350,7 @@ List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l)) | Some div -> if List.exists ((=) (hd_of_i_var div)) showstoppers' then showstoppers' @ free_vars (div :> nf) else showstoppers') in - if showstoppers <> showstoppers' then edible arities div ps conv showstoppers' else showstoppers', dangerous_conv + if showstoppers <> showstoppers' then edible p arities showstoppers' else showstoppers', dangerous_conv ;; let precompute_edible_data {ps; div} xs = @@ -384,8 +390,8 @@ let critical_showstoppers p = let showstoppers_eat = List.filter (fun x -> not (List.mem x showstoppers_step)) showstoppers_eat in - List.iter (fun v -> prerr_endline ("DANGEROUS STEP: " ^ string_of_var v)) showstoppers_step; - List.iter (fun v -> prerr_endline ("DANGEROUS EAT: " ^ string_of_var v)) showstoppers_eat; + List.iter (fun v -> prerr_endline ("DANGEROUS STEP: " ^ (string_of_var p.var_names) v)) showstoppers_step; + List.iter (fun v -> prerr_endline ("DANGEROUS EAT: " ^ (string_of_var p.var_names) v)) showstoppers_eat; p, showstoppers_step, showstoppers_eat ;; @@ -395,15 +401,14 @@ let eat p = let heads = List.sort compare (filter_map hd_of ps) in let arities = precompute_edible_data p (uniq heads) in let showstoppers, showstoppers_conv = - edible arities p.div ps p.conv showstoppers in + edible p arities showstoppers in let l = List.filter (fun (x,_,_) -> not (List.mem x showstoppers)) arities in let p = List.fold_left (fun p (x,pos,(xx : i_n_var)) -> if pos = -1 then p else let n = match xx with `I(_,args) -> Listx.length args | _ -> 0 in let v = `N(pos) in let inst = make_lams v n in -(let l = Array.to_list (Array.init (p.freshno + 1) string_of_var) in -prerr_endline ("# INST_IN_EAT: " ^ string_of_var x ^ " := " ^ print ~l inst)); +prerr_endline ("# INST_IN_EAT: " ^ string_of_var p.var_names x ^ " := " ^ string_of_term p inst); { p with sigma = p.sigma @ [x,inst] } ) p l in (* to avoid applied numbers in safe positions that @@ -431,13 +436,12 @@ prerr_endline ("# INST_IN_EAT: " ^ string_of_var x ^ " := " ^ print ~l inst)); prerr_endline ("Just created bomb var: " ^ string_of_nf !bomb); let x = hd_of_i_var div in let inst = make_lams !bomb n in - prerr_endline ("# INST (div): " ^ string_of_var x ^ " := " ^ string_of_nf inst); let p = {p with div=None} in (* subst_in_problem (hd_of_i_var div) inst p in *) {p with sigma=p.sigma@[x,inst]} in let dangerous_conv = showstoppers_conv in let _ = prerr_endline ("dangerous_conv lenght:" ^ string_of_int (List.length dangerous_conv)); -List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l))) dangerous_conv; in +List.iter (fun l -> prerr_endline (String.concat " " (List.map (string_of_var p.var_names) l))) dangerous_conv; in let conv = List.map (function s,t -> try @@ -448,7 +452,7 @@ List.iter (fun l -> prerr_endline (String.concat " " (List.map string_of_var l)) with Not_found -> match hd_of t with | None -> assert (t = convergent_dummy); t | Some h -> - prerr_endline ("FREEZING " ^ string_of_var h); + prerr_endline ("FREEZING " ^ string_of_var p.var_names h); convergent_dummy ) (List.combine showstoppers_conv p.conv) in List.iter @@ -507,7 +511,7 @@ let auto_instantiate (n,p) = let x = match showstoppers_step, showstoppers_eat with | [], y::_ -> - prerr_endline ("INSTANTIATING CRITICAL TO EAT " ^ string_of_var y); y + prerr_endline ("INSTANTIATING CRITICAL TO EAT " ^ string_of_var p.var_names y); y | [], [] -> let heads = (* Choose only variables still alive (with arity > 0) *) @@ -521,10 +525,10 @@ let auto_instantiate (n,p) = with Not_found -> assert false) | x::_ -> - prerr_endline ("INSTANTIATING TO EAT " ^ string_of_var x); + prerr_endline ("INSTANTIATING TO EAT " ^ string_of_var p.var_names x); x) | x::_, _ -> - prerr_endline ("INSTANTIATING " ^ string_of_var x); + prerr_endline ("INSTANTIATING " ^ string_of_var p.var_names x); x in (* Strategy that decreases the special_k to 0 first (round robin) 1:11m42 2:14m5 3:11m16s 4:14m46s 5:12m7s 6:6m31s *) @@ -537,7 +541,7 @@ let auto_instantiate (n,p) = with | None -> assert false | Some x -> - prerr_endline ("INSTANTIATING AND HOPING " ^ string_of_var x); + prerr_endline ("INSTANTIATING AND HOPING " ^ string_of_var p.var_names x); x with Not_found -> @@ -703,45 +707,46 @@ let solve p = let p_finale = auto p p.initialSpecialK in let freshno,sigma = p_finale.freshno, p_finale.sigma in prerr_endline ("------- ------ measure=. \n "); - let l = Array.to_list (Array.init (freshno + 1) string_of_var) in - List.iter (fun (x,inst) -> prerr_endline (string_of_var x ^ " := " ^ print ~l inst)) sigma; - - prerr_endline "-------------------"; - let sigma = optimize_numerals p_finale in (* optimize numerals *) - let l = Array.to_list (Array.init (freshno + 1) string_of_var) in - List.iter (fun (x,inst) -> prerr_endline (string_of_var x ^ " := " ^ print ~l inst)) sigma; - - prerr_endline "------------------"; - let t_of_nf t = ToScott.t_of_nf (t :> nf) in - let div = option_map t_of_nf p.div in - let conv = List.map t_of_nf p.conv in - let ps = List.map t_of_nf p.ps in - - let sigma' = List.map (fun (x,inst) -> x, ToScott.t_of_nf inst) sigma in - let e' = env_of_sigma freshno sigma' false (* FIXME shoudl_explode *) in - - prerr_endline "-----------------"; - let pure_bomb = ToScott.t_of_nf (!bomb) in (* Pure.B *) - (function Some div -> - print_endline (Pure.print div); - let t = Pure.mwhd (e',div,[]) in - prerr_endline ("*:: " ^ (Pure.print t)); - assert (t = pure_bomb) - | None -> ()) div; - List.iter (fun n -> - verbose ("_::: " ^ (Pure.print n)); - let t = Pure.mwhd (e',n,[]) in - verbose ("_:: " ^ (Pure.print t)); - assert (t <> pure_bomb) - ) conv ; - List.iteri (fun i n -> - verbose ((string_of_int i) ^ "::: " ^ (Pure.print n)); - let t = Pure.mwhd (e',n,[]) in - verbose ((string_of_int i) ^ ":: " ^ (Pure.print t)); - assert (t = Scott.mk_n i) - ) ps ; - prerr_endline "-------- --------"; - `Separable p_finale.sigma + List.iter (fun (x,inst) -> prerr_endline + (string_of_var p_finale.var_names x ^ " := " ^ string_of_term p_finale inst)) sigma; + + prerr_endline "-------------------"; + let sigma = optimize_numerals p_finale in (* optimize numerals *) + List.iter (fun (x,inst) -> prerr_endline + (string_of_var p_finale.var_names x ^ " := " ^ string_of_term p_finale inst)) sigma; + + prerr_endline "------------------"; + let scott_of_nf t = ToScott.t_of_nf (t :> nf) in + let div = option_map scott_of_nf p.div in + let conv = List.map scott_of_nf p.conv in + let ps = List.map scott_of_nf p.ps in + + let sigma' = List.map (fun (x,inst) -> x, scott_of_nf inst) sigma in + let e' = env_of_sigma freshno sigma' false (* FIXME shoudl_explode *) in + + prerr_endline "-----------------"; + let pure_bomb = ToScott.t_of_nf (!bomb) in (* Pure.B *) + (function + | Some div -> + print_endline (Pure.print div); + let t = Pure.mwhd (e',div,[]) in + prerr_endline ("*:: " ^ (Pure.print t)); + assert (t = pure_bomb) + | None -> ()) div; + List.iter (fun n -> + verbose ("_::: " ^ (Pure.print n)); + let t = Pure.mwhd (e',n,[]) in + verbose ("_:: " ^ (Pure.print t)); + assert (t <> pure_bomb) + ) conv ; + List.iteri (fun i n -> + verbose ((string_of_int i) ^ "::: " ^ (Pure.print n)); + let t = Pure.mwhd (e',n,[]) in + verbose ((string_of_int i) ^ ":: " ^ (Pure.print t)); + assert (t = Scott.mk_n i) + ) ps ; + prerr_endline "-------- --------"; + `Separable p_finale.sigma ;; let problem_of (label, div, conv, ps, var_names) = diff --git a/ocaml/num.ml b/ocaml/num.ml index 2bc253d..69c87e0 100644 --- a/ocaml/num.ml +++ b/ocaml/num.ml @@ -114,27 +114,32 @@ end (* let rec string_of_term l = fun _ -> "";; *) -let rec string_of_term l = - let rec string_of_term_w_pars l = function - | `Var(n,ar) -> List.nth l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "") +let rec string_of_term = + let boundvar x = "v" ^ string_of_int x in + let varname lev l n = + if n < lev then boundvar (lev-n-1) + else if n < List.length l then List.nth l (n-lev) + else "`" ^ string_of_int (n-lev) in + let rec string_of_term_w_pars lev l = function + | `Var(n,ar) -> varname lev 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 :> nf) ^ ")" - | `Lam _ as t -> "(" ^ string_of_term_no_pars_lam l t ^ ")" + | `I _ as t -> "(" ^ string_of_term_no_pars_app lev l t ^ ")" + | `Lam _ as t -> "(" ^ string_of_term_no_pars_lam lev l t ^ ")" | `Match(t,(v,ar),bs_lift,bs,args) -> - "["^ List.nth l 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) ^ "] " ^ + (* assert (bs_lift = lev); *) + "["^ varname lev l v ^ (if debug_display_arities then ":"^ string_of_int ar else "") ^",match " ^ string_of_term_no_pars lev l (t :> nf) ^ + " with " ^ String.concat " | " (List.map (fun (n,t) -> string_of_int n ^ " => " ^ string_of_term l (t :> nf)) !bs) ^ "] " ^ String.concat " " (List.map (string_of_term l) (args :> nf list)) ^ ")" - and string_of_term_no_pars_app l = function - | `I((n,ar), args) -> List.nth 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(_,t) -> let name = "x" ^ string_of_int (List.length l) in - "λ" ^ 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 : nf -> string = function - | `Lam _ as t -> string_of_term_no_pars_lam l t - | #nf as t -> string_of_term_no_pars_app l t - in string_of_term_no_pars l + and string_of_term_no_pars_app lev l = function + | `I((n,ar), args) -> varname lev l n ^ (if debug_display_arities then ":" ^ string_of_int ar else "") ^ " " ^ String.concat " " (List.map (string_of_term_w_pars lev l) (Listx.to_list args :> nf list)) + | #nf as t -> string_of_term_w_pars lev l t + and string_of_term_no_pars_lam lev l = function + | `Lam(_,t) -> "λ" ^ boundvar lev ^ ". " ^ (string_of_term_no_pars_lam (lev+1) l t) + | _ as t -> string_of_term_no_pars lev l t + and string_of_term_no_pars lev l = function + | `Lam _ as t -> string_of_term_no_pars_lam lev l t + | #nf as t -> string_of_term_no_pars_app lev l t + in string_of_term_no_pars 0 ;; let print ?(l=[]) = string_of_term l;; -- 2.39.2