X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2Fcheck.ml;h=a51d97722b3e9a207a63c24b635853c89e4587cd;hb=b637879a2b3f2ceda65afb3c950061189c4730b7;hp=5faab078fa48258fd883139e8edc65460d98f9c9;hpb=a07144619493a0ec53c5c2c9f3adcdf5b557dd5d;p=helm.git

diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml
index 5faab078f..a51d97722 100644
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -1,6 +1,19 @@
+(*
+    ||M||  This file is part of HELM, an Hypertextual, Electronic        
+    ||A||  Library of Mathematics, developed at the Computer Science     
+    ||T||  Department, University of Bologna, Italy.                     
+    ||I||                                                                
+    ||T||  HELM is free software; you can redistribute it and/or         
+    ||A||  modify it under the terms of the GNU General Public License   
+    \   /  version 2 or (at your option) any later version.      
+     \ /   This software is distributed as is, NO WARRANTY.     
+      V_______________________________________________________________ *)
+
+(* $Id$ *)
+
 let debug = true
 let ignore_exc = false
-let rank_all_dependencies = true
+let rank_all_dependencies = false
 let trust_environment = false
 
 let indent = ref 0;;
@@ -37,6 +50,20 @@ let logger =
            prerr_endline (do_indent () ^ "Trust: " ^ NUri.string_of_uri s))
 ;;
 
+let mk_type n = 
+  if n = 0 then
+     [false, NUri.uri_of_string ("cic:/matita/pts/Type.univ")]
+  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 _ =
   let do_old_logging = ref true in
   HelmLogger.register_log_callback
@@ -115,23 +142,45 @@ let _ =
        try load_graph u with exn -> ())
     roots_alluris;
   prerr_endline "finished....";
-  CicUniv.do_rank (get_graph ());
-  prerr_endline "caching objects";
+  let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
+  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= NUri.nuri_of_ouri uu in
+    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 as e -> 
+    | 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
-    | NCicEnvironment.Object_not_found s -> 
-       prerr_endline ("Obj not found: " ^ UriManager.string_of_uri s)
     )
     alluris;
   NCicEnvironment.invalidate ();
@@ -143,7 +192,7 @@ let _ =
   let prima = Unix.gettimeofday () in
   List.iter 
     (fun u ->
-       let u= NUri.nuri_of_ouri u in
+       let u= OCic2NCic.nuri_of_ouri u in
       indent := 0;
       NCicTypeChecker.typecheck_obj (NCicLibrary.get_obj u))
     alluris;