X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=matita%2Fmatita%2FmatitaEngine.ml;h=c1c1cd9078a52cd86c98ea96e4a01ebaa756224b;hb=87f57ddc367303c33e19c83cd8989cd561f3185b;hp=64b3cc1ebbc0d8a19407bcceb5fbce7f6034c60f;hpb=c9bb60cf6fc39876e2dc7bf40fd650080d0d218f;p=helm.git diff --git a/matita/matita/matitaEngine.ml b/matita/matita/matitaEngine.ml index 64b3cc1eb..c1c1cd907 100644 --- a/matita/matita/matitaEngine.ml +++ b/matita/matita/matitaEngine.ml @@ -29,8 +29,14 @@ 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 @@ -40,8 +46,8 @@ 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 @@ -57,16 +63,39 @@ let clean_exit baseuri exn = 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 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 rc = + if rc then "OK" else "FAIL" in let times = let fmt t = let seconds = int_of_float t in @@ -77,46 +106,25 @@ 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 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_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) -> @@ -153,6 +161,24 @@ let baseuri_of_script ~include_paths fname = 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 @@ -168,14 +194,14 @@ let rec get_ast status ~compiling ~asserted ~include_paths strm = 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 = - let asserted,stop,status = + 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 + | None -> asserted, true, status, str | Some (asserted,ast) -> cb status ast; let new_statuses = @@ -185,15 +211,26 @@ and eval_from_stream ~compiling ~asserted ~include_paths ?do_heavy_checks status [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 - asserted, false, status + asserted, false, status, str with exn when not matita_debug -> raise (EnrichedWithStatus (exn, status)) in - if stop then asserted,status else loop asserted status + if stop then asserted,status else loop asserted status str in - loop asserted status + loop asserted status str and compile ~compiling ~asserted ~include_paths fname = if List.mem fname compiling then raise (CircularDependency fname); @@ -202,14 +239,27 @@ and compile ~compiling ~asserted ~include_paths fname = 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)) @@ -220,13 +270,7 @@ and compile ~compiling ~asserted ~include_paths fname = 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 *) @@ -238,19 +282,20 @@ and compile ~compiling ~asserted ~include_paths fname = (Http_getter.filename ~local:true ~writable:true (baseuri ^ "foo.con"))); let buf = - GrafiteParser.parsable_statement grafite_status + 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 asserted, grafite_status = - eval_from_stream ~compiling ~asserted ~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) - grafite_status + status end; let tm = Unix.gmtime elapsed in let sec = string_of_int tm.Unix.tm_sec ^ "''" in @@ -262,26 +307,42 @@ and compile ~compiling ~asserted ~include_paths fname = 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; - asserted + 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 and assert_ng ~already_included ~compiling ~asserted ~include_paths mapath = - let _,baseuri,fullmapath,_ = Librarian.baseuri_of_script ~include_paths mapath in + 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 @@ -299,13 +360,18 @@ and assert_ng ~already_included ~compiling ~asserted ~include_paths mapath = 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 + (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