X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2Fcheck.ml;h=164e1a223c5eb1ae372ef3e9e4ec70041c98414e;hb=6033870314160f36fa814914550682b304beaba0;hp=a793cf05978817f49e8a6ae00180994000545ef6;hpb=a3ff8f4f61a45e8c269322275956fad0805da8bc;p=helm.git

diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml
index a793cf059..164e1a223 100644
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -56,8 +56,13 @@ let mk_type n =
   else
      [false, NUri.uri_of_string ("cic:/matita/pts/Type"^string_of_int n^".univ")]
 ;;
+let mk_cprop n = 
+  if n = 0 then 
+    [false, NUri.uri_of_string ("cic:/matita/pts/CProp.univ")]
+  else
+    [false, NUri.uri_of_string ("cic:/matita/pts/CProp"^string_of_int n^".univ")]
+;;
 
-let cprop = [false, NUri.uri_of_string ("cic:/matita/pts/CProp.univ")];;
 
 let _ =
   let do_old_logging = ref true in
@@ -137,30 +142,45 @@ let _ =
        try load_graph u with exn -> ())
     roots_alluris;
   prerr_endline "finished....";
-  let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
-  prerr_endline "caching objects";
-  NCicEnvironment.add_constraint true cprop (mk_type 0);
+  let lll, uuu =(CicUniv.do_rank (get_graph ())) in
+  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;
   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_cprop a) (mk_type 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