X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;ds=sidebyside;f=matita%2Fmatita%2FmatitaEngine.ml;h=f65c8432a4000f3dc9f28031eb0d5a03bc2c4174;hb=b7779155a6bb8868e0d33e1211a92d5f39e0c3a8;hp=4489920a6bb36c547a718a7effb3e2e568c0b183;hpb=b505ea98f76ba6defb31be73a6871c62136e5747;p=helm.git diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml index 4489920a6..f65c8432a 100644 --- a/matita/matita/matitaEngine.ml +++ b/matita/matita/matitaEngine.ml @@ -26,105 +26,28 @@ (* $Id$ *) module G = GrafiteAst +open GrafiteTypes +open Printf -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 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 -;; - -exception TryingToAdd of string -exception EnrichedWithStatus of exn * GrafiteTypes.status - -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)) - in - if stop then status else loop status - in - loop status -;; +class status baseuri = + object + inherit GrafiteTypes.status baseuri + inherit ApplyTransformation.status + end -(* EX MATITACLIB *) -open Printf +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 -open GrafiteTypes +let debug = false ;; +let debug_print = if debug then prerr_endline else ignore ;; 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 @@ -135,10 +58,12 @@ let pp_ast_statement grafite_status stm = HLog.debug ("Executing: ``" ^ stm ^ "''") ;; -let clean_exit baseuri rc = - LibraryClean.clean_baseuris ~verbose:false [baseuri]; rc +let clean_exit baseuri exn = + LibraryClean.clean_baseuris ~verbose:false [baseuri]; + raise (FailureCompiling (baseuri,exn)) ;; + let pp_times 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 @@ -172,18 +97,6 @@ let cut prefix s = String.sub s lenp (lens-lenp) ;; -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 activate_extraction baseuri fname = () (* MATITA 1.0 @@ -202,14 +115,112 @@ let activate_extraction baseuri fname = *) ;; -let compile options fname = + +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 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 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 (_,_,_)))) -> + 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 = 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 let big_bang = Unix.gettimeofday () in let { Unix.tms_utime = big_bang_u ; Unix.tms_stime = big_bang_s} = Unix.times () @@ -242,18 +253,20 @@ let compile options fname = (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 ~include_paths grafite_status buf print_cb - in + let asserted, status = + eval_from_stream ~compiling ~asserted ~include_paths status buf print_cb 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 + status end; let tm = Unix.gmtime elapsed in let sec = string_of_int tm.Unix.tm_sec ^ "''" in @@ -266,132 +279,72 @@ let compile options fname = 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; -(* + asserted +(* MATITA 1.0: debbo fare time_travel sulla ng_library? LexiconSync.time_travel ~present:lexicon_status ~past:initial_lexicon_status; -*) - true) +*)) 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; + | 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; - 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 + clean_exit baseuri exn + +and assert_ng ~already_included ~compiling ~asserted ~include_paths mapath = + let _,baseuri,fullmapath,_ = Librarian.baseuri_of_script ~include_paths mapath in + if List.mem fullmapath asserted then asserted,false + else + begin + 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 = + assert_ng ~already_included ~compiling ~asserted ~include_paths + mapath + in + asserted, b || b1 + || let _,baseuri,_,_ = + 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 - 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 = - 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 - 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)) - in - if Make.make root [tgt] then - cmd - else raise (Failure ("Compiling: " ^ tgt)) - | cmd -> cmd + 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 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)