(* $Id$ *)
-module G = GrafiteAst
-open GrafiteTypes
open Printf
+class status baseuri =
+ object
+ inherit GrafiteTypes.status baseuri
+ inherit ApplyTransformation.status
+ end
+
exception TryingToAdd of string Lazy.t
-exception EnrichedWithStatus of exn * GrafiteTypes.status
+exception EnrichedWithStatus of exn * status
exception AlreadyLoaded of string Lazy.t
exception FailureCompiling of string * exn
exception CircularDependency of string
let slash_n_RE = Pcre.regexp "\\n" ;;
-let pp_ast_statement grafite_status stm =
- let stm = GrafiteAstPp.pp_statement stm
+let pp_ast_statement status stm =
+ let stm = GrafiteAstPp.pp_statement status stm
~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex")
in
let stm = Pcre.replace ~rex:slash_n_RE stm in
raise (FailureCompiling (baseuri,exn))
;;
-let pp_times fname rc big_bang big_bang_u big_bang_s =
+let cut prefix s =
+ let lenp = String.length prefix in
+ let lens = String.length s in
+ assert (lens > lenp);
+ assert (String.sub s 0 lenp = prefix);
+ String.sub s lenp (lens-lenp)
+;;
+
+let print_string =
+ let indent = ref 0 in
+ let print_string ~right_justify s =
+ let ss =
+ match right_justify with
+ None -> ""
+ | Some (ss,len_ss) ->
+ let i = 80 - !indent - len_ss - String.length s in
+ if i > 0 then String.make i ' ' ^ ss else ss
+ in
+ assert (!indent >=0);
+ print_string (String.make !indent ' ' ^ s ^ ss) in
+ fun enter ?right_justify s ->
+ if enter then (print_string ~right_justify s; incr indent) else (decr indent; print_string ~right_justify s)
+;;
+
+let pp_times ss fname rc big_bang big_bang_u big_bang_s =
if not (Helm_registry.get_bool "matita.verbose") then
let { Unix.tms_utime = u ; Unix.tms_stime = s} = Unix.times () in
let r = Unix.gettimeofday () -. big_bang in
let u = u -. big_bang_u in
let s = s -. big_bang_s in
let extra = try Sys.getenv "BENCH_EXTRA_TEXT" with Not_found -> "" in
- let rc,rcascii =
- if rc then "\e[0;32mOK\e[0m","Ok" else "\e[0;31mFAIL\e[0m","Fail" in
+ let rc =
+ if rc then "\e[0;32mOK\e[0m" else "\e[0;31mFAIL\e[0m" in
let times =
let fmt t =
let seconds = int_of_float t in
in
Printf.sprintf "%s %s %s" (fmt r) (fmt u) (fmt s)
in
- let s = Printf.sprintf "%-4s %s %s" rc times extra in
- print_endline s;
+ let s = Printf.sprintf "%-14s %s %s\n" rc times extra in
+ print_string false ~right_justify:(s,31) ss;
flush stdout;
HLog.message ("Compilation of "^Filename.basename fname^": "^rc)
;;
-let cut prefix s =
- let lenp = String.length prefix in
- let lens = String.length s in
- assert (lens > lenp);
- assert (String.sub s 0 lenp = prefix);
- String.sub s lenp (lens-lenp)
-;;
-
-let activate_extraction baseuri fname =
- ()
- (* MATITA 1.0
- if Helm_registry.get_bool "matita.extract" then
- let mangled_baseuri =
- let baseuri = String.sub baseuri 5 (String.length baseuri - 5) in
- let baseuri = Pcre.replace ~pat:"/" ~templ:"_" baseuri in
- String.uncapitalize baseuri in
- let f =
- open_out
- (Filename.dirname fname ^ "/" ^ mangled_baseuri ^ ".ml") in
- LibrarySync.add_object_declaration_hook
- (fun ~add_obj ~add_coercion _ obj ->
- output_string f (CicExportation.ppobj baseuri obj);
- flush f; []);
- *)
-;;
-
-
-let eval_macro_screenshot (status : GrafiteTypes.status) name =
- assert false (* MATITA 1.0
- let _,_,metasenv,subst,_ = status#obj in
- let sequent = List.hd metasenv in
- let mathml =
- ApplyTransformation.nmml_of_cic_sequent
- status metasenv subst sequent
- in
- let domImpl = Gdome.domImplementation () in
- ignore(domImpl#saveDocumentToFile
- ~name:(name^".xml") ~doc:mathml ());
- ignore(Sys.command ("mathmlsvg --verbose=1 --font-size=20 --cut-filename=no " ^
- Filename.quote (name^".xml")));
- ignore(Sys.command ("convert " ^
- Filename.quote (name^".svg") ^ " " ^
- Filename.quote (name^".png")));
- HLog.debug ("generated " ^ name ^ ".png");
- status, `New []
- *)
-;;
-
let eval_ast ~include_paths ?do_heavy_checks status (text,prefix_len,ast) =
let baseuri = status#baseuri in
let new_aliases,new_status =
GrafiteDisambiguate.eval_with_new_aliases status
(fun status ->
+ let time0 = Unix.gettimeofday () in
+ let status =
GrafiteEngine.eval_ast ~include_paths ?do_heavy_checks status
- (text,prefix_len,ast)) in
+ (text,prefix_len,ast) in
+ let time1 = Unix.gettimeofday () in
+ HLog.debug ("... grafite_engine done in " ^ string_of_float (time1 -. time0) ^ "s");
+ status
+ ) in
let _,intermediate_states =
List.fold_left
(fun (status,acc) (k,value) ->
(new_status,None)::intermediate_states
;;
-let rec get_ast status ~compiling ~include_paths strm =
+let baseuri_of_script ~include_paths fname =
+ try Librarian.baseuri_of_script ~include_paths fname
+ with
+ Librarian.NoRootFor _ ->
+ HLog.error ("The included file '"^fname^"' has no root file,");
+ HLog.error "please create it.";
+ raise (Failure ("No root file for "^fname))
+ | Librarian.FileNotFound _ ->
+ raise (Failure ("File not found: "^fname))
+;;
+
+(* given a path to a ma file inside the include_paths, returns the
+ new include_paths associated to that file *)
+let read_include_paths ~include_paths:_ file =
+ try
+ let root, _buri, _fname, _tgt =
+ Librarian.baseuri_of_script ~include_paths:[] file in
+ let includes =
+ try
+ Str.split (Str.regexp " ")
+ (List.assoc "include_paths" (Librarian.load_root_file (root^"/root")))
+ with Not_found -> []
+ in
+ let rc = root :: includes in
+ List.iter (HLog.debug) rc; rc
+ with Librarian.NoRootFor _ | Librarian.FileNotFound _ ->
+ []
+;;
+
+let rec get_ast status ~compiling ~asserted ~include_paths strm =
match GrafiteParser.parse_statement status strm with
(GrafiteAst.Executable
(_,GrafiteAst.NCommand (_,GrafiteAst.Include (_,_,mafilename)))) as cmd
->
- let root, buri, _, tgt =
- try Librarian.baseuri_of_script ~include_paths mafilename
- with Librarian.NoRootFor _ ->
- HLog.error ("The included file '"^mafilename^"' has no root file,");
- HLog.error "please create it.";
- raise (Failure ("No root file for "^mafilename))
- in
- ignore (assert_ng ~compiling ~include_paths ~root tgt);
- cmd
- | cmd -> cmd
+ let already_included = NCicLibrary.get_transitively_included status in
+ let asserted,_ =
+ assert_ng ~already_included ~compiling ~asserted ~include_paths
+ mafilename
+ in
+ asserted,cmd
+ | cmd -> asserted,cmd
-and eval_from_stream ~compiling ~include_paths ?do_heavy_checks status str cb =
+and eval_from_stream ~compiling ~asserted ~include_paths ?do_heavy_checks status str cb =
let matita_debug = Helm_registry.get_bool "matita.debug" in
- let rec loop status =
- let stop,status =
+ let rec loop asserted status str =
+ let asserted,stop,status,str =
try
let cont =
- try Some (get_ast status ~compiling ~include_paths str)
+ try Some (get_ast status ~compiling ~asserted ~include_paths str)
with End_of_file -> None in
match cont with
- | None -> true, status
- | Some ast ->
+ | None -> asserted, true, status, str
+ | Some (asserted,ast) ->
cb status ast;
let new_statuses =
eval_ast ~include_paths ?do_heavy_checks status ("",0,ast) in
[s,None] -> s
| _::(_,Some (_,value))::_ ->
raise (TryingToAdd (lazy (GrafiteAstPp.pp_alias value)))
- | _ -> assert false
+ | _ -> assert false in
+ (* CSC: complex patch to re-build the lexer since the tokens may
+ have changed. Note: this way we loose look-ahead tokens.
+ Hence the "include" command must be terminated (no look-ahead) *)
+ let str =
+ match ast with
+ (GrafiteAst.Executable
+ (_,GrafiteAst.NCommand
+ (_,(GrafiteAst.Include _ | GrafiteAst.Notation _)))) ->
+ GrafiteParser.parsable_statement status
+ (GrafiteParser.strm_of_parsable str)
+ | _ -> str
in
- false, status
+ asserted, false, status, str
with exn when not matita_debug ->
raise (EnrichedWithStatus (exn, status))
in
- if stop then status else loop status
+ if stop then asserted,status else loop asserted status str
in
- loop status
+ loop asserted status str
-and compile ~compiling ~include_paths fname =
+and compile ~compiling ~asserted ~include_paths fname =
if List.mem fname compiling then raise (CircularDependency fname);
let compiling = fname::compiling in
let matita_debug = Helm_registry.get_bool "matita.debug" in
let root,baseuri,fname,_tgt =
Librarian.baseuri_of_script ~include_paths fname in
if Http_getter_storage.is_read_only baseuri then assert false;
- activate_extraction baseuri fname ;
(* MATITA 1.0: debbo fare time_travel sulla ng_library? *)
- let grafite_status = new GrafiteTypes.status baseuri in
+ let status = new status baseuri in
+ (*CSC: bad, one imperative bit is still there!
+ to be moved into functional status *)
+ NCicMetaSubst.pushmaxmeta ();
+ let ocamldirname = Filename.dirname fname in
+ let ocamlfname = Filename.chop_extension (Filename.basename fname) in
+ let status,ocamlfname =
+ Common.modname_of_filename status false ocamlfname in
+ let ocamlfname = ocamldirname ^ "/" ^ ocamlfname ^ ".ml" in
+ let status = OcamlExtraction.open_file status ~baseuri ocamlfname in
let big_bang = Unix.gettimeofday () in
let { Unix.tms_utime = big_bang_u ; Unix.tms_stime = big_bang_s} =
Unix.times ()
in
let time = Unix.time () in
+ let cc =
+ let rex = Str.regexp ".*opt$" in
+ if Str.string_match rex Sys.argv.(0) 0 then "matitac.opt"
+ else "matitac" in
+ let s = Printf.sprintf "%s %s" cc (cut (root^"/") fname) in
try
(* cleanup of previously compiled objects *)
if (not (Http_getter_storage.is_empty ~local:true baseuri))
end;
HLog.message ("compiling " ^ Filename.basename fname ^ " in " ^ baseuri);
if not (Helm_registry.get_bool "matita.verbose") then
- (let cc =
- let rex = Str.regexp ".*opt$" in
- if Str.string_match rex Sys.argv.(0) 0 then "matitac.opt"
- else "matitac"
- in
- let s = Printf.sprintf "%s %-35s " cc (cut (root^"/") fname) in
- print_string s; flush stdout);
+ (print_string true (s ^ "\n"); flush stdout);
(* we dalay this error check until we print 'matitac file ' *)
assert (Http_getter_storage.is_empty ~local:true baseuri);
(* create dir for XML files *)
(Filename.dirname
(Http_getter.filename ~local:true ~writable:true (baseuri ^
"foo.con")));
- let buf = Ulexing.from_utf8_channel (open_in fname) in
+ let buf =
+ GrafiteParser.parsable_statement status
+ (Ulexing.from_utf8_channel (open_in fname))
+ in
let print_cb =
if not (Helm_registry.get_bool "matita.verbose") then (fun _ _ -> ())
else pp_ast_statement
in
- let grafite_status =
- eval_from_stream ~compiling ~include_paths grafite_status buf print_cb in
+ let asserted, status =
+ eval_from_stream ~compiling ~asserted ~include_paths status buf print_cb in
+ let status = OcamlExtraction.close_file status in
let elapsed = Unix.time () -. time in
(if Helm_registry.get_bool "matita.moo" then begin
GrafiteTypes.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri)
- ~dependencies:grafite_status#dependencies grafite_status#dump
+ status
end;
let tm = Unix.gmtime elapsed in
let sec = string_of_int tm.Unix.tm_sec ^ "''" in
in
HLog.message
(sprintf "execution of %s completed in %s." fname (hou^min^sec));
- pp_times fname true big_bang big_bang_u big_bang_s
+ pp_times s fname true big_bang big_bang_u big_bang_s;
+ (*CSC: bad, one imperative bit is still there!
+ to be moved into functional status *)
+ NCicMetaSubst.pushmaxmeta ();
(* MATITA 1.0: debbo fare time_travel sulla ng_library?
LexiconSync.time_travel
~present:lexicon_status ~past:initial_lexicon_status;
-*))
+*)
+ asserted)
with
(* all exceptions should be wrapped to allow lexicon-undo (LS.time_travel) *)
| exn when not matita_debug ->
(* MATITA 1.0: debbo fare time_travel sulla ng_library?
LexiconSync.time_travel ~present:lexicon ~past:initial_lexicon_status;
* *)
- pp_times fname false big_bang big_bang_u big_bang_s;
+ (*CSC: bad, one imperative bit is still there!
+ to be moved into functional status *)
+ NCicMetaSubst.pushmaxmeta ();
+ pp_times s fname false big_bang big_bang_u big_bang_s;
clean_exit baseuri exn
-(* BIG BUG: if a file recursively includes itself, anything can happen,
- * from divergence to inclusion of an old copy of itself *)
-and assert_ng ~compiling ~include_paths ~root mapath =
- let root',baseuri,_,_ = Librarian.baseuri_of_script ~include_paths mapath in
- assert (root=root');
- let baseuri = NUri.uri_of_string baseuri in
- let ngpath = NCicLibrary.ng_path_of_baseuri baseuri in
- let ngtime =
- try
- Some (Unix.stat ngpath).Unix.st_mtime
- with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = ngpath -> None in
- let matime =
- try (Unix.stat mapath).Unix.st_mtime
- with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = mapath -> assert false
- in
- let to_be_compiled =
- match ngtime with
- Some ngtime ->
- let preamble = GrafiteTypes.Serializer.dependencies_of baseuri in
- let children_bad =
- List.exists (assert_ng ~compiling ~include_paths ~root) preamble
- in
- children_bad || matime > ngtime
- | None -> true
- in
- if not to_be_compiled then false
- else
- (* MATITA 1.0: SHOULD TAKE THIS FROM THE STATUS *)
- if List.mem baseuri (NCicLibrary.get_already_included ()) then
- (* maybe recompiling it I would get the same... *)
- raise (AlreadyLoaded (lazy mapath))
- else
- (compile ~compiling ~include_paths mapath; true)
+and assert_ng ~already_included ~compiling ~asserted ~include_paths mapath =
+ let root,baseuri,fullmapath,_ =
+ Librarian.baseuri_of_script ~include_paths mapath in
+ if List.mem fullmapath asserted then asserted,false
+ else
+ begin
+ let include_paths =
+ let includes =
+ try
+ Str.split (Str.regexp " ")
+ (List.assoc "include_paths" (Librarian.load_root_file (root^"/root")))
+ with Not_found -> []
+ in
+ root::includes @
+ Helm_registry.get_list Helm_registry.string "matita.includes" in
+ let baseuri = NUri.uri_of_string baseuri in
+ let ngtime_of baseuri =
+ let ngpath = NCicLibrary.ng_path_of_baseuri baseuri in
+ try
+ Some (Unix.stat ngpath).Unix.st_mtime
+ with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = ngpath -> None in
+ let matime =
+ try (Unix.stat fullmapath).Unix.st_mtime
+ with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = fullmapath -> assert false
+ in
+ let ngtime = ngtime_of baseuri in
+ let asserted,to_be_compiled =
+ match ngtime with
+ Some ngtime ->
+ let preamble = GrafiteTypes.Serializer.dependencies_of baseuri in
+ let asserted,children_bad =
+ List.fold_left
+ (fun (asserted,b) mapath ->
+ let asserted,b1 =
+ try
+ assert_ng ~already_included ~compiling ~asserted ~include_paths
+ mapath
+ with Librarian.NoRootFor _ | Librarian.FileNotFound _ ->
+ asserted, true
+ in
+ asserted, b || b1
+ || let _,baseuri,_,_ =
+ (*CSC: bug here? include_paths should be empty and
+ mapath should be absolute *)
+ Librarian.baseuri_of_script ~include_paths mapath in
+ let baseuri = NUri.uri_of_string baseuri in
+ (match ngtime_of baseuri with
+ Some child_ngtime -> child_ngtime > ngtime
+ | None -> assert false)
+ ) (asserted,false) preamble
+ in
+ asserted, children_bad || matime > ngtime
+ | None -> asserted,true
+ in
+ if not to_be_compiled then fullmapath::asserted,false
+ else
+ if List.mem baseuri already_included then
+ (* maybe recompiling it I would get the same... *)
+ raise (AlreadyLoaded (lazy mapath))
+ else
+ let asserted = compile ~compiling ~asserted ~include_paths fullmapath in
+ fullmapath::asserted,true
+ end
;;
-let assert_ng = assert_ng ~compiling:[]
-let get_ast = get_ast ~compiling:[]
+let assert_ng ~include_paths mapath =
+ snd (assert_ng ~include_paths ~already_included:[] ~compiling:[] ~asserted:[]
+ mapath)
+let get_ast status ~include_paths strm =
+ snd (get_ast status ~compiling:[] ~asserted:[] ~include_paths strm)
projects / helm.git / blobdiff