metavariable context has a separator now

[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 4f99dd05783aaf1554a0699bb9da1f48c66b89c7..a51d97722b3e9a207a63c24b635853c89e4587cd 100644 (file)
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -12,8 +12,7 @@
 (* $Id$ *)
 
 let debug = true
-let ignore_exc = true
-let ignore_exc_new_typing = true
+let ignore_exc = false
 let rank_all_dependencies = false
 let trust_environment = false
 
@@ -144,32 +143,41 @@ let _ =
     roots_alluris;
   prerr_endline "finished....";
   let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
-  prerr_endline "caching objects";
   let _ = 
+    try
     let rec aux = function
       | a::(b::_ as tl) ->
          NCicEnvironment.add_constraint true (mk_type a) (mk_type b);
          NCicEnvironment.add_constraint true (mk_cprop a) (mk_cprop b);
-         NCicEnvironment.add_constraint true (mk_type a) (mk_cprop a);
          NCicEnvironment.add_constraint true (mk_cprop a) (mk_type b);
-         NCicEnvironment.add_constraint true (mk_type b) (mk_cprop b);
+         NCicEnvironment.add_constraint true (mk_type a) (mk_cprop b);
+         NCicEnvironment.add_constraint false (mk_cprop a) (mk_type a);
+         NCicEnvironment.add_constraint false (mk_type a) (mk_cprop a);
          aux tl
+      | [a] -> 
+         NCicEnvironment.add_constraint false (mk_type a) (mk_cprop a);
+         NCicEnvironment.add_constraint false (mk_cprop a) (mk_type a);
       | _ -> ()
     in
        aux lll
+    with NCicEnvironment.BadConstraint s as e ->
+      prerr_endline (Lazy.force s); raise e
   in
   prerr_endline "ranked....";
+  prerr_endline (NCicEnvironment.pp_constraints ());
   HExtlib.profiling_enabled := false;
   List.iter (fun uu ->
     let uu= OCic2NCic.nuri_of_ouri uu in
     indent := 0;
     let o = NCicLibrary.get_obj uu in
+       prerr_endline (NCicPp.ppobj o); 
     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
@@ -186,14 +194,7 @@ let _ =
     (fun u ->
        let u= OCic2NCic.nuri_of_ouri u in
       indent := 0;
-      try NCicTypeChecker.typecheck_obj (NCicLibrary.get_obj u)
-      with 
-      | NCicTypeChecker.AssertFailure s
-      | NCicTypeChecker.TypeCheckerFailure s
-      | NCicEnvironment.ObjectNotFound s
-      | NCicEnvironment.BadDependency s as e ->
-         prerr_endline ("######### " ^ Lazy.force s);
-         if not ignore_exc_new_typing then raise e)
+      NCicTypeChecker.typecheck_obj (NCicLibrary.get_obj u))
     alluris;
   let dopo = Unix.gettimeofday () in
   Gc.compact ();