X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacLib.ml;h=b2c3e9a323070ca26c2c5c2aef159ce52d66ad8c;hb=7b995596c8b11be95c430646227d01928cc71219;hp=0db34ea88012a17ef047b0ffc5ed7cd6d065fcd2;hpb=afe21e48aefe81db3ca150fac9a5bbfbc893fa59;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 0db34ea88..b2c3e9a32 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -25,7 +25,7 @@
 
 open Printf
 
-open MatitaTypes
+open GrafiteTypes
 
 (** {2 Initialization} *)
 
@@ -52,16 +52,16 @@ let run_script is eval_function  =
           else
             stm
         in
-        MatitaLog.debug ("Executing: ``" ^ stm ^ "''"))
+        HLog.debug ("Executing: ``" ^ stm ^ "''"))
   in
   try
     eval_function status is cb
   with
-  | MatitaEngine.Drop  
+  | GrafiteEngine.Drop  
   | End_of_file
   | CicNotationParser.Parse_error _ as exn -> raise exn
   | exn -> 
-      MatitaLog.error (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 =
@@ -86,10 +86,11 @@ let clean_exit n =
      None -> opt_exit n
    | Some status ->
       try
-       let baseuri = MatitaTypes.get_string_option !status "baseuri" in
-       MatitacleanLib.clean_baseuris ~verbose:false [baseuri];
+       let baseuri = GrafiteTypes.get_string_option !status "baseuri" in
+       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") ->
+      with GrafiteTypes.Option_error("baseuri", "not found") ->
        (* no baseuri ==> nothing to clean yet *)
        opt_exit n
   
@@ -101,24 +102,24 @@ let rec interactive_loop () =
       ~include_paths:(Helm_registry.get_list Helm_registry.string
         "matita.includes"))
   with 
-  | MatitaEngine.Drop -> pp_ocaml_mode ()
-  | Sys.Break -> MatitaLog.error "user break!"; interactive_loop ()
-  | MatitaTypes.Command_error _ -> interactive_loop ()
+  | GrafiteEngine.Drop -> pp_ocaml_mode ()
+  | Sys.Break -> HLog.error "user break!"; interactive_loop ()
+  | GrafiteTypes.Command_error _ -> interactive_loop ()
   | End_of_file ->
      print_newline ();
      clean_exit (Some 0)
-  | CicNotationParser.Parse_error (floc,err) ->
-     let (x, y) = CicNotationPt.loc_of_floc floc in
-     MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
+  | HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
+     let (x, y) = HExtlib.loc_of_floc floc in
+     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;
+  CicNotation2.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,30 +133,31 @@ 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
+    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
         | "stdin" -> stdin
-        | fname -> open_in fname)
+        | fname -> open_in fname) in
+    let include_paths =
+     Helm_registry.get_list Helm_registry.string "matita.includes"
     in
     run_script is 
-      (MatitaEngine.eval_from_stream 
-        ~include_paths:(Helm_registry.get_list Helm_registry.string
-          "matita.includes")
+      (MatitaEngine.eval_from_stream ~include_paths
         ~clean_baseuri:(not (Helm_registry.get_bool "matita.preserve")));
     let elapsed = Unix.time () -. time in
     let tm = Unix.gmtime elapsed in
@@ -168,46 +170,50 @@ 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,metadata,status = 
       match !status with
-      | Some s -> !s.proof_status, !s.moo_content_rev
+      | Some s -> !s.proof_status, !s.moo_content_rev, !s.metadata, !s
       | None -> assert false
     in
-    if proof_status <> MatitaTypes.No_proof then
+    if proof_status <> GrafiteTypes.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 = MatitaMisc.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 baseuri = GrafiteParserMisc.baseuri_of_script ~include_paths fname in
+       let moo_fname = LibraryMisc.obj_file_of_baseuri ~basedir ~baseuri in
+       let metadata_fname = LibraryMisc.metadata_file_of_baseuri ~basedir ~baseuri in
+       GrafiteMarshal.save_moo moo_fname moo_content_rev;
+       LibraryNoDb.save_metadata metadata_fname metadata;
+       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
         pp_ocaml_mode ()
-  | MatitaEngine.Drop ->
+  | GrafiteEngine.Drop ->
       if mode = `COMPILER then 
         clean_exit (Some 1)
       else 
         pp_ocaml_mode ()
-  | CicNotationParser.Parse_error (floc,err) ->
-     let (x, y) = CicNotationPt.loc_of_floc floc in
-     MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
+  | HExtlib.Localized (floc,CicNotationParser.Parse_error err) ->
+     let (x, y) = HExtlib.loc_of_floc floc in
+     HLog.error (sprintf "Parse error at %d-%d: %s" x y err);
      if mode = `COMPILER then
        clean_exit (Some 1)
      else
        pp_ocaml_mode ()
   | exn ->
-      if Helm_registry.get_bool "matita.debug" then raise exn;
+      if matita_debug then raise exn;
       if mode = `COMPILER then 
         clean_exit (Some 3)
       else