EXPERIMENTAL COMMIT (part B, by CSC :-):

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

diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml
index a61e6a8ffb0fec4a289ccb6c078a9e17cdd33d7b..d10b771aad2b249618ba4178db18ceba1cd955a6 100644 (file)
--- 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;;
 
@@ -143,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;
@@ -177,13 +178,21 @@ let _ =
     try 
       NCicTypeChecker.typecheck_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 ();