X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_refiner%2Fcheck.ml;h=569dcb7df91b0a7cd84c9f1ae15f1f5ba86cc62c;hb=5c7b30c4b1033352578c6e38e4fcff4eb0930c44;hp=c1ce4260794ce9bb4388dc6a3f756f34eaa2ab5b;hpb=622b14b04e2076d75c283363969dab7d28380bfb;p=helm.git

diff --git a/helm/software/components/ng_refiner/check.ml b/helm/software/components/ng_refiner/check.ml
index c1ce42607..569dcb7df 100644
--- a/helm/software/components/ng_refiner/check.ml
+++ b/helm/software/components/ng_refiner/check.ml
@@ -66,6 +66,7 @@ let mk_cprop n =
 
 
 let _ =
+  Sys.catch_break true;
   let do_old_logging = ref true in
   HelmLogger.register_log_callback
    (fun ?append_NL html_msg ->
@@ -73,7 +74,6 @@ let _ =
       prerr_endline (HelmLogger.string_of_html_msg html_msg));
   CicParser.impredicative_set := false;
   NCicTypeChecker.set_logger logger;
-  NCicPp.set_ppterm NCicPp.trivial_pp_term;
   Helm_registry.load_from "conf.xml";
   let alluris = 
     try
@@ -193,23 +193,86 @@ let _ =
   NCicTypeChecker.set_logger (fun _ -> ());
   do_old_logging := false;
   prerr_endline "typechecking, first with the new and then with the old kernel";
-  let prima = Unix.gettimeofday () in
   List.iter 
     (fun u ->
-       let u= OCic2NCic.nuri_of_ouri u in
+      let u = OCic2NCic.nuri_of_ouri u in
       indent := 0;
-      NCicTypeChecker.typecheck_obj (NCicLibrary.get_obj u))
+      match NCicLibrary.get_obj u with
+      | _,_,_,_,NCic.Constant (_,_,_, ty, _) ->
+          let rec intros = function
+            | NCic.Prod (name, s, t) ->
+                let ctx, t = intros t in
+                ctx @ [(name, (NCic.Decl s))] , t
+            | t -> [], t
+          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 (Some ty) in a,b
+            | t -> 
+                NCicUntrusted.map_term_fold_a
+                 (fun e ctx -> e::ctx) ctx perforate menv 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 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 metasenv, subst = 
+            try 
+              NCicUnification.unify menv [] ctx left right
+            with
+            | NCicUnification.Uncertain msg 
+            | NCicUnification.UnificationFailure msg 
+            | NCicMetaSubst.MetaSubstFailure msg ->
+                prerr_endline (Lazy.force msg); 
+                [], []
+            | Sys.Break -> [],[]
+          in
+          if (NCicReduction.are_convertible ~subst ctx left right)
+          then
+            prerr_endline ("OK: " ^ NUri.string_of_uri u)
+          else
+            (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*)
+      | _ -> ())
     alluris;
-  let dopo = Unix.gettimeofday () in
-  Gc.compact ();
-  let dopo2 = Unix.gettimeofday () in
-  Printf.eprintf "NEW typing: %3.2f, gc: %3.2f\n%!" (dopo -. prima) (dopo2 -.  dopo);
-  CicEnvironment.invalidate ();
-  Gc.compact ();
-  let prima = Unix.gettimeofday () in
-  List.iter (fun u -> ignore (CicTypeChecker.typecheck u)) alluris;
-  let dopo = Unix.gettimeofday () in
-  Gc.compact ();
-  let dopo2 = Unix.gettimeofday () in
-  Printf.eprintf "OLD typing: %3.2f, gc: %3.2f\n%!" (dopo -. prima) (dopo2 -. dopo)
 ;;