*)
let num_more_args = 2;;
+type discriminating_set = (int * nf) list;;
+
type problem =
{ freshno: int
; div: i_var option (* None = bomb *)
; conv: i_n_var list (* the inerts that must converge *)
; ps: i_n_var list (* the n-th inert must become n *)
; sigma: (int * nf) list (* the computed substitution *)
- ; deltas: (int * nf) list ref list (* collection of all branches *)
+ ; deltas: discriminating_set ref list (* collection of all branches *)
; initialSpecialK: int
+
+ ; trail: discriminating_set list list
};;
+exception Backtrack of string
+
+let first bound p var f =
+ let p = {p with trail = (List.map (!) p.deltas)::p.trail} in
+ let rec aux i =
+ if i > bound then
+ raise (Backtrack ("no more alternatives for " ^ string_of_var var))
+ else
+ try
+ f p i
+ with
+ Backtrack s ->
+prerr_endline ("!!BACKTRACK!! " ^ s);
+ List.iter (fun (r,l) -> r := l) (List.combine p.deltas (List.hd p.trail)) ;
+prerr_endline("Now trying var="^string_of_var var^" i="^string_of_int i);
+ aux (i+1)
+ in
+ aux 1
+
+
let all_terms p =
(match p.div with None -> [] | Some t -> [(t :> i_n_var)])
@ p.conv
let sum_arities p =
let rec aux = function
- | `N _ -> 0
+ | `N _ | `Bottom | `Pacman -> 0
| `Var(_,ar) -> if ar = min_int then 0 else max 0 ar (*assert (ar >= 0); ar*)
| `Lam(_,t) -> aux t
- | `I(v,args) -> aux (`Var v) + aux_many (Listx.to_list args)
- | `Match(u,(_,ar),_,_,args) -> aux (u :> nf) + (if ar = min_int then 0 else ar - 1) + aux_many args
+ | `I(v,args) -> aux (`Var v) + aux_many (Listx.to_list args :> nf list)
+ | `Match(u,(_,ar),_,_,args) -> aux (u :> nf) + (if ar = min_int then 0 else ar - 1) + aux_many (args :> nf list)
and aux_many tms = List.fold_right ((+) ++ aux) tms 0 in
aux_many (all_terms p :> nf list)
;;
-let count_fakevars p =
- let rec aux = function
- | `N _ -> 0
- | `Var(_,ar) -> if ar = min_int then 1 else 0
- | `Lam(_,t) -> aux t
- | `I(v,args) -> aux (`Var v) + aux_many (Listx.to_list args)
- | `Match(u,v,_,_,args) -> aux (u :> nf) + aux (`Var v) + aux_many args
- and aux_many tms = List.fold_right ((+) ++ aux) tms 0 in
- aux_many (all_terms p :> nf list)
-;;
-
-(* let problem_measure p = count_fakevars p, sum_arities p;;
-let string_of_measure (a,b) = "(fakevars="^string_of_int a^",sum_arities="^string_of_int b^")" *)
-
let problem_measure p = sum_arities p;;
let string_of_measure = string_of_int;;
-let print_problem label ({freshno; div; conv; ps; deltas} as p) =
+let string_of_problem label ({freshno; div; conv; ps; deltas} as p) =
Console.print_hline ();
prerr_endline ("\n||||| Displaying problem: " ^ label ^ " |||||");
- let nl = "\n| " in
+ let nl = "\n " in
let deltas = String.concat nl (List.map (fun r -> String.concat " <> " (List.map (fun (i,_) -> string_of_int i) !r)) deltas) in
let l = Array.to_list (Array.init (freshno + 1) string_of_var) in
nl ^ "measure="^string_of_measure(problem_measure p)^" freshno = " ^ string_of_int freshno
- ^ nl ^ "\b> DISCRIMINATING SETS (deltas)"
- ^ nl ^ deltas ^ (if deltas = "" then "" else nl)
- ^ "\b> DIVERGENT" ^ nl
- ^ "*: " ^ (match div with None -> "*" | Some div -> print ~l (div :> nf)) ^ "\n| "
- ^ "\b> CONVERGENT" ^ nl
- ^ String.concat "\n| " (List.map (fun t -> "_: " ^ (if t = `N (-1) then "_" else print ~l (t :> nf))) conv) ^
- (if conv = [] then "" else "\n| ")
- ^ "\b> NUMERIC" ^ nl
- ^ String.concat "\n| " (List.mapi (fun i t -> string_of_int i ^ ": " ^ print ~l (t :> nf)) ps)
+ ^nl^"\b> DISCRIMINATING SETS (deltas)"
+ ^nl^"(*"^deltas^(if deltas = "" then "" else "*)"^nl)
+ ^"\b (* DIVERGENT *)" ^ nl
+ ^" "^ (match div with None -> "None" | Some div -> "(Some\""^ print ~l (div :> nf) ^"\" ") ^ nl
+ ^"\b (* CONVERGENT *) [" ^ nl
+ ^ String.concat "\n " (List.map (fun t -> "(* _: *) " ^ (if t = `N (-1) then "PAC;" else "\""^ print ~l (t :> nf) ^"\";")) conv) ^
+ (if conv = [] then "" else nl)
+ ^ "\b] (* NUMERIC *) [" ^ nl
+ ^ String.concat "\n " (List.mapi (fun i t -> " (* "^ string_of_int i ^" *) \"" ^ print ~l (t :> nf) ^ "\";") ps)
^ nl
;;
let failwithProblem p reason =
- print_endline (print_problem "FAIL" p);
+ print_endline (string_of_problem "FAIL" p);
failwith reason
;;
;;
let simple_expand_match ps =
- let rec aux level = function
+ let rec aux_nob level = function
| #i_num_var as t -> aux_i_num_var level t
| `Lam(b,t) -> `Lam(b,aux (level+1) t)
+ | `Pacman as t -> t
+ and aux level = function
+ | `Bottom as t -> t
+ | #nf_nob as t -> aux_nob level t
and aux_i_num_var level = function
| `Match(u,v,bs_lift,bs,args) as torig ->
let u = aux_i_num_var level u in
(match u with
| #i_n_var as u ->
let i = index_of (lift (-level) u) (ps :> nf list) (* can raise Not_found *)
- in let t = mk_match (`N i) v bs_lift bs args in
+ in let t = mk_match (`N i) v bs_lift bs (args :> nf list) in
if t <> torig then
aux level (t :> nf)
else raise Not_found
| _ -> raise Not_found)
with Not_found ->
- `Match(cast_to_i_num_var u,v,bs_lift,bs,List.map (aux level) args))
- | `I(v,args) -> `I(v,Listx.map (aux level) args)
+ mk_appl (`Match(cast_to_i_num_var u,v,bs_lift,bs,[])) (List.map (aux_nob level) args))
+ | `I(v,args) -> mk_appl (`Var v) (List.map (aux_nob level) (Listx.to_list args))
| `N _ | `Var _ as t -> t
in aux_i_num_var 0
;;
List.hd divs) div in
{p with div=option_map cast_to_i_var div; ps=List.map cast_to_i_n_var ps; conv=List.map cast_to_i_n_var conv}
-exception ExpandedToLambda;;
+let cast_to_ps =
+ function
+ #i_num_var as y -> (y : i_num_var)
+ | `Bottom | `Pacman -> raise (Backtrack "foo")
+ | t ->
+ prerr_endline (print (t :> nf));
+ assert false (* algorithm failed *)
let subst_in_problem x inst ({freshno; div; conv; ps; sigma} as p) =
let len_ps = List.length ps in
| [] -> acc
| t::todo_conv ->
(*prerr_endline ("EXPAND t:" ^ print (t :> nf));*)
- (* try *)
let t = subst false false x inst (t :> nf) in
(*prerr_endline ("SUBSTITUTED t:" ^ print (t :> nf));*)
let freshno,new_t,acc_new_ps =
expand_match (freshno,ps,acc_new_ps) t
in
aux' ps (freshno,acc_conv@[new_t],acc_new_ps) todo_conv
- (* with ExpandedToLambda -> aux' ps (freshno,acc_conv@[`N(-1)],acc_new_ps) todo_conv *)
(* cut&paste from aux' above *)
and aux'' ps (freshno,acc_new_ps) =
match u with
| `N i -> acc_new_ps,i
| _ ->
- let ps = List.map (fun t -> cast_to_i_num_var (subst false false x inst (t:> nf))) (acc_ps@acc_new_ps) in
+ let ps = List.map (fun t -> cast_to_ps (subst false false x inst (t:> nf))) (acc_ps@acc_new_ps) in
let super_simplified_ps = super_simplify_ps ps ps in
(*prerr_endline ("CERCO u:" ^ print (fst u :> nf));
List.iter (fun x -> prerr_endline ("IN: " ^ print (fst x :> nf))) ps;
bs := !bs @ [i, v] ;
freshno in
(*prerr_endlie ("t DA RIDURRE:" ^ print (`Match(`N i,arity,bs_lift,bs,args) :> nf) ^ " more_args=" ^ string_of_int more_args);*)
- let t = mk_match (`N i) orig bs_lift bs args in
+ let t = mk_match (`N i) orig bs_lift bs (args :> nf list) in
(*prerr_endline ("NUOVO t:" ^ print (fst t :> nf) ^ " more_args=" ^ string_of_int (snd t));*)
expand_match (freshno,acc_ps,acc_new_ps) t
- | `Lam _ -> raise ExpandedToLambda
+ | `Lam _ -> assert false (* algorithm invariant/loose typing *)
+ | `Bottom | `Pacman -> raise (Backtrack "BOT or PAC in toplevel numeric positioon")
| #i_n_var as x ->
let x = simple_expand_match (acc_ps@acc_new_ps) x in
freshno,cast_to_i_num_var x,acc_new_ps in
);
let p = {p with sigma = sigma@[x,inst]} in
let p = super_simplify p in
- prerr_endline (print_problem "instantiate" p);
+ prerr_endline (string_of_problem "instantiate" p);
p
;;
function
`N _
| `Var _
- | `Lam _ -> ()
+ | `Lam _
+ | `Pacman -> ()
| `Match(t,_,liftno,bs,args) ->
(* CSC: XXX partial dependency on the encoding *)
(match t with
function
`N _
| `Var _
- | `Lam _ -> []
+ | `Lam _
+ | `Pacman -> []
| `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') (List.length args + 2)
+ | `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
)
- | `I((k,_),args) -> dangerous_inert_conv arities showstoppers k (Listx.to_list args) 0
-
-and dangerous_inert_conv arities showstoppers k args more_args =
- concat_map (dangerous_conv arities showstoppers) args @
- if List.mem k showstoppers then k :: concat_map free_vars args else
+ | `I((k,_),args) -> dangerous_inert_conv arities showstoppers k (Listx.to_list args) [] 0
+
+and dangerous_inert_conv 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 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);
if more_args > 0 (* match argument*) && List.length args = arity then []
- else if List.length args + more_args > arity then k :: concat_map free_vars args else []
+ else if List.length all_args + more_args > arity then k :: concat_map free_vars all_args else []
with
Not_found -> []
+ ) else k :: concat_map free_vars all_args
(* inefficient algorithm *)
let rec edible arities div ps conv showstoppers =
None -> aux showstoppers xs
| Some h ->
try
- dangerous arities showstoppers (x : i_n_var :> nf) ;
+ dangerous arities showstoppers (x : i_n_var :> nf_nob) ;
aux showstoppers xs
with
Dangerous ->
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 arities showstoppers) conv 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;
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 arities p.div ps (p.conv :> nf_nob list) 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 old_conv = p.conv in
let p = { p with ps; conv } in
if l <> [] || old_conv <> conv
- then prerr_endline (print_problem "eat" p);
+ then prerr_endline (string_of_problem "eat" p);
if List.for_all (function `N _ -> true | _ -> false) ps && p.div = None then
`Finished p
else
`Continue p
-let instantiate p x n =
+let instantiate p x perm n =
(if hd_of_i_var (cast_to_i_var !bomb) = x
then failwithProblem p ("BOMB (" ^ string_of_nf !bomb ^ ") cannot be instantiated!"));
let arity_of_x = max_arity_tms x (all_terms p) in
(if arity_of_x = None then failwithProblem p "step on var non occurring in problem");
- (if Util.option_get(arity_of_x) = min_int then failwithProblem p "step on fake variable");
- (if Util.option_get(arity_of_x) <= 0 then failwithProblem p "step on var of non-positive arity");
+ let arity_of_x = Util.option_get(arity_of_x) in
+ (if arity_of_x = min_int then failwithProblem p "step on fake variable");
+ (if arity_of_x <= 0 then failwithProblem p "step on var of non-positive arity");
+ (if perm < 1 || perm > arity_of_x then
+ failwithProblem p ("Tried to permutate variable "^ string_of_var x ^" beyond its max arity"));
let n = (prerr_endline "WARNING: using constant initialSpecialK"); p.initialSpecialK in
- (* AC: Once upon a time, it was:
- let arities = Num.compute_arities x (n+1) (all_terms p :> nf list) in *)
- (* let arities = Array.to_list (Array.make (n+1) 0) in *)
let arities = Array.to_list (Array.make (n+1) min_int) in
let p,vars = make_fresh_vars p arities in
- let args = Listx.from_list (vars :> nf list) in
+ (* manual lifting of vars by perm in next line *)
+ let vars = List.map (function `Var (n,ar) -> `Var (n+perm,ar)) vars in
+ let args = Listx.from_list vars in
let bs = ref [] in
+ (* other_vars are the variables which are delayed and re-applied to the match *)
+ let other_vars = Array.mapi (fun n () -> `Var(n+1,min_int)) (Array.make (perm-1) ()) in
+ let other_vars = Array.to_list other_vars in
(* 666, since it will be replaced anyway during subst: *)
- let inst = `Lam(false,`Match(`I((0,min_int),Listx.map (lift 1) args),(x,666),1,bs,[])) in
+ let inst = `Match(`I((0,min_int),args),(x,-666),perm,bs,other_vars) in
+ (* Add a number of 'perm' leading lambdas *)
+ let inst = Array.fold_left (fun t () -> `Lam(false, t)) inst (Array.make perm ()) in
let p = {p with deltas=bs::p.deltas} in
subst_in_problem x inst p
;;
let compute_special_k tms =
- let rec aux k (t: nf) = Pervasives.max k (match t with
- | `Lam(b,t) -> aux (k + if b then 1 else 0) t
- | `I(n, tms) -> Listx.max (Listx.map (aux 0) tms)
- | `Match(t, _, liftno, bs, args) ->
- List.fold_left max 0 (List.map (aux 0) ((t :> nf)::args@List.map snd !bs))
- | `N _ -> 0
- | `Var _ -> 0
- ) in Listx.max (Listx.map (aux 0) tms)
+ let rec aux k (t: nf) = Pervasives.max k (match t with
+ | `Lam(b,t) -> aux (k + if b then 1 else 0) t
+ | `I(n, tms) -> Listx.max (Listx.map (aux 0) (tms :> nf Listx.listx))
+ | `Match(t, _, liftno, bs, args) ->
+ List.fold_left max 0 (List.map (aux 0) ((t :> nf)::(args :> nf list)@List.map snd !bs))
+ | `N _
+ | `Bottom
+ | `Pacman
+ | `Var _ -> 0
+ ) in Listx.max (Listx.map (aux 0) tms)
;;
-let auto_instantiate (n,p) =
- let p, showstoppers_step, showstoppers_eat = critical_showstoppers p in
+let choose_step (n,p) =
+ let p, showstoppers_step, showstoppers_eat = critical_showstoppers p in
let x =
match showstoppers_step, showstoppers_eat with
- | [], y::_ ->
- prerr_endline ("INSTANTIATING CRITICAL TO EAT " ^ string_of_var y); y
- | [], [] ->
+ | [], y::_ ->
+ prerr_endline ("INSTANTIATING CRITICAL TO EAT " ^ string_of_var y); y
+ | [], [] ->
let heads =
(* Choose only variables still alive (with arity > 0) *)
List.sort compare (filter_map (
fun t -> match t with `Var _ -> None | x -> if arity_of_hd x <= 0 then None else hd_of x
) ((match p.div with Some t -> [(t :> i_n_var)] | _ -> []) @ p.ps)) in
(match heads with
- [] ->
- assert false
- | x::_ ->
- prerr_endline ("INSTANTIATING TO EAT " ^ string_of_var x);
- x)
+ | [] ->
+ (try
+ fst (List.find (((<) 0) ++ snd) (concat_map free_vars' (p.conv :> nf list)))
+ with
+ Not_found -> assert false)
+ | x::_ ->
+ prerr_endline ("INSTANTIATING TO EAT " ^ string_of_var x);
+ x)
| x::_, _ ->
prerr_endline ("INSTANTIATING " ^ string_of_var 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 *)
-let x =
- try
- match hd_of (List.find (fun t ->
- compute_special_k (Listx.Nil (t :> nf)) > 0 && arity_of_hd t > 0
- ) (all_terms p)) with
- None -> assert false
+ let x =
+ try
+ match
+ hd_of (List.find (fun t ->
+ compute_special_k (Listx.Nil (t :> nf)) > 0 && arity_of_hd t > 0
+ ) (all_terms p))
+ with
+ | None -> assert false
| Some x ->
prerr_endline ("INSTANTIATING AND HOPING " ^ string_of_var x);
x
- with
- Not_found -> x
-in
+ with
+ Not_found -> x in
(* Instantiate in decreasing order of compute_special_k
1:15m14s 2:13m14s 3:4m55s 4:4m43s 5:4m34s 6:6m28s 7:3m31s
let x =
compute_special_k (Listx.from_list (all_terms p :> nf list) )in
if special_k < n then
prerr_endline ("@@@@ NEW INSTANTIATE PHASE (" ^ string_of_int special_k ^ ") @@@@");
- let p = instantiate p x special_k in
- special_k,p
-
+ let arity_of_x = Util.option_get (max_arity_tms x (all_terms p)) in
+ x,arity_of_x,special_k
let rec auto_eat (n,p) =
prerr_endline "{{{{{{{{ Computing measure before auto_instantiate }}}}}}";
let m = problem_measure p in
- let (n,p') = auto_instantiate (n,p) in
- match eat p' with
- `Finished p -> p
- | `Continue p ->
- prerr_endline "{{{{{{{{ Computing measure inafter auto_instantiate }}}}}}";
- let m' = problem_measure p in
- let delta = compare m m' in
- print_endline ("compare " ^ string_of_measure m' ^ " " ^ string_of_measure m ^ "= " ^ string_of_int delta);
- (* let delta = m - problem_measure p' in *)
- if delta <= 0 then (
- failwith
- (* prerr_endline *)
- ("Measure did not decrease (delta=" ^ string_of_int delta ^ ")"))
- else prerr_endline ("$ Measure decreased by " ^ string_of_int delta);
- auto_eat (n,p)
+ let x, arity_of, n = choose_step (n,p) in
+ first arity_of p x (fun p j ->
+ let p' = instantiate p x j n in
+ match eat p' with
+ | `Finished p -> p
+ | `Continue p ->
+ prerr_endline "{{{{{{{{ Computing measure inafter auto_instantiate }}}}}}";
+ let delta = problem_measure p - m in
+ (* let delta = m - problem_measure p' in *)
+ if delta >= 0
+ then
+ (failwith
+ ("Measure did not decrease (+=" ^ string_of_int delta ^ ")"))
+ else prerr_endline ("$ Measure decreased of " ^ string_of_int delta);
+ auto_eat (n,p))
;;
let auto p n =
prerr_endline ("@@@@ FIRST INSTANTIATE PHASE (" ^ string_of_int n ^ ") @@@@");
match eat p with
- `Finished p -> p
+ | `Finished p -> p
| `Continue p -> auto_eat (n,p)
;;
let replace_in_sigma perm =
let rec aux = function
| `N n -> `N (List.nth perm n)
+ | `Pacman
| `I _ -> assert false
| `Var _ as t -> t
| `Lam(v,t) -> `Lam(v, aux t)
| `Match(_,_,_,bs,_) as t -> (bs := List.map (fun (n,t) -> (List.nth perm n, t)) !bs); t
+ | `Bottom as t -> t
in List.map (fun (n,t) -> (n,aux t))
in
let deltas' = List.mapi (fun n d -> (n, List.map fst !d)) p.deltas in
if List.for_all (function `N _ -> true | _ -> false) ps && p.div = None then begin
p
end else
- let _ = prerr_endline (print_problem "main" p) in
+ let _ = prerr_endline (string_of_problem "main" p) in
let x,l =
match l with
| cmd::l -> cmd,l
`Step x in
match cmd with
| `DoneWith -> assert false (*aux (eat p) n l*) (* CSC: TODO *)
- | `Step x ->
- let x = var_of_string x in
- aux (instantiate p x n) n l
+ | `Step x -> assert false
+ (* let x = var_of_string x in
+ aux (instantiate p x 1 n) n l *)
| `Auto -> aux (auto p n) n l
in
List.iter
let p_finale = aux p n cmds in
let freshno,sigma = p_finale.freshno, p_finale.sigma in
prerr_endline ("------- <DONE> ------\n ");
- (* prerr_endline (print_problem "Original problem" p); *)
+ (* prerr_endline (string_of_problem "Original problem" p); *)
prerr_endline "---------------------";
let l = Array.to_list (Array.init (freshno + 1) string_of_var) in
prerr_endline (" BOMB == " ^ print ~l !bomb);
(* In this non-recursive version, the intermediate states may containt Matchs *)
List.map (fun t -> let t = subst false x inst (t :> nf) in cast_to_i_num_var t) ps)
(p.ps :> i_num_var list) sigma in
- prerr_endline (print_problem {p with ps= List.map (function t -> cast_to_i_n_var t) ps; freshno});
+ prerr_endline (string_of_problem {p with ps= List.map (function t -> cast_to_i_n_var t) ps; freshno});
List.iteri (fun i (n,more_args) -> assert (more_args = 0 && n = `N i)) ps ;
*)
prerr_endline "---------<OPT>----------";
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 "---------<PURE>---------";
- let div = option_map (fun div -> ToScott.t_of_nf (div :> nf)) p.div in
- let conv = List.map (fun t -> ToScott.t_of_nf (t :> nf)) p.conv in
- let ps = List.map (fun t -> ToScott.t_of_nf (t :> nf)) p.ps in
- let sigma = List.map (fun (x,inst) -> x, ToScott.t_of_nf inst) sigma in
+ let div = option_map (fun div -> ToScott.scott_of_nf (div :> nf)) p.div in
+ let conv = List.map (fun t -> ToScott.scott_of_nf (t :> nf)) p.conv in
+ let ps = List.map (fun t -> ToScott.scott_of_nf (t :> nf)) p.ps in
+ let sigma = List.map (fun (x,inst) -> x, ToScott.scott_of_nf inst) sigma in
(*let ps_ok = List.fold_left (fun ps (x,inst) ->
List.map (Pure.subst false x inst) ps) ps sigma in*)
let e = env_of_sigma freshno sigma true in
let t = Pure.mwhd (e',div,[]) in
prerr_endline ("*:: " ^ (Pure.print t));
prerr_endline (print !bomb);
- assert (t = ToScott.t_of_nf (!bomb:>nf))
+ assert (t = ToScott.scott_of_nf (!bomb:>nf))
| None -> ()) div;
List.iter (fun n ->
prerr_endline ("_::: " ^ (Pure.print n));
if match div with None -> false | Some div -> List.exists (eta_subterm div) (tms@conv)
then (
prerr_endline "--- TEST SKIPPED ---";
- {freshno=0; div=None; conv=[]; ps=[]; sigma=[]; deltas=[]; initialSpecialK=0}, 0, []
+ {freshno=0; div=None; conv=[]; ps=[]; sigma=[]; deltas=[]; initialSpecialK=0; trail=[]}, 0, []
) else
let tms = sort_uniq ~compare:eta_compare tms in
let special_k = compute_special_k (Listx.from_list all_tms) in (* compute initial special K *)
let deltas =
let dummy = `Var (max_int / 2, -666) in
[ ref (Array.to_list (Array.init (List.length ps) (fun i -> i, dummy))) ] in
-
- {freshno; div; conv; ps; sigma=[] ; deltas; initialSpecialK=special_k}, special_k, cmds
+ let trail = [] in
+ {freshno; div; conv; ps; sigma=[] ; deltas; initialSpecialK=special_k; trail}, special_k, cmds
;;
let magic strings cmds = magic_conv None [] strings cmds;;
projects / fireball-separation.git / blobdiff