open Pure
open Num
-let bomb = ref(`Var(-1,-666));;
+let divergent = ref(`Var(-1, -666));;
(*
The number of arguments which can applied to numbers
| Some div ->
if List.mem (hd_of_i_var div) inedible
then p
- else
- let n = match div with `I(_,args) -> Listx.length args | `Var _ -> 0 in
- let p, bomb' = make_fresh_var p (-666) in
- (if !bomb <> `Var (-1,-666) then
- failwithProblem p
- ("Bomb was duplicated! It was " ^ string_of_nf !bomb ^
- ", tried to change it to " ^ string_of_nf bomb'));
- bomb := bomb';
- 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
- 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
+ else (divergent := `Var(hd_of_i_var div, -666); {p with div=None}) in
+ let dangerous_conv = 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 p.var_names) l))) dangerous_conv;
let conv =
`Continue p
let instantiate p x 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");
replace_in_sigma (List.rev perm) p.sigma
;;
-let env_of_sigma freshno sigma should_explode =
- let rec aux n =
- if n > freshno then
- []
- else
- let e = aux (n+1) in
- (try
- e,Pure.lift (-n-1) (snd (List.find (fun (i,_) -> i = n) sigma)),[]
- with
- Not_found ->
- if n = hd_of_i_var (cast_to_i_var !bomb)
- then ([], Pure.omega should_explode, [])
- else ([], Pure.V n, []) ) :: e
- in aux 0
-;;
(* ************************************************************************** *)
type result = [
match check p with
| Some s -> `Unseparable s
| None ->
- bomb := `Var(-1,-666);
Console.print_hline();
let p_finale = auto p p.initialSpecialK in
let freshno,sigma = p_finale.freshno, p_finale.sigma in
(string_of_var p_finale.var_names x ^ " := " ^ string_of_term p_finale inst)) sigma;
prerr_endline "---------<PURE>---------";
+ ToScott.bomb := !divergent;
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 in
- let e'' = env_of_sigma freshno sigma' true in
+ let e' = Pure.env_of_sigma freshno sigma' in
prerr_endline "--------<REDUCE>---------";
(function
| None -> ()) div;
List.iter (fun n ->
verbose ("_::: " ^ (Pure.print n));
- let t = Pure.mwhd (e'',n,[]) in
+ let t = Pure.mwhd (e',n,[]) in
verbose ("_:: " ^ (Pure.print t));
assert (not (Pure.diverged t))
) conv ;