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

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index b2c3e9a32..47447e49e 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -27,26 +27,31 @@ open Printf
 
 open GrafiteTypes
 
+let pp_ast_statement =
+  GrafiteAstPp.pp_statement ~term_pp:CicNotationPp.pp_term
+    ~lazy_term_pp:CicNotationPp.pp_term ~obj_pp:CicNotationPp.pp_obj
+
 (** {2 Initialization} *)
 
-let status = ref None
+let grafite_status = (ref None : GrafiteTypes.status option ref)
+let lexicon_status = (ref None : LexiconEngine.status option ref)
 
 let run_script is eval_function  =
-  let status = 
-    match !status with
-    | None -> assert false
-    | Some s -> s
+  let lexicon_status',grafite_status' = 
+    match !lexicon_status,!grafite_status with
+    | Some ss, Some s -> ss,s
+    | _,_ -> assert false
   in
   let slash_n_RE = Pcre.regexp "\\n" in
   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
+      (fun grafite_status stm ->
+        (* dump_status grafite_status; *)
+        let stm = pp_ast_statement stm in
         let stm = Pcre.replace ~rex:slash_n_RE stm in
-        let stm = 
+        let stm =
           if String.length stm > 50 then
             String.sub stm 0 50 ^ " ..."
           else
@@ -55,7 +60,11 @@ let run_script is eval_function  =
         HLog.debug ("Executing: ``" ^ stm ^ "''"))
   in
   try
-    eval_function status is cb
+   let lexicon_status'', grafite_status'' =
+    eval_function lexicon_status' grafite_status' is cb
+   in
+    lexicon_status := Some lexicon_status'';
+    grafite_status := Some grafite_status''
   with
   | GrafiteEngine.Drop  
   | End_of_file
@@ -82,11 +91,11 @@ let clean_exit n =
      None -> ()
    | Some n -> exit n
  in
-  match !status with
+  match !grafite_status with
      None -> opt_exit n
-   | Some status ->
+   | Some grafite_status ->
       try
-       let baseuri = GrafiteTypes.get_string_option !status "baseuri" in
+       let baseuri = GrafiteTypes.get_string_option grafite_status "baseuri" in
        let basedir = Helm_registry.get "matita.basedir" in
        LibraryClean.clean_baseuris ~basedir ~verbose:false [baseuri];
        opt_exit n
@@ -98,7 +107,7 @@ 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 
@@ -116,14 +125,18 @@ let rec 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");
   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));
+  let include_paths =
+   Helm_registry.get_list Helm_registry.string "matita.includes" in
+  grafite_status := Some (GrafiteSync.init ());
+  lexicon_status :=
+   Some (CicNotation2.load_notation ~include_paths
+    BuildTimeConf.core_notation_script);
   Sys.catch_break true;
   interactive_loop ()
 
@@ -131,7 +144,12 @@ 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));
+  let include_paths =
+   Helm_registry.get_list Helm_registry.string "matita.includes" in
+  grafite_status := Some (GrafiteSync.init ());
+  lexicon_status :=
+   Some (CicNotation2.load_notation ~include_paths
+    BuildTimeConf.core_notation_script);
   Sys.catch_break true;
   let origcb = HLog.get_log_callback () in
   let newcb tag s =
@@ -154,26 +172,27 @@ let main ~mode =
         | "stdin" -> stdin
         | 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
-        ~clean_baseuri:(not (Helm_registry.get_bool "matita.preserve")));
+     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 = 
-      if tm.Unix.tm_sec > 0 then (string_of_int tm.Unix.tm_sec ^ "''") else "" 
-    in
+    let sec = string_of_int tm.Unix.tm_sec ^ "''" in
     let min = 
       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 ""
     in
-    let proof_status,moo_content_rev,metadata,status = 
-      match !status with
-      | Some s -> !s.proof_status, !s.moo_content_rev, !s.metadata, !s
-      | None -> assert false
+    let proof_status,moo_content_rev,metadata,lexicon_content_rev = 
+      match !lexicon_status,!grafite_status with
+      | Some ss, Some s ->
+         s.proof_status, s.moo_content_rev, ss.LexiconEngine.metadata,
+          ss.LexiconEngine.lexicon_content_rev
+      | _,_ -> assert false
     in
     if proof_status <> GrafiteTypes.No_proof then
      begin
@@ -184,11 +203,16 @@ let main ~mode =
     else
      begin
        let basedir = Helm_registry.get "matita.basedir" in
-       let baseuri = GrafiteParserMisc.baseuri_of_script ~include_paths fname in
+       let baseuri =
+        DependenciesParser.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
+       let lexicon_fname= LibraryMisc.lexicon_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;
+       LexiconMarshal.save_lexicon lexicon_fname lexicon_content_rev;
        HLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
        exit 0