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

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 5f07aa406..b2c3e9a32 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -25,17 +25,10 @@
 
 open Printf
 
-open MatitaTypes
+open GrafiteTypes
 
 (** {2 Initialization} *)
 
-let arg_spec = [
-(*   "-opt", Arg...., "set bla bla bla"; *)
-]
-let usage =
-  sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
-    BuildTimeConf.version
-
 let status = ref None
 
 let run_script is eval_function  =
@@ -45,127 +38,184 @@ let run_script is eval_function  =
     | Some s -> s
   in
   let slash_n_RE = Pcre.regexp "\\n" in
-  let cb status stm = 
-    (* dump_status status; *)
-    let stm = TacticAstPp.pp_statement stm in
-    let stm = Pcre.replace ~rex:slash_n_RE stm in
-    let stm = 
-      if String.length stm > 50 then
-        String.sub stm 0 50 ^ " ..."
-      else
-        stm
-    in
-    MatitaLog.debug ("Executing: ``" ^ stm ^ "''")
+  let cb = 
+    if Helm_registry.get_bool "matita.quiet" then 
+      (fun _ _ -> ())
+    else 
+      (fun status stm ->
+        (* dump_status status; *)
+        let stm = GrafiteAstPp.pp_statement stm in
+        let stm = Pcre.replace ~rex:slash_n_RE stm in
+        let stm = 
+          if String.length stm > 50 then
+            String.sub stm 0 50 ^ " ..."
+          else
+            stm
+        in
+        HLog.debug ("Executing: ``" ^ stm ^ "''"))
   in
   try
     eval_function status is cb
   with
-  | MatitaEngine.Drop  
-  | CicTextualParser2.Parse_error _ as exn -> raise exn
+  | 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 () =
-  let acc = ref [] in
-  let add_script fname = acc := fname :: !acc in
-  Arg.parse arg_spec add_script usage;
-  match !acc with
+  match Helm_registry.get_list Helm_registry.string "matita.args" with
   | [x] -> x
-  | _ -> prerr_endline usage; exit 1
+  | _ -> 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 rec go () = 
- let str = Stream.of_channel stdin in
+let clean_exit n =
+ let opt_exit =
+  function
+     None -> ()
+   | Some n -> exit n
+ in
+  match !status with
+     None -> opt_exit n
+   | Some status ->
+      try
+       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 GrafiteTypes.Option_error("baseuri", "not found") ->
+       (* no baseuri ==> nothing to clean yet *)
+       opt_exit n
+  
+let rec interactive_loop () = 
+  let str = Ulexing.from_utf8_channel stdin in
   try
-    run_script str MatitaEngine.eval_from_stream_greedy
+    run_script str 
+      (MatitaEngine.eval_from_stream_greedy
+      ~include_paths:(Helm_registry.get_list Helm_registry.string
+        "matita.includes"))
   with 
-  | MatitaEngine.Drop -> pp_ocaml_mode ()
-  | Sys.Break -> MatitaLog.error "user break!"; go ()
-  | MatitaTypes.Command_error _ -> go ()
-  | CicTextualParser2.Parse_error (floc,err) ->
-     (* check for EOI *)
-     if Stream.peek str = None then
-      exit 0
-     else
-      let (x, y) = CicAst.loc_of_floc floc in
-      MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
-      go ()
-  | exn -> MatitaLog.error (Printexc.to_string exn); go ()
-  
-let main ~mode = 
-  Helm_registry.load_from "matita.conf.xml";
+  | 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)
+  | 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 -> HLog.error (Printexc.to_string exn); interactive_loop ()
+
+let go () =
+  Helm_registry.load_from BuildTimeConf.matita_conf;
+  CicNotation2.load_notation BuildTimeConf.core_notation_script;
   Http_getter.init ();
   MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
-(*
-  MatitaDb.clean_owner_environment ();
-  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);
   status := Some (ref (Lazy.force MatitaEngine.initial_status));
-  at_exit
-    (fun () ->
-       Http_getter_logger.log "Sync map tree to disk...";
-       Http_getter.sync_dump_file ();
-       print_endline "\nThanks for using Matita!\n");
   Sys.catch_break true;
+  interactive_loop ()
+
+let main ~mode = 
+  MatitaInit.initialize_all ();
+  (* must be called after init since args are set by cmdline parsing *)
   let fname = fname () in
+  status := Some (ref (Lazy.force MatitaEngine.initial_status));
+  Sys.catch_break true;
+  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
+    HLog.set_log_callback newcb;
+  let matita_debug = Helm_registry.get_bool "matita.debug" in
   try
     let time = Unix.time () in
-    MatitaLog.message (sprintf "execution of %s started:" fname);
+    if Helm_registry.get_bool "matita.quiet" then
+      origcb `Message ("compiling " ^ Filename.basename fname ^ "...")
+    else
+      HLog.message (sprintf "execution of %s started:" fname);
     let is =
-      Stream.of_channel
+      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;
+    run_script is 
+      (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
     let sec = 
-      if tm.Unix.tm_sec > 0 then  (string_of_int tm.Unix.tm_sec ^ "''") else "" 
+      if tm.Unix.tm_sec > 0 then (string_of_int tm.Unix.tm_sec ^ "''") else "" 
     in
     let min = 
-      if tm.Unix.tm_min > 0 then  (string_of_int tm.Unix.tm_min ^ "' ") else "" 
+      if tm.Unix.tm_min > 0 then (string_of_int tm.Unix.tm_min ^ "' ") else "" 
     in
     let hou = 
-      if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else "" 
+      if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour ^ "h ") else ""
     in
-    let proof_status = 
+    let proof_status,moo_content_rev,metadata,status = 
       match !status with
-      | Some s -> !s.proof_status
+      | 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";
-      exit 2
+      clean_exit (Some 2)
      end
     else
      begin
-       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));
-         close_out (open_out (MatitaMisc.obj_file_of_script fname));
        exit 0
      end
   with 
-  | Sys.Break -> MatitaLog.error "user break!"; exit ~-1
-  | MatitaEngine.Drop ->
+  | Sys.Break ->
+      HLog.error "user break!";
+      if mode = `COMPILER then
+        clean_exit (Some ~-1)
+      else
+        pp_ocaml_mode ()
+  | GrafiteEngine.Drop ->
       if mode = `COMPILER then 
-        exit 1 
+        clean_exit (Some 1)
       else 
         pp_ocaml_mode ()
-  | CicTextualParser2.Parse_error (floc,err) ->
-     let (x, y) = CicAst.loc_of_floc floc in
-     MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
-     Http_getter.sync_dump_file ();
+  | 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
-       exit 1
+       clean_exit (Some 1)
      else
-       go ()
+       pp_ocaml_mode ()
+  | exn ->
+      if matita_debug then raise exn;
+      if mode = `COMPILER then 
+        clean_exit (Some 3)
+      else 
+        pp_ocaml_mode ()
+