X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacLib.ml;h=7150c6f775cb57fecf8340070db8d3c659c8d424;hb=a229a988dceead9ffe3ea593fcf98e68a16582cf;hp=8552cbf8629ba98f72086fd58c11d67512bd9d49;hpb=6fa89cef6aa8fc1774db065a9fcfc47867579054;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 8552cbf86..7150c6f77 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -25,43 +25,57 @@
 
 open Printf
 
-open MatitaTypes
+open GrafiteTypes
+
+exception AttemptToInsertAnAlias
+
+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
             stm
         in
-        MatitaLog.debug ("Executing: ``" ^ stm ^ "''"))
+        HLog.debug ("Executing: ``" ^ stm ^ "''"))
   in
   try
-    eval_function status is cb
+   let grafite_status'', lexicon_status'' =
+    match eval_function lexicon_status' grafite_status' is cb with
+       [] -> assert false
+     | (s,None)::_ -> s
+     | (s,Some _)::_ -> raise AttemptToInsertAnAlias
+   in
+    lexicon_status := Some lexicon_status'';
+    grafite_status := Some grafite_status''
   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 +84,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 =
@@ -82,14 +96,15 @@ 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 = MatitaTypes.get_string_option !status "baseuri" in
-       MatitacleanLib.clean_baseuris ~verbose:false [baseuri];
+       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
-      with MatitaTypes.Option_error("baseuri", "not found") ->
+      with GrafiteTypes.Option_error("baseuri", "not found") ->
        (* no baseuri ==> nothing to clean yet *)
        opt_exit n
   
@@ -97,32 +112,36 @@ 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 ~first_statement_only:false ~prompt:true
       ~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;
   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);
-  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 ()
 
@@ -130,79 +149,94 @@ 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 = 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
   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)
-    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 ~first_statement_only:false ~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 = 
-      match !status with
-      | Some s -> !s.proof_status, !s.moo_content_rev
-      | 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 <> 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 = MatitacleanLib.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 =
+        DependenciesParser.baseuri_of_script ~include_paths fname in
+       let moo_fname = LibraryMisc.obj_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
      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