new discrimination tree

[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 d6165d9dbc39cc0a318b8c8821585c95a33b3f2b..c1ce4260794ce9bb4388dc6a3f756f34eaa2ab5b 100644 (file)
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -15,6 +15,7 @@ let debug = true
 let ignore_exc = false
 let rank_all_dependencies = false
 let trust_environment = false
+let print_object = false
 
 let indent = ref 0;;
 
@@ -142,18 +143,24 @@ let _ =
        try load_graph u with exn -> ())
     roots_alluris;
   prerr_endline "finished....";
-  let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
+  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_type a) (mk_cprop a);
          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 true (mk_type a) (mk_cprop a);
+         NCicEnvironment.add_constraint false (mk_type a) (mk_cprop a);
+         NCicEnvironment.add_constraint false (mk_cprop a) (mk_type a);
       | _ -> ()
     in
        aux lll
@@ -167,7 +174,7 @@ let _ =
     let uu= OCic2NCic.nuri_of_ouri uu in
     indent := 0;
     let o = NCicLibrary.get_obj uu in
-(*       prerr_endline (NCicPp.ppobj o); *)
+    if print_object then prerr_endline (NCicPp.ppobj o); 
     try 
       NCicTypeChecker.typecheck_obj o
     with