Added cprop <= type constraint.

[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 132ce5b7f350ea0ef660f9b8448ca7bdcfdda5e4..a793cf05978817f49e8a6ae00180994000545ef6 100644 (file)
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -1,28 +1,70 @@
+(*
+    ||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;;
 
+let load_graph, get_graph =
+ let oldg = ref CicUniv.empty_ugraph in
+  (function uri -> 
+    let _,g = CicEnvironment.get_obj !oldg uri in
+     oldg := g),
+  (function _ -> !oldg)
+;;
+
 let logger =
     let do_indent () = String.make !indent ' ' in  
     (function 
-    | `Start_type_checking s -> ();
-        if debug then
-         prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s); 
-        incr indent
+      | `Start_type_checking s ->
+          if debug then
+           prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s); 
+          incr indent
+      | `Type_checking_completed s ->
+          decr indent;
+          if debug then
+           prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s)
+      | `Type_checking_interrupted s ->
+          decr indent;
+          if debug then
+           prerr_endline (do_indent () ^ "Break: " ^ NUri.string_of_uri s)
+      | `Type_checking_failed s ->
+          decr indent;
+          if debug then
+           prerr_endline (do_indent () ^ "Fail: " ^ NUri.string_of_uri s)
+      | `Trust_obj s ->
+          if debug then
+           prerr_endline (do_indent () ^ "Trust: " ^ NUri.string_of_uri s))
+;;
 
-    | `Type_checking_completed s ->  ();
-        decr indent;
-        if debug then
-         prerr_endline (do_indent () ^ "End: " ^ 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 cprop = [false, NUri.uri_of_string ("cic:/matita/pts/CProp.univ")];;
+
 let _ =
+  let do_old_logging = ref true in
   HelmLogger.register_log_callback
    (fun ?append_NL html_msg ->
-     prerr_endline (HelmLogger.string_of_html_msg html_msg));
+     if !do_old_logging then
+      prerr_endline (HelmLogger.string_of_html_msg html_msg));
   CicParser.impredicative_set := false;
   NCicTypeChecker.set_logger logger;
   NCicPp.set_ppterm NCicPp.trivial_pp_term;
@@ -92,41 +134,50 @@ let _ =
   List.iter 
     (fun u -> 
        prerr_endline ("  - "^UriManager.string_of_uri u);
-       try NCicEnvironment.load_graph u with exn -> ())
+       try load_graph u with exn -> ())
     roots_alluris;
   prerr_endline "finished....";
-  CicUniv.do_rank (NCicEnvironment.get_graph ());
+  let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
   prerr_endline "caching objects";
+  NCicEnvironment.add_constraint true cprop (mk_type 0);
+  let _ = 
+    let rec aux = function
+      | a::(b::_ as tl) ->
+         NCicEnvironment.add_constraint true (mk_type a) (mk_type 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
-     indent := 0;
-     logger (`Start_type_checking uu);
-    let _,o = NCicEnvironment.get_obj uu in
+    let uu= OCic2NCic.nuri_of_ouri uu in
+    indent := 0;
+    let o = NCicLibrary.get_obj uu in
     try 
-      NCicTypeChecker.typecheck_obj o;
-      logger (`Type_checking_completed uu);
+      NCicTypeChecker.typecheck_obj o
     with 
     | NCicTypeChecker.AssertFailure s 
-    | NCicTypeChecker.TypeCheckerFailure s as e -> 
+    | NCicTypeChecker.TypeCheckerFailure s
+    | NCicEnvironment.ObjectNotFound s
+    | NCicEnvironment.BadDependency s as e -> 
        prerr_endline ("######### " ^ Lazy.force s);
        if not ignore_exc then raise e
-    | CicEnvironment.Object_not_found s -> 
-       prerr_endline ("Obj not found: " ^ UriManager.string_of_uri s)
     )
     alluris;
   NCicEnvironment.invalidate ();
   Gc.compact ();
   HExtlib.profiling_enabled := true;
   NCicTypeChecker.set_logger (fun _ -> ());
+  do_old_logging := false;
   prerr_endline "typechecking, first with the new and then with the old kernel";
   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 (snd (NCicEnvironment.get_obj u)))
+      NCicTypeChecker.typecheck_obj (NCicLibrary.get_obj u))
     alluris;
   let dopo = Unix.gettimeofday () in
   Gc.compact ();