Reverting to the previous version some files which weren't intended to be

[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 6bc725033352adce644a4d96558785ec195c7a9a..71ba8ddc284720f3ec8bed7fa0ed08c34b41d6d6 100644 (file)
--- 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,12 +142,25 @@ let _ =
        try load_graph u with exn -> ())
     roots_alluris;
   prerr_endline "finished....";
-  CicUniv.do_rank (get_graph ());
+  let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
   prerr_endline "caching objects";
+  let _ = 
+    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);
+         aux tl
+      | _ -> ()
+    in
+       aux lll
+  in
   prerr_endline "ranked....";
   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
     try 
@@ -128,7 +168,8 @@ let _ =
     with 
     | NCicTypeChecker.AssertFailure s 
     | NCicTypeChecker.TypeCheckerFailure s
-    | NCicEnvironment.ObjectNotFound s as e -> 
+    | NCicEnvironment.ObjectNotFound s
+    | NCicEnvironment.BadDependency s as e -> 
        prerr_endline ("######### " ^ Lazy.force s);
        if not ignore_exc then raise e
     )
@@ -142,7 +183,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;