metavariable context has a separator now

[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 c3695726bd37c20ed042d116f8ee2135f5ac86bf..a51d97722b3e9a207a63c24b635853c89e4587cd 100644 (file)
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -49,12 +49,20 @@ let logger =
           if debug then
            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
@@ -135,27 +143,41 @@ let _ =
     roots_alluris;
   prerr_endline "finished....";
   let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in
-  prerr_endline "caching objects";
   let _ = 
+    try
     let rec aux = function
-      | a::b::tl ->
-         NCicEnvironment.add_lt_constraint (mk_type a) (mk_type b)
+      | 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