X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=helm%2Fmatita%2FmatitacLib.ml;h=07d58b3955201e5e1de8836b5a4fa7cd01cc748e;hb=64e9baf5488aa0ad2e2d356ef6eb72b8ecb9fca0;hp=b901908207b19624ff63346434d33d3fe98c684a;hpb=3ce38077e0b1e2a38ad513d3c108d7ef3c09bb7c;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index b90190820..07d58b395 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -27,6 +27,10 @@ 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
@@ -44,9 +48,9 @@ let run_script is eval_function  =
     else 
       (fun status stm ->
         (* dump_status status; *)
-        let stm = GrafiteAstPp.pp_statement stm in
+        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
@@ -98,7 +102,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 +120,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 +135,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 +156,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 = 
@@ -184,8 +189,9 @@ let main ~mode =
     else
      begin
        let basedir = Helm_registry.get "matita.basedir" in
-       let moo_fname = GrafiteMisc.obj_file_of_script ~basedir fname in
-       let metadata_fname = GrafiteMisc.metadata_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