X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fmatita%2FmatitacLib.ml;h=b2c3e9a323070ca26c2c5c2aef159ce52d66ad8c;hb=7b995596c8b11be95c430646227d01928cc71219;hp=9cc063271d801902cd5375661e5a850458fe9424;hpb=f2551cc0cc563b34b88a70a6bb0ef5e352a5d542;p=helm.git diff --git a/helm/matita/matitacLib.ml b/helm/matita/matitacLib.ml index 9cc063271..b2c3e9a32 100644 --- a/helm/matita/matitacLib.ml +++ b/helm/matita/matitacLib.ml @@ -25,28 +25,10 @@ open Printf -open MatitaTypes +open GrafiteTypes (** {2 Initialization} *) -let paths_to_search_in = ref [];; -let quiet_compilation = ref false;; -let dont_delete_baseuri = 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), - " Adds path to the list of searched paths for the include command"; - "-q", Arg.Unit (set_b quiet_compilation), "Turn off verbose compilation"; - "-preserve", Arg.Unit (set_b dont_delete_baseuri), - "Turns off automatic baseuri cleaning" -] -let usage = - sprintf "MatitaC v%s\nUsage: matitac [option ...] file\nOptions:" - BuildTimeConf.version - let status = ref None let run_script is eval_function = @@ -57,10 +39,10 @@ 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 = GrafiteAstPp.pp_statement stm in let stm = Pcre.replace ~rex:slash_n_RE stm in @@ -70,32 +52,29 @@ let run_script is eval_function = else stm in - MatitaLog.debug ("Executing: ``" ^ stm ^ "''") + HLog.debug ("Executing: ``" ^ stm ^ "''")) in try eval_function status is cb 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 () = - 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 - | _ -> print_endline usage; exit 1 + | _ -> 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 = @@ -107,37 +86,40 @@ let clean_exit n = None -> opt_exit n | Some status -> try - let baseuri = MatitaTypes.get_string_option !status "baseuri" in - MatitacleanLib.clean_baseuris ~verbose:false [baseuri]; + 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 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 () + | 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; + CicNotation2.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); @@ -145,101 +127,95 @@ let go () = 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 - (fun cmd -> output (GrafiteAstPp.pp_command cmd ^ "\n")) - (List.rev moo); - close_out os - let main ~mode = - 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); + 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 origcb = HLog.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 - MatitaLog.set_log_callback newcb; + if Helm_registry.get_bool "matita.quiet" then + HLog.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); + HLog.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) + | 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:!paths_to_search_in - ~clean_baseuri:(not !dont_delete_baseuri)); + (MatitaEngine.eval_from_stream ~include_paths + ~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 = + let proof_status,moo_content_rev,metadata,status = match !status with - | Some s -> !s.proof_status, !s.moo_content_rev + | 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 - MatitaLog.error + HLog.error "there are still incomplete proofs at the end of the script"; clean_exit (Some 2) end else begin - dump_moo_to_file fname moo_content_rev; - MatitaLog.message + let basedir = Helm_registry.get "matita.basedir" 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 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 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 () +