X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2Fcheck.ml;h=f5fb6841c39a47efdc878408a1eb5a20f7f9deea;hb=7f9e313fe5ae4200f080f481a6b8b795a0618093;hp=c1ce4260794ce9bb4388dc6a3f756f34eaa2ab5b;hpb=ba51bf0b8c39758349299db24e31785acaf3ac51;p=helm.git

diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml
index c1ce42607..f5fb6841c 100644
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -15,7 +15,7 @@ let debug = true
 let ignore_exc = false
 let rank_all_dependencies = false
 let trust_environment = false
-let print_object = false
+let print_object = true
 
 let indent = ref 0;;
 
@@ -73,7 +73,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
@@ -144,6 +143,7 @@ let _ =
     roots_alluris;
   prerr_endline "finished....";
   let lll, uuu =(CicUniv.do_rank (get_graph ())) in
+  CicUniv.print_ugraph (get_graph ());
   let lll = List.sort compare lll in
   List.iter (fun k -> 
     prerr_endline (CicUniv.string_of_universe k ^ " = " ^ string_of_int (CicUniv.get_rank k))) uuu;
@@ -176,15 +176,23 @@ let _ =
     let o = NCicLibrary.get_obj uu in
     if print_object then prerr_endline (NCicPp.ppobj o); 
     try 
-      NCicTypeChecker.typecheck_obj o
+      NCicEnvironment.check_and_add_obj o
     with 
-    | NCicTypeChecker.AssertFailure s 
-    | NCicTypeChecker.TypeCheckerFailure s
-    | NCicEnvironment.ObjectNotFound s
-    | NCicEnvironment.BadConstraint s
-    | NCicEnvironment.BadDependency s as e -> 
-       prerr_endline ("######### " ^ Lazy.force s);
-       if not ignore_exc then raise e
+    exn ->
+      let rec aux = function
+       | NCicTypeChecker.AssertFailure s 
+       | NCicTypeChecker.TypeCheckerFailure s
+       | NCicEnvironment.ObjectNotFound s
+       | NCicEnvironment.BadConstraint s as e-> 
+          prerr_endline ("######### " ^ Lazy.force s);
+          if not ignore_exc then raise e
+       | NCicEnvironment.BadDependency (s,x) as e -> 
+          prerr_endline ("######### " ^ Lazy.force s);
+          aux x;
+          if not ignore_exc then raise e
+       | e -> raise e
+      in
+       aux exn
     )
     alluris;
   NCicEnvironment.invalidate ();
@@ -196,9 +204,9 @@ let _ =
   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))
+      ignore (NCicEnvironment.get_checked_obj u))
     alluris;
   let dopo = Unix.gettimeofday () in
   Gc.compact ();