X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacLib.ml;h=1f9dad80f7dbcf1815dbdf7123c6a7032a7e5945;hb=6a149d262dfcb03a7d57f8ecabf23b0b59e99f85;hp=fe22c9da77364e20672eba33940c89f78f7acce7;hpb=0ac236dda6f80f6dc86a7f12d8c88b25e64e3251;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index fe22c9da7..1f9dad80f 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -25,7 +25,7 @@
 
 open Printf
 
-open MatitaTypes
+open GrafiteTypes
 
 (** {2 Initialization} *)
 
@@ -57,7 +57,7 @@ let run_script is eval_function  =
   try
     eval_function status is cb
   with
-  | MatitaEngine.Drop  
+  | GrafiteEngine.Drop  
   | End_of_file
   | CicNotationParser.Parse_error _ as exn -> raise exn
   | exn -> 
@@ -86,11 +86,11 @@ let clean_exit n =
      None -> opt_exit n
    | Some status ->
       try
-       let baseuri = MatitaTypes.get_string_option !status "baseuri" in
+       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
   
@@ -98,13 +98,13 @@ let rec interactive_loop () =
   let str = Ulexing.from_utf8_channel stdin in
   try
     run_script str 
-      (MatitaEngine.eval_from_stream_greedy
+      (MatitaEngine.eval_from_stream ~prompt:true
       ~include_paths:(Helm_registry.get_list Helm_registry.string
         "matita.includes"))
   with 
-  | MatitaEngine.Drop -> pp_ocaml_mode ()
+  | GrafiteEngine.Drop -> pp_ocaml_mode ()
   | Sys.Break -> HLog.error "user break!"; interactive_loop ()
-  | MatitaTypes.Command_error _ -> interactive_loop ()
+  | GrafiteTypes.Command_error _ -> interactive_loop ()
   | End_of_file ->
      print_newline ();
      clean_exit (Some 0)
@@ -116,14 +116,14 @@ let rec 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");
   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));
+  status := Some (ref (MatitaSync.init ()));
   Sys.catch_break true;
   interactive_loop ()
 
@@ -131,7 +131,7 @@ 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));
+  status := Some (ref (MatitaSync.init ()));
   Sys.catch_break true;
   let origcb = HLog.get_log_callback () in
   let newcb tag s =
@@ -152,13 +152,14 @@ let main ~mode =
       Ulexing.from_utf8_channel
         (match fname with
         | "stdin" -> stdin
-        | fname -> open_in fname)
-    in
-    run_script is 
-      (MatitaEngine.eval_from_stream 
-        ~include_paths:(Helm_registry.get_list Helm_registry.string
-          "matita.includes")
-        ~clean_baseuri:(not (Helm_registry.get_bool "matita.preserve")));
+        | fname -> open_in fname) in
+    let include_paths =
+     Helm_registry.get_list Helm_registry.string "matita.includes" in
+    (try
+      run_script is 
+       (MatitaEngine.eval_from_stream ~include_paths
+         ~clean_baseuri:(not (Helm_registry.get_bool "matita.preserve")))
+     with End_of_file -> ());
     let elapsed = Unix.time () -. time in
     let tm = Unix.gmtime elapsed in
     let sec = 
@@ -170,12 +171,12 @@ 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,status = 
+    let proof_status,moo_content_rev,metadata,status = 
       match !status with
-      | Some s -> !s.proof_status, !s.moo_content_rev, !s
+      | 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
       HLog.error
        "there are still incomplete proofs at the end of the script";
@@ -184,8 +185,11 @@ let main ~mode =
     else
      begin
        let basedir = Helm_registry.get "matita.basedir" in
-       let moo_fname = MatitaMisc.obj_file_of_script ~basedir fname 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
@@ -197,7 +201,7 @@ let main ~mode =
         clean_exit (Some ~-1)
       else
         pp_ocaml_mode ()
-  | MatitaEngine.Drop ->
+  | GrafiteEngine.Drop ->
       if mode = `COMPILER then 
         clean_exit (Some 1)
       else