X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2Fcheck.ml;h=71ba8ddc284720f3ec8bed7fa0ed08c34b41d6d6;hb=f7101ffe7045c53dde6e1371005f9ceac1852826;hp=cbb451bb325e3265055f8b2559b1501a4a07bd6a;hpb=224455daef5271cece9839ce00f3d0d2d79bc545;p=helm.git diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml index cbb451bb3..71ba8ddc2 100644 --- a/helm/software/components/ng_kernel/check.ml +++ b/helm/software/components/ng_kernel/check.ml @@ -1,16 +1,77 @@ -let _ = - let indent = ref 0 in -(* let do_indent () = String.make !indent ' ' in *) - NCicTypeChecker.set_logger +(* + ||M|| This file is part of HELM, an Hypertextual, Electronic + ||A|| Library of Mathematics, developed at the Computer Science + ||T|| Department, University of Bologna, Italy. + ||I|| + ||T|| HELM is free software; you can redistribute it and/or + ||A|| modify it under the terms of the GNU General Public License + \ / version 2 or (at your option) any later version. + \ / This software is distributed as is, NO WARRANTY. + V_______________________________________________________________ *) + +(* $Id$ *) + +let debug = true +let ignore_exc = false +let rank_all_dependencies = false +let trust_environment = false + +let indent = ref 0;; + +let load_graph, get_graph = + let oldg = ref CicUniv.empty_ugraph in + (function uri -> + let _,g = CicEnvironment.get_obj !oldg uri in + oldg := g), + (function _ -> !oldg) +;; + +let logger = + let do_indent () = String.make !indent ' ' in (function - | `Start_type_checking s -> (); -(* prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s); *) - incr indent + | `Start_type_checking s -> + if debug then + prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s); + incr indent + | `Type_checking_completed s -> + decr indent; + if debug then + prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s) + | `Type_checking_interrupted s -> + decr indent; + if debug then + prerr_endline (do_indent () ^ "Break: " ^ NUri.string_of_uri s) + | `Type_checking_failed s -> + decr indent; + if debug then + prerr_endline (do_indent () ^ "Fail: " ^ NUri.string_of_uri s) + | `Trust_obj s -> + if debug then + prerr_endline (do_indent () ^ "Trust: " ^ NUri.string_of_uri s)) +;; + +let mk_type n = + if n = 0 then + [false, NUri.uri_of_string ("cic:/matita/pts/Type.univ")] + else + [false, NUri.uri_of_string ("cic:/matita/pts/Type"^string_of_int n^".univ")] +;; +let mk_cprop n = + if n = 0 then + [false, NUri.uri_of_string ("cic:/matita/pts/CProp.univ")] + else + [false, NUri.uri_of_string ("cic:/matita/pts/CProp"^string_of_int n^".univ")] +;; + - | `Type_checking_completed s -> (); - decr indent; -(* prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s) *) - ); +let _ = + let do_old_logging = ref true in + HelmLogger.register_log_callback + (fun ?append_NL html_msg -> + if !do_old_logging then + prerr_endline (HelmLogger.string_of_html_msg html_msg)); + CicParser.impredicative_set := false; + NCicTypeChecker.set_logger logger; NCicPp.set_ppterm NCicPp.trivial_pp_term; Helm_registry.load_from "conf.xml"; let alluris = @@ -39,76 +100,92 @@ let _ = in (* brutal *) prerr_endline "computing graphs to load..."; - let dbd = HSql.quick_connect (LibraryDb.parse_dbd_conf ()) in - MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner"); - let uniq l = - HExtlib.list_uniq (List.sort UriManager.compare l) - in - let who_uses u = - uniq (List.map (fun (uri,_) -> UriManager.strip_xpointer uri) - (MetadataDeps.inverse_deps ~dbd u)) - in let roots_alluris = - let rec fix acc l = - let acc, todo = - List.fold_left (fun (acc,todo) x -> - let w = who_uses x in - if w = [] then (x::acc,todo) else (acc,uniq (todo@w))) - (acc,[]) l - in - if todo = [] then uniq acc else fix acc todo - in - (fix [] alluris) + if not rank_all_dependencies then + alluris + else ( + let dbd = HSql.quick_connect (LibraryDb.parse_dbd_conf ()) in + MetadataTypes.ownerize_tables (Helm_registry.get "matita.owner"); + let uniq l = + HExtlib.list_uniq (List.sort UriManager.compare l) in + let who_uses u = + uniq (List.map (fun (uri,_) -> UriManager.strip_xpointer uri) + (MetadataDeps.inverse_deps ~dbd u)) in + let rec fix acc l = + let acc, todo = + List.fold_left (fun (acc,todo) x -> + let w = who_uses x in + if w = [] then (x::acc,todo) else (acc,uniq (todo@w))) + (acc,[]) l + in + if todo = [] then uniq acc else fix acc todo + in + fix [] alluris) in prerr_endline "generating Coq graphs..."; - CicEnvironment.set_trust (fun _ -> false); - List.iter (fun u -> - prerr_endline (" - " ^ UriManager.string_of_uri u); - try - ignore(CicTypeChecker.typecheck u); - with - | CicTypeChecker.AssertFailure s - | CicTypeChecker.TypeCheckerFailure s -> prerr_endline (Lazy.force s) + CicEnvironment.set_trust (fun _ -> trust_environment); + List.iter + (fun u -> + prerr_endline (" - " ^ UriManager.string_of_uri u); + try + ignore(CicTypeChecker.typecheck u); + with + | CicTypeChecker.AssertFailure s + | CicTypeChecker.TypeCheckerFailure s -> + prerr_endline (Lazy.force s); + assert false ) roots_alluris; prerr_endline "loading..."; List.iter (fun u -> prerr_endline (" - "^UriManager.string_of_uri u); - try NCicEnvironment.load_graph u with exn -> ()) + try load_graph u with exn -> ()) roots_alluris; prerr_endline "finished...."; - CicUniv.do_rank (NCicEnvironment.get_graph ()); - prerr_endline "ranked...."; + let lll = List.sort compare (CicUniv.do_rank (get_graph ())) in prerr_endline "caching objects"; + let _ = + let rec aux = function + | a::(b::_ as tl) -> + NCicEnvironment.add_constraint true (mk_type a) (mk_type b); + NCicEnvironment.add_constraint true (mk_cprop a) (mk_cprop b); + NCicEnvironment.add_constraint true (mk_type a) (mk_cprop a); + NCicEnvironment.add_constraint true (mk_cprop a) (mk_type b); + NCicEnvironment.add_constraint true (mk_type b) (mk_cprop b); + aux tl + | _ -> () + in + aux lll + in + prerr_endline "ranked...."; HExtlib.profiling_enabled := false; List.iter (fun uu -> - let uu= NUri.nuri_of_ouri uu in - indent := 0; -(* prerr_endline ("************* INIZIO **************** " ^ NUri.string_of_uri uu); *) - let _,o = NCicEnvironment.get_obj uu in -(* prerr_endline (NCicPp.ppobj o); *) + let uu= OCic2NCic.nuri_of_ouri uu in + indent := 0; + let o = NCicLibrary.get_obj uu in try - NCicTypeChecker.typecheck_obj o; -(* prerr_endline ("************* FINE ****************" ^ NUri.string_of_uri uu); *) + NCicTypeChecker.typecheck_obj o with | NCicTypeChecker.AssertFailure s - | NCicTypeChecker.TypeCheckerFailure s as e -> -(* prerr_endline ("Obj: " ^ NCicPp.ppobj o); *) - prerr_endline ("######### " ^ Lazy.force s); raise e - | CicEnvironment.Object_not_found s -> - prerr_endline ("Obj not found: " ^ UriManager.string_of_uri s); + | NCicTypeChecker.TypeCheckerFailure s + | NCicEnvironment.ObjectNotFound s + | NCicEnvironment.BadDependency s as e -> + prerr_endline ("######### " ^ Lazy.force s); + if not ignore_exc then raise e ) alluris; NCicEnvironment.invalidate (); Gc.compact (); HExtlib.profiling_enabled := true; + NCicTypeChecker.set_logger (fun _ -> ()); + do_old_logging := false; prerr_endline "typechecking, first with the new and then with the old kernel"; let prima = Unix.gettimeofday () in List.iter (fun u -> - let u= NUri.nuri_of_ouri u in + let u= OCic2NCic.nuri_of_ouri u in indent := 0; - NCicTypeChecker.typecheck_obj (snd (NCicEnvironment.get_obj u))) + NCicTypeChecker.typecheck_obj (NCicLibrary.get_obj u)) alluris; let dopo = Unix.gettimeofday () in Gc.compact ();