X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Fsoftware%2Fcomponents%2Fng_kernel%2Fcheck.ml;h=f5fb6841c39a47efdc878408a1eb5a20f7f9deea;hb=bd1e80fb01cfb419e256d5899ac5bf8818f11e64;hp=e98010de9a079fbe5025c57a1dba153c536fb109;hpb=805758c883a9bd9320942b310af8786ddb7f01b8;p=helm.git diff --git a/helm/software/components/ng_kernel/check.ml b/helm/software/components/ng_kernel/check.ml index e98010de9..f5fb6841c 100644 --- a/helm/software/components/ng_kernel/check.ml +++ b/helm/software/components/ng_kernel/check.ml @@ -1,19 +1,78 @@ -let _ = - let indent = ref 0 in - let do_indent () = String.make !indent ' ' in - NCicTypeChecker.set_logger - (function - | `Start_type_checking s -> (); -(* prerr_endline (do_indent () ^ "Start: " ^ NUri.string_of_uri s); - incr indent -*) - | `Type_checking_completed s -> (); (* - decr indent; - prerr_endline (do_indent () ^ "End: " ^ NUri.string_of_uri s) -*) - ); - NCicPp.set_ppterm NCicPp.trivial_pp_term; + ||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 print_object = true + +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 -> + 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")] +;; + + +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; Helm_registry.load_from "conf.xml"; let alluris = try @@ -37,43 +96,123 @@ let _ = in let alluris = HExtlib.filter_map - (fun u -> try Some (NUri.nuri_of_ouri (UriManager.uri_of_string u)) with _ - -> None) alluris + (fun u -> try Some (UriManager.uri_of_string u) with _ -> None) alluris + in + (* brutal *) + prerr_endline "computing graphs to load..."; + let roots_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 _ -> 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 load_graph u with exn -> ()) + roots_alluris; + prerr_endline "finished...."; + let lll, uuu =(CicUniv.do_rank (get_graph ())) in + CicUniv.print_ugraph (get_graph ()); + let lll = List.sort compare lll in + List.iter (fun k -> + prerr_endline (CicUniv.string_of_universe k ^ " = " ^ string_of_int (CicUniv.get_rank k))) uuu; + let _ = + try + 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_cprop a) (mk_type b); + NCicEnvironment.add_constraint true (mk_type a) (mk_cprop b); + NCicEnvironment.add_constraint false (mk_cprop a) (mk_type a); + NCicEnvironment.add_constraint false (mk_type a) (mk_cprop a); + aux tl + | [a] -> + NCicEnvironment.add_constraint false (mk_type a) (mk_cprop a); + NCicEnvironment.add_constraint false (mk_cprop a) (mk_type a); + | _ -> () + in + aux lll + with NCicEnvironment.BadConstraint s as e -> + prerr_endline (Lazy.force s); raise e in - prerr_endline "caching objects"; + prerr_endline "ranked...."; + prerr_endline (NCicEnvironment.pp_constraints ()); HExtlib.profiling_enabled := false; List.iter (fun uu -> - indent := 0; -(* prerr_endline ("************* INIZIO **************** " ^ NUri.string_of_uri uu); *) - let _,o = NCicEnvironment.get_obj uu in + let uu= OCic2NCic.nuri_of_ouri uu in + indent := 0; + let o = NCicLibrary.get_obj uu in + if print_object then prerr_endline (NCicPp.ppobj o); try - NCicTypeChecker.typecheck_obj o; -(* prerr_endline ("************* FINE ****************" ^ NUri.string_of_uri uu); *) + NCicEnvironment.check_and_add_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); + exn -> + let rec aux = function + | NCicTypeChecker.AssertFailure s + | NCicTypeChecker.TypeCheckerFailure s + | NCicEnvironment.ObjectNotFound s + | NCicEnvironment.BadConstraint s as e-> + prerr_endline ("######### " ^ Lazy.force s); + if not ignore_exc then raise e + | NCicEnvironment.BadDependency (s,x) as e -> + prerr_endline ("######### " ^ Lazy.force s); + aux x; + if not ignore_exc then raise e + | e -> raise e + in + aux exn ) 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= OCic2NCic.nuri_of_ouri u in indent := 0; - NCicTypeChecker.typecheck_obj (snd (NCicEnvironment.get_obj u))) + ignore (NCicEnvironment.get_checked_obj u)) alluris; let dopo = Unix.gettimeofday () in Gc.compact (); let dopo2 = Unix.gettimeofday () in Printf.eprintf "NEW typing: %3.2f, gc: %3.2f\n%!" (dopo -. prima) (dopo2 -. dopo); CicEnvironment.invalidate (); - let alluris = List.map NUri.ouri_of_nuri alluris in Gc.compact (); let prima = Unix.gettimeofday () in List.iter (fun u -> ignore (CicTypeChecker.typecheck u)) alluris;