* Part of matita that used to deal with the library moved into ocaml/library

[helm.git] / helm / matita / matitacLib.ml

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 872dccace16b0b25d2f8ee1ae6fa6a2ae3df1266..fe22c9da77364e20672eba33940c89f78f7acce7 100644 (file)
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -52,7 +52,7 @@ let run_script is eval_function  =
           else
             stm
         in
-        MatitaLog.debug ("Executing: ``" ^ stm ^ "''"))
+        HLog.debug ("Executing: ``" ^ stm ^ "''"))
   in
   try
     eval_function status is cb
@@ -61,7 +61,7 @@ let run_script is eval_function  =
   | End_of_file
   | CicNotationParser.Parse_error _ as exn -> raise exn
   | exn -> 
-      MatitaLog.error (snd (MatitaExcPp.to_string exn));
+      HLog.error (snd (MatitaExcPp.to_string exn));
       raise exn
 
 let fname () =
@@ -70,11 +70,11 @@ let fname () =
   | _ -> MatitaInit.die_usage ()
 
 let pp_ocaml_mode () = 
-  MatitaLog.message "";
-  MatitaLog.message "                      ** Entering Ocaml mode ** ";
-  MatitaLog.message "";
-  MatitaLog.message "Type 'go ();;' to enter an interactive matitac";
-  MatitaLog.message ""
+  HLog.message "";
+  HLog.message "                      ** Entering Ocaml mode ** ";
+  HLog.message "";
+  HLog.message "Type 'go ();;' to enter an interactive matitac";
+  HLog.message ""
   
 let clean_exit n =
  let opt_exit =
@@ -87,7 +87,8 @@ let clean_exit n =
    | Some status ->
       try
        let baseuri = MatitaTypes.get_string_option !status "baseuri" in
-       MatitacleanLib.clean_baseuris ~verbose:false [baseuri];
+       let basedir = Helm_registry.get "matita.basedir" in
+       LibraryClean.clean_baseuris ~basedir ~verbose:false [baseuri];
        opt_exit n
       with MatitaTypes.Option_error("baseuri", "not found") ->
        (* no baseuri ==> nothing to clean yet *)
@@ -102,23 +103,23 @@ let rec interactive_loop () =
         "matita.includes"))
   with 
   | MatitaEngine.Drop -> pp_ocaml_mode ()
-  | Sys.Break -> MatitaLog.error "user break!"; interactive_loop ()
+  | Sys.Break -> HLog.error "user break!"; interactive_loop ()
   | MatitaTypes.Command_error _ -> interactive_loop ()
   | End_of_file ->
      print_newline ();
      clean_exit (Some 0)
   | HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
      let (x, y) = HExtlib.loc_of_floc floc in
-     MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
+     HLog.error (sprintf "Parse error at %d-%d: %s" x y err);
      interactive_loop ()
-  | exn -> MatitaLog.error (Printexc.to_string exn); interactive_loop ()
+  | exn -> HLog.error (Printexc.to_string exn); interactive_loop ()
 
 let go () =
   Helm_registry.load_from BuildTimeConf.matita_conf;
   CicNotation.load_notation BuildTimeConf.core_notation_script;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
-  MatitaDb.create_owner_environment ();
+  LibraryDb.create_owner_environment ();
   CicEnvironment.set_trust (* environment trust *)
     (let trust = Helm_registry.get_bool "matita.environment_trust" in
      fun _ -> trust);
@@ -132,21 +133,21 @@ let main ~mode =
   let fname = fname () in
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
   Sys.catch_break true;
-  let origcb = MatitaLog.get_log_callback () in
+  let origcb = HLog.get_log_callback () in
   let newcb tag s =
     match tag with
     | `Debug | `Message -> ()
     | `Warning | `Error -> origcb tag s
   in
   if Helm_registry.get_bool "matita.quiet" then
-    MatitaLog.set_log_callback newcb;
+    HLog.set_log_callback newcb;
   let matita_debug = Helm_registry.get_bool "matita.debug" in
   try
     let time = Unix.time () in
     if Helm_registry.get_bool "matita.quiet" then
       origcb `Message ("compiling " ^ Filename.basename fname ^ "...")
     else
-      MatitaLog.message (sprintf "execution of %s started:" fname);
+      HLog.message (sprintf "execution of %s started:" fname);
     let is =
       Ulexing.from_utf8_channel
         (match fname with
@@ -169,28 +170,29 @@ let main ~mode =
     let hou = 
       if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else ""
     in
-    let proof_status,moo_content_rev = 
+    let proof_status,moo_content_rev,status = 
       match !status with
-      | Some s -> !s.proof_status, !s.moo_content_rev
+      | Some s -> !s.proof_status, !s.moo_content_rev, !s
       | None -> assert false
     in
     if proof_status <> MatitaTypes.No_proof then
      begin
-      MatitaLog.error
+      HLog.error
        "there are still incomplete proofs at the end of the script";
       clean_exit (Some 2)
      end
     else
      begin
-       let moo_fname = MatitacleanLib.obj_file_of_script fname in
-       MatitaMoo.save_moo moo_fname moo_content_rev;
-       MatitaLog.message 
+       let basedir = Helm_registry.get "matita.basedir" in
+       let moo_fname = MatitaMisc.obj_file_of_script ~basedir fname in
+       GrafiteMarshal.save_moo moo_fname moo_content_rev;
+       HLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
        exit 0
      end
   with 
   | Sys.Break ->
-      MatitaLog.error "user break!";
+      HLog.error "user break!";
       if mode = `COMPILER then
         clean_exit (Some ~-1)
       else
@@ -202,7 +204,7 @@ let main ~mode =
         pp_ocaml_mode ()
   | HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
      let (x, y) = HExtlib.loc_of_floc floc in
-     MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
+     HLog.error (sprintf "Parse error at %d-%d: %s" x y err);
      if mode = `COMPILER then
        clean_exit (Some 1)
      else