X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacLib.ml;h=8552cbf8629ba98f72086fd58c11d67512bd9d49;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=37bb571efd9f3884be655f05c16b4eac9de5488b;hpb=b11d278a26840884692cdfb89e168081134d293f;p=helm.git

diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml
index 37bb571ef..8552cbf86 100644
--- a/helm/matita/matitacLib.ml
+++ b/helm/matita/matitacLib.ml
@@ -29,21 +29,6 @@ open MatitaTypes
 
 (** {2 Initialization} *)
 
-let paths_to_search_in = ref [];;
-let quiet_compilation = ref false;;
-
-let add_l l = fun s -> l := s :: !l ;;
-let set_b b = fun () -> b := true;;
-
-let arg_spec = [
-  "-I", Arg.String (add_l paths_to_search_in), 
-    "<path> Adds path to the list of searched paths for the include command";
-  "-q", Arg.Unit (set_b quiet_compilation), "Turn off verbose compilation"
-]
-let usage =
-  sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:"
-    BuildTimeConf.version
-
 let status = ref None
 
 let run_script is eval_function  =
@@ -54,12 +39,12 @@ let run_script is eval_function  =
   in
   let slash_n_RE = Pcre.regexp "\\n" in
   let cb = 
-    if !quiet_compilation then 
-      fun _ _ -> () 
+    if Helm_registry.get_bool "matita.quiet" then 
+      (fun _ _ -> ())
     else 
-      fun status stm ->
+      (fun status stm ->
         (* dump_status status; *)
-        let stm = TacticAstPp.pp_statement stm in
+        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
@@ -67,24 +52,22 @@ let run_script is eval_function  =
           else
             stm
         in
-        MatitaLog.debug ("Executing: ``" ^ stm ^ "''")
+        MatitaLog.debug ("Executing: ``" ^ stm ^ "''"))
   in
   try
     eval_function status is cb
   with
   | MatitaEngine.Drop  
-  | CicTextualParser2.Parse_error _ as exn -> raise exn
+  | End_of_file
+  | CicNotationParser.Parse_error _ as exn -> raise exn
   | exn -> 
       MatitaLog.error (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 "";
@@ -111,82 +94,80 @@ let clean_exit n =
        opt_exit n
   
 let rec interactive_loop () = 
- let str = Stream.of_channel stdin in
+  let str = Ulexing.from_utf8_channel stdin in
   try
     run_script str 
-      (MatitaEngine.eval_from_stream_greedy ~include_paths:!paths_to_search_in)
+      (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!"; interactive_loop ()
   | MatitaTypes.Command_error _ -> interactive_loop ()
-  | CicTextualParser2.Parse_error (floc,err) ->
-     (* check for EOI *)
-     if Stream.peek str = None then
-      begin
-       print_newline ();
-       clean_exit (Some 0)
-      end
-     else
-      let (x, y) = CicAst.loc_of_floc floc in
-      MatitaLog.error (sprintf "Parse error at %d-%d: %s" x y err);
-      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);
+     interactive_loop ()
   | exn -> MatitaLog.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 ();
+  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));
   Sys.catch_break true;
   interactive_loop ()
 
-let dump_moo_to_file file moo =
- let os = open_out (MatitaMisc.obj_file_of_script file) in
- let output s = output_string os s in
- output "(* GENERATED FILE: DO NOT EDIT! *)\n\n";
- List.iter output (List.rev moo);
- close_out os
-  
 let main ~mode = 
-  Helm_registry.load_from BuildTimeConf.matita_conf;
-  Http_getter.init ();
-  MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner");
-  MatitaDb.create_owner_environment ();
+  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 = MatitaLog.get_log_callback () in
   let newcb tag s =
-        match tag with
-        | `Debug | `Message -> ()
-        | `Warning | `Error -> origcb tag s
+    match tag with
+    | `Debug | `Message -> ()
+    | `Warning | `Error -> origcb tag s
   in
-  let fname = fname () in
-  if !quiet_compilation then
+  if Helm_registry.get_bool "matita.quiet" then
     MatitaLog.set_log_callback newcb;
+  let matita_debug = Helm_registry.get_bool "matita.debug" in
   try
     let time = Unix.time () in
-    if !quiet_compilation then
+    if Helm_registry.get_bool "matita.quiet" then
       origcb `Message ("compiling " ^ Filename.basename fname ^ "...")
     else
       MatitaLog.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)
     in
     run_script is 
-      (MatitaEngine.eval_from_stream ~include_paths:!paths_to_search_in);
+      (MatitaEngine.eval_from_stream 
+        ~include_paths:(Helm_registry.get_list Helm_registry.string
+          "matita.includes")
+        ~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,moo_content_rev = 
       match !status with
@@ -201,7 +182,8 @@ let main ~mode =
      end
     else
      begin
-       dump_moo_to_file fname moo_content_rev;
+       let moo_fname = MatitacleanLib.obj_file_of_script fname in
+       MatitaMoo.save_moo moo_fname moo_content_rev;
        MatitaLog.message 
          (sprintf "execution of %s completed in %s." fname (hou^min^sec));
        exit 0
@@ -218,15 +200,17 @@ let main ~mode =
         clean_exit (Some 1)
       else 
         pp_ocaml_mode ()
-  | CicTextualParser2.Parse_error (floc,err) ->
-     let (x, y) = CicAst.loc_of_floc floc in
+  | 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);
      if mode = `COMPILER then
        clean_exit (Some 1)
      else
        pp_ocaml_mode ()
-  | _ ->
-     if mode = `COMPILER then 
-       clean_exit (Some 3)
-     else 
-       pp_ocaml_mode ()
+  | exn ->
+      if matita_debug then raise exn;
+      if mode = `COMPILER then 
+        clean_exit (Some 3)
+      else 
+        pp_ocaml_mode ()
+