X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FmatitaEngine.ml;h=6b4c6655b03a9d1ddc4769b10a80e4ed05295d0d;hb=5ea6d9e71ec0f2e55d42369cb15727713edab684;hp=4489920a6bb36c547a718a7effb3e2e568c0b183;hpb=b505ea98f76ba6defb31be73a6871c62136e5747;p=helm.git diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml index 4489920a6..6b4c6655b 100644 --- a/matita/matita/matitaEngine.ml +++ b/matita/matita/matitaEngine.ml @@ -1,14 +1,14 @@ (* Copyright (C) 2005, HELM Team. - * + * * This file is part of HELM, an Hypertextual, Electronic * Library of Mathematics, developed at the Computer Science * Department, University of Bologna, Italy. - * + * * HELM is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License * as published by the Free Software Foundation; either version 2 * of the License, or (at your option) any later version. - * + * * HELM is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -18,138 +18,174 @@ * along with HELM; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, * MA 02111-1307, USA. - * + * * For details, see the HELM World-Wide-Web page, * http://helm.cs.unibo.it/ - *) +*) (* $Id$ *) module G = GrafiteAst +open Printf + +class status baseuri = + object + inherit GrafiteTypes.status baseuri + inherit ApplyTransformation.status + end + +exception TryingToAdd of string Lazy.t +exception EnrichedWithStatus of exn * status +exception AlreadyLoaded of string Lazy.t +exception FailureCompiling of string * exn +exception CircularDependency of string let debug = false ;; let debug_print = if debug then prerr_endline else ignore ;; -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 slash_n_RE = Pcre.regexp "\\n" ;; -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 -> - GrafiteEngine.eval_ast ~include_paths ?do_heavy_checks status - (text,prefix_len,ast)) in - let _,intermediate_states = - List.fold_left - (fun (status,acc) (k,value) -> - let v = GrafiteAst.description_of_alias value in - let b = - try - let NReference.Ref (uri,_) = NReference.reference_of_string v in - NUri.baseuri_of_uri uri = baseuri - with - NReference.IllFormedReference _ -> - false (* v is a description, not a URI *) - in - if b then - status,acc - else - let status = - GrafiteDisambiguate.set_proof_aliases status ~implicit_aliases:false - GrafiteAst.WithPreferences [k,value] - in - status, (status ,Some (k,value))::acc - ) (status,[]) new_aliases (* WARNING: this must be the old status! *) - in - (new_status,None)::intermediate_states +let first_line = ref true ;; + +let cases_or_induction_context stack = + match stack with + [] -> false + | (_g,_t,_k,_tag,p)::_tl -> try + let s = List.assoc "context" p in + s = "cases" || s = "induction" + with + Not_found -> false ;; -exception TryingToAdd of string -exception EnrichedWithStatus of exn * GrafiteTypes.status +let has_focused_goal stack = + match stack with + [] -> false + | (g,_t,_k,_tag,_p)::_tl -> (List.length g) > 0 +;; -let eval_from_stream ~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 = - try - let cont = - try Some (GrafiteParser.parse_statement status str) - with End_of_file -> None in - match cont with - | None -> true, status - | Some ast -> - cb status ast; - let new_statuses = - eval_ast ~include_paths ?do_heavy_checks status ("",0,ast) in - let status = - match new_statuses with - [s,None] -> s - | _::(_,Some (_,value))::_ -> - raise (TryingToAdd (GrafiteAstPp.pp_alias value)) - | _ -> assert false - in - false, status - with exn when not matita_debug -> - raise (EnrichedWithStatus (exn, status)) +let get_indentation status _statement = + let base_ind = + match status#stack with + [] -> 0 + | s -> List.length(s) * 2 in - if stop then status else loop status - in - loop status + if cases_or_induction_context status#stack then + ( + if has_focused_goal status#stack then + base_ind + 2 + else + base_ind + ) + else + base_ind ;; -(* EX MATITACLIB *) -open Printf - -open GrafiteTypes - -let slash_n_RE = Pcre.regexp "\\n" ;; - -let pp_ast_statement grafite_status stm = - let stm = GrafiteAstPp.pp_statement stm - ~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex") +let pp_ind s n = + let rec aux s n = + match n with + 0 -> s + | n -> " " ^ (aux s (n-1)) in - let stm = Pcre.replace ~rex:slash_n_RE stm in - let stm = + aux s n + +let write_ast_to_file status fname statement = + let indentation = get_indentation status statement in + let str = match statement with + G.Comment _ -> GrafiteAstPp.pp_statement status statement + ~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex") + | G.Executable (_,code) -> + ( + match code with + G.NTactic _ -> GrafiteAstPp.pp_statement status statement + ~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex") + | G.NCommand (_,cmd) -> + ( + match cmd with + | G.NObj (_,obj,_) -> + ( + match obj with + NotationPt.Theorem _ -> "\n" ^ GrafiteAstPp.pp_statement status statement + ~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex") + | _ -> "" + ) + | G.NQed _ -> GrafiteAstPp.pp_statement status statement + ~map_unicode_to_tex:(Helm_registry.get_bool "matita.paste_unicode_as_tex") + | _ -> "" + ) + | _ -> "" + ) + in + if str <> "" then + ( + let s = pp_ind str indentation in + let flaglist = if !first_line = false then [Open_wronly; Open_append; Open_creat] + else (first_line := false; [Open_wronly; Open_trunc; Open_creat]) + in + let out_channel = + open_out_gen flaglist 0o0644 fname in + let _ = output_string out_channel ((if str.[0] <> '\n' then s else str) ^ "\n") in + let _ = close_out out_channel in + str + ) + else + str +;; + +let pp_ast_statement status stm ~fname = + let stm = write_ast_to_file status (fname ^ ".parsed.ma") stm in + if stm <> "" then + ( + let stm = Pcre.replace ~rex:slash_n_RE stm in + let stm = if String.length stm > 50 then String.sub stm 0 50 ^ " ..." else stm - in + in HLog.debug ("Executing: ``" ^ stm ^ "''") + ) + else + HLog.debug ("Executing: `` Unprintable statement ''") +;; + +let clean_exit baseuri exn = + LibraryClean.clean_baseuris ~verbose:false [baseuri]; + raise (FailureCompiling (baseuri,exn)) +;; + +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 clean_exit baseuri rc = - LibraryClean.clean_baseuris ~verbose:false [baseuri]; rc +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 fname rc big_bang big_bang_u big_bang_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 "OK","Ok" else "FAIL","Fail" in - let times = - let fmt t = + let rc = + if rc then "OK" else "FAIL" in + let times = + let fmt t = let seconds = int_of_float t in let cents = int_of_float ((t -. floor t) *. 100.0) in let minutes = seconds / 60 in @@ -158,240 +194,295 @@ let pp_times fname rc big_bang big_bang_u big_bang_s = 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 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 + 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) -> + let v = GrafiteAst.description_of_alias value in + let b = + try + let NReference.Ref (uri,_) = NReference.reference_of_string v in + NUri.baseuri_of_uri uri = baseuri + with + NReference.IllFormedReference _ -> + false (* v is a description, not a URI *) + in + if b then + status,acc + else + let status = + GrafiteDisambiguate.set_proof_aliases status ~implicit_aliases:false + GrafiteAst.WithPreferences [k,value] + in + status, (status ,Some (k,value))::acc + ) (status,[]) new_aliases (* WARNING: this must be the old status! *) + in + (new_status,None)::intermediate_states ;; -let get_include_paths options = - let include_paths = - try List.assoc "include_paths" options with Not_found -> "" - in - let include_paths = Str.split (Str.regexp " ") include_paths in - let include_paths = - include_paths @ - Helm_registry.get_list Helm_registry.string "matita.includes" - in - include_paths +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)) ;; -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; []); - *) +(* 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 compile options fname = +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 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 ~asserted ~include_paths ?do_heavy_checks status str cb = + let matita_debug = Helm_registry.get_bool "matita.debug" in + let rec loop asserted status str = + let asserted,stop,status,str = + try + let cont = + try Some (get_ast status ~compiling ~asserted ~include_paths str) + with End_of_file -> None in + match cont with + | 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 + let status = + match new_statuses with + [s,None] -> s + | _::(_,Some (_,value))::_ -> + raise (TryingToAdd (lazy (GrafiteAstPp.pp_alias value))) + | _ -> 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 + asserted, false, status, str + with exn when not matita_debug -> + raise (EnrichedWithStatus (exn, status)) + in + if stop then asserted,status else loop asserted status str + in + loop asserted status str + +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 include_paths = get_include_paths options in - let root,baseuri,fname,_tgt = + 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 ; - let grafite_status = new GrafiteTypes.status baseuri in + (* MATITA 1.0: debbo fare time_travel sulla ng_library? *) + 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 () + 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)) - then begin + then begin HLog.message ("baseuri " ^ baseuri ^ " is not empty"); HLog.message ("cleaning baseuri " ^ baseuri); LibraryClean.clean_baseuris [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 *) if not (Helm_registry.get_opt_default Helm_registry.bool "matita.nodisk" - ~default:false) + ~default:false) then - HExtlib.mkdir - (Filename.dirname - (Http_getter.filename ~local:true ~writable:true (baseuri ^ - "foo.con"))); - let buf = 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 + HExtlib.mkdir + (Filename.dirname + (Http_getter.filename ~local:true ~writable:true (baseuri ^ + "foo.con"))); + let buf = + GrafiteParser.parsable_statement status + (Ulexing.from_utf8_channel (open_in fname)) in - let grafite_status = - eval_from_stream ~include_paths grafite_status buf print_cb + let print_cb = + if not (Helm_registry.get_bool "matita.verbose") then fun _ _ -> () + else pp_ast_statement ~fname 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) - grafite_status#dump - end; + (if Helm_registry.get_bool "matita.moo" then begin + GrafiteTypes.Serializer.serialize ~baseuri:(NUri.uri_of_string baseuri) + status + end; let tm = Unix.gmtime elapsed 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 "" + let min = + if tm.Unix.tm_min > 0 then (string_of_int tm.Unix.tm_min^"' ") else "" in - let hou = + let hou = if tm.Unix.tm_hour > 0 then (string_of_int tm.Unix.tm_hour^"h ") else "" in - HLog.message + 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; -(* - LexiconSync.time_travel - ~present:lexicon_status ~past:initial_lexicon_status; -*) - true) - with + 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) *) - | EnrichedWithStatus (exn, _grafite) as exn' -> - (match exn with - | Sys.Break -> HLog.error "user break!" - | 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) - | exn when matita_debug -> raise exn' - | exn -> HLog.error (snd (MatitaExcPp.to_string exn)) - ); -(* LexiconSync.time_travel ~present:lexicon ~past:initial_lexicon_status; - * *) - pp_times fname false big_bang big_bang_u big_bang_s; - clean_exit baseuri false - | Sys.Break when not matita_debug -> - HLog.error "user break!"; - pp_times fname false big_bang big_bang_u big_bang_s; - clean_exit baseuri false | exn when not matita_debug -> - HLog.error - ("Unwrapped exception, please fix: "^ snd (MatitaExcPp.to_string exn)); - pp_times fname false big_bang big_bang_u big_bang_s; - clean_exit baseuri false - -module F = - struct - type source_object = string - type target_object = string - let string_of_source_object s = s;; - let string_of_target_object s = s;; - - let is_readonly_buri_of opts file = - let buri = List.assoc "baseuri" opts in - Http_getter_storage.is_read_only (Librarian.mk_baseuri buri file) - ;; - - let root_and_target_of opts mafile = - try - let include_paths = get_include_paths opts in - let root,baseuri,_,relpath = - Librarian.baseuri_of_script ~include_paths mafile - in - let obj_writeable, obj_read_only = - if Filename.check_suffix mafile ".mma" then - Filename.chop_suffix mafile ".mma" ^ ".ma", - Filename.chop_suffix mafile ".mma" ^ ".ma" - else - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:true, - LibraryMisc.obj_file_of_baseuri - ~must_exist:false ~baseuri ~writable:false + (* MATITA 1.0: debbo fare time_travel sulla ng_library? + LexiconSync.time_travel ~present:lexicon ~past:initial_lexicon_status; + * *) + (*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 + +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 - Some root, relpath, obj_writeable, obj_read_only - with Librarian.NoRootFor x -> None, "", "", "" - ;; - - let mtime_of_source_object s = - try Some (Unix.stat s).Unix.st_mtime - with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = s -> None - ;; - - let mtime_of_target_object s = - try Some (Unix.stat s).Unix.st_mtime - with Unix.Unix_error (Unix.ENOENT, "stat", f) when f = s -> None - ;; - -(* FG: a problem was noticed in relising memory between subsequent *) -(* invocations of the compiler. The following might help *) - let compact r = Gc.compact (); r - - let build options fname = - let matita_debug = Helm_registry.get_bool "matita.debug" in - let compile opts fname = + 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 - (* MATITA 1.0: c'erano le push/pop per il parser; ma per - * l'environment nuovo? *) - compile opts fname - with - | Sys.Break -> false - | exn when not matita_debug -> - HLog.error ("Unexpected " ^ snd(MatitaExcPp.to_string exn)); - assert false + 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 - compact (compile options fname) - ;; - - let load_deps_file = Librarian.load_deps_file;; - - end - -module Make = Librarian.Make(F) - -(* FINE EX MATITACLIB *) - - - -(* this function calls the parser in a way that it does not perform inclusions, - * so that we can ensure the inclusion is performed after the included file - * is compiled (if needed). matitac does not need that, since it compiles files - * in the good order, here files may be compiled on demand. *) -let wrap_with_make include_paths f x = - match f x 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)) + 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 Make.make root [tgt] then - cmd - else raise (Failure ("Compiling: " ^ tgt)) - | cmd -> cmd + 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 toplevel status ~include_paths text = - wrap_with_make include_paths - (GrafiteParser.parse_statement status) - (Ulexing.from_utf8_string text) -;; +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)