Variables are no longer experted (cooking is now implemented).

Better reporting with indentation.

diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml
index d2f54612222e235fb9a46fb294c2f3d3de86189b..4dd6fcbf40ad825e9465f0009ac3e7925ccdd4b0 100644 (file)
--- a/helm/software/components/ng_kernel/check.ml
+++ b/helm/software/components/ng_kernel/check.ml
@@ -1,10 +1,17 @@
 let _ =
-  NCicTypeChecker.set_logger 
+  let indent = ref 0 in
+  let do_indent () = String.make !indent ' ' in
+   NCicTypeChecker.set_logger 
     (function 
-    | `Start_type_checking s -> ()
-(*        prerr_endline ("Start: " ^ NUri.string_of_uri s) *)
-    | `Type_checking_completed s ->  ()
-(*        prerr_endline ("End: " ^ NUri.string_of_uri s) *)
+    | `Start_type_checking s -> ();
+(*        prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s);
+        incr indent
+*)
+    | `Type_checking_completed s ->  ();
+(*
+        decr indent;
+        prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s) 
+*)
        );
   NCicPp.set_ppterm NCicPp.trivial_pp_term;
   Helm_registry.load_from "conf.xml";
@@ -13,7 +20,7 @@ let _ =
       let s = Sys.argv.(1) in
       if s = "-alluris" then
        begin
-        let uri_re = Str.regexp ".*\\(ind\\|var\\|con\\)$" in
+        let uri_re = Str.regexp ".*\\(ind\\|con\\)$" in
         let uris = Http_getter.getalluris () in
         let alluris = List.filter (fun u -> Str.string_match uri_re u 0) uris in
         let oc = open_out "alluris.txt" in
@@ -35,6 +42,7 @@ let _ =
   in
   prerr_endline "caching objects";
   List.iter (fun uu ->
+     indent := 0;
 (*     prerr_endline ("************* INIZIO **************** " ^ NUri.string_of_uri uu); *)
     let _,o = NCicEnvironment.get_obj uu in
     try 
@@ -44,7 +52,7 @@ let _ =
     | NCicTypeChecker.AssertFailure s 
     | NCicTypeChecker.TypeCheckerFailure s as e -> 
 (*        prerr_endline ("Obj: " ^ NCicPp.ppobj o); *)
-       prerr_endline (Lazy.force s); raise e
+       prerr_endline ("######### " ^ Lazy.force s); raise e
     | CicEnvironment.Object_not_found s -> 
                     prerr_endline ("Obj not found: " ^ UriManager.string_of_uri s);
     )
@@ -54,7 +62,9 @@ let _ =
   prerr_endline "typechecking, first with the new and then with the old kernel";
   let prima = Unix.gettimeofday () in
   List.iter 
-    (fun u -> NCicTypeChecker.typecheck_obj (snd (NCicEnvironment.get_obj u)))
+    (fun u ->
+      indent := 0;
+      NCicTypeChecker.typecheck_obj (snd (NCicEnvironment.get_obj u)))
     alluris;
   let dopo = Unix.gettimeofday () in
   Gc.compact ();