more work

[helm.git] / helm / software / components / ng_refiner / check.ml

diff --git a/helm/software/components/ng_refiner/check.ml b/helm/software/components/ng_refiner/check.ml
index 3a155329e679ba235f2c5da77987ae69455b96c4..7fe8cf3663303b9820f10141be11a79f7c3cae09 100644 (file)
--- a/helm/software/components/ng_refiner/check.ml
+++ b/helm/software/components/ng_refiner/check.ml
@@ -205,45 +205,90 @@ let _ =
                 ctx @ [(name, (NCic.Decl s))] , t
             | t -> [], t
           in
-          let ctx, ity = intros ty in
+          let rec perforate ctx menv = function
+            | NCic.Appl (NCic.Const (NReference.Ref (u,_))::ty::_)
+              when NUri.string_of_uri u = "cic:/matita/tests/hole.con" ->
+                let menv, ty =  perforate ctx menv ty in
+                let a,b,_ = NCicMetaSubst.mk_meta menv ctx (`WithType ty) in a,b
+            | t -> 
+                NCicUntrusted.map_term_fold_a
+                 (fun e ctx -> e::ctx) ctx perforate menv t
+          in
+          let rec curryfy ctx = function
+            | NCic.Lambda (name, s, tgt) ->
+                let tgt = curryfy ((name,NCic.Decl s) :: ctx) tgt in
+                NCic.Lambda (name, NCic.Implicit `Type, tgt)
+            | t -> 
+                NCicUtils.map
+                 (fun e ctx -> e::ctx) ctx curryfy t
+          in
+(*
+          let ctx, pty = intros ty in
+          let menv, pty = perforate ctx [] pty in
+*)
+(*
           let sty, menv, _ = 
             NCicMetaSubst.saturate ~delta:max_int [] ctx ty 0
           in
-          let ctx, ty = intros ty in
+*)
+(*           let ctx, ty = intros ty in *)
+(*
+          let left, right = 
+            match  NCicReduction.whd ~delta:max_int ctx pty with
+            | NCic.Appl [eq;t;a;b] -> a, b
+            | _-> assert false
+          in
+*)             
+
+(*
           let whd ty =
             match ty with
             | NCic.Appl [eq;t;a;b] ->
                NCic.Appl [eq;t;NCicReduction.whd ~delta:0 ctx a;b]
             | t -> NCicReduction.whd ~delta:0 ctx t
           in
+*)
 (*
                 prerr_endline 
                  (Printf.sprintf "%s == %s"
                  (NCicPp.ppterm ~metasenv:menv ~subst:[] ~context:ctx ity)
                  (NCicPp.ppterm ~metasenv:menv ~subst:[] ~context:ctx sty));
 *)
+          let menv, subst, bo, infty = 
+            NCicRefiner.typeof [] [] [] (curryfy [] bo) None
+          in
           let metasenv, subst = 
             try 
-(*                     prerr_endline ("INIZIO: " ^ NUri.string_of_uri u); *)
-              NCicUnification.unify menv [] ctx ity (whd sty) 
+              NCicUnification.unify menv subst [] infty ty
             with
             | NCicUnification.Uncertain msg 
             | NCicUnification.UnificationFailure msg 
             | NCicMetaSubst.MetaSubstFailure msg ->
                 prerr_endline (Lazy.force msg); 
-                prerr_endline 
-                 (Printf.sprintf "RESULT OF UNIF\n%s\n%s == %s\n"
-                 (NCicPp.ppcontext ~metasenv:menv ~subst:[] ctx)
-                 (NCicPp.ppterm ~metasenv:menv ~subst:[] ~context:ctx ity)
-                 (NCicPp.ppterm ~metasenv:menv ~subst:[] ~context:ctx sty));
                 [], []
             | Sys.Break -> [],[]
           in
-          if (NCicReduction.are_convertible ~subst ctx ity sty)
+          if (NCicReduction.are_convertible ~subst [] infty ty)
           then
             prerr_endline ("OK: " ^ NUri.string_of_uri u)
           else
-            prerr_endline ("FAIL: " ^ NUri.string_of_uri u);
+            (
+          let ctx = [] in
+          let right = infty in
+          let left = ty in
+                    
+                    prerr_endline ("FAIL: " ^ NUri.string_of_uri u);
+                prerr_endline 
+                 (Printf.sprintf 
+                   ("\t\tRESULT OF UNIF\n\nsubst:\n%s\nmenv:\n%s\n" ^^ 
+                   "context:\n%s\n%s == %s\n%s == %s\n")
+                 (NCicPp.ppsubst ~metasenv subst)
+                 (NCicPp.ppmetasenv ~subst metasenv)
+                 (NCicPp.ppcontext ~metasenv ~subst ctx)
+                 (NCicPp.ppterm ~metasenv ~subst:[] ~context:ctx left)
+                 (NCicPp.ppterm ~metasenv ~subst:[] ~context:ctx right)
+                 (NCicPp.ppterm ~metasenv ~subst ~context:ctx left)
+                 (NCicPp.ppterm ~metasenv ~subst ~context:ctx right) ))
           (*let inferred_ty = 
             NCicTypeChecker.typeof ~subst:[] ~metasenv:[] [] bo
           in*)