X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ocaml%2Flambda4.ml;h=9395daa7e0998eca7c8f9bd2a3ccca8be25f164e;hb=18e8638888e5e47d755a6c7c4bff37a1a6ec026b;hp=311537a151c3409ace586ee7ef0982a2a2ed8ceb;hpb=5a57b32e5e068d05c1feb7455861bc8d5e4bd05a;p=fireball-separation.git diff --git a/ocaml/lambda4.ml b/ocaml/lambda4.ml index 311537a..9395daa 100644 --- a/ocaml/lambda4.ml +++ b/ocaml/lambda4.ml @@ -632,18 +632,6 @@ let optimize_numerals p = 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 -> ([], Pure.V n, []) ) :: e - in aux 0 -;; (* ************************************************************************** *) type result = [ @@ -694,8 +682,7 @@ let solve p = 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 "-----------------"; (function @@ -707,7 +694,7 @@ let solve p = | 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 ;