X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Flibrary%2FlibrarySync.ml;h=7363697d5522a96a8b2551ae1264b14874411bf9;hb=771ee8b9d122fa963881c876e86f90531bb7434f;hp=922955aa0af384c3e16716c8942c2097d225426a;hpb=f17da39739c49297bf435896c8cb4e3ac83b95a6;p=helm.git diff --git a/helm/ocaml/library/librarySync.ml b/helm/ocaml/library/librarySync.ml index 922955aa0..7363697d5 100644 --- a/helm/ocaml/library/librarySync.ml +++ b/helm/ocaml/library/librarySync.ml @@ -37,66 +37,73 @@ let auxiliary_lemmas_hashtbl = UriManager.UriHashtbl.create 29 * *) let coercion_hashtbl = UriManager.UriHashtbl.create 3 -let merge_coercions obj = +let rec merge_coercions = + let module C = Cic in + let aux = (fun (u,t) -> u,merge_coercions t) in + function + C.Rel _ | C.Sort _ | C.Implicit _ as t -> t + | C.Meta (n,subst) -> + let subst' = + List.map + (function None -> None | Some t -> Some (merge_coercions t)) subst + in + C.Meta (n,subst') + | C.Cast (te,ty) -> C.Cast (merge_coercions te, merge_coercions ty) + | C.Prod (name,so,dest) -> + C.Prod (name, merge_coercions so, merge_coercions dest) + | C.Lambda (name,so,dest) -> + C.Lambda (name, merge_coercions so, merge_coercions dest) + | C.LetIn (name,so,dest) -> + C.LetIn (name, merge_coercions so, merge_coercions dest) + | Cic.Appl [ c1 ; (Cic.Appl [c2; head]) ] when + CoercGraph.is_a_coercion c1 && CoercGraph.is_a_coercion c2 -> + let source_carr = CoercGraph.source_of c2 in + let tgt_carr = CoercGraph.target_of c1 in + (match CoercGraph.look_for_coercion source_carr tgt_carr + with + | CoercGraph.SomeCoercion c -> Cic.Appl [ c ; head ] + | _ -> assert false) (* the composite coercion must exist *) + | C.Appl l -> C.Appl (List.map merge_coercions l) + | C.Var (uri,exp_named_subst) -> + let exp_named_subst = List.map aux exp_named_subst in + C.Var (uri, exp_named_subst) + | C.Const (uri,exp_named_subst) -> + let exp_named_subst = List.map aux exp_named_subst in + C.Const (uri, exp_named_subst) + | C.MutInd (uri,tyno,exp_named_subst) -> + let exp_named_subst = List.map aux exp_named_subst in + C.MutInd (uri,tyno,exp_named_subst) + | C.MutConstruct (uri,tyno,consno,exp_named_subst) -> + let exp_named_subst = List.map aux exp_named_subst in + C.MutConstruct (uri,tyno,consno,exp_named_subst) + | C.MutCase (uri,tyno,out,te,pl) -> + let pl = List.map merge_coercions pl in + C.MutCase (uri,tyno,merge_coercions out,merge_coercions te,pl) + | C.Fix (fno, fl) -> + let fl = List.map (fun (name,idx,ty,bo)->(name,idx,merge_coercions ty,merge_coercions bo)) fl in + C.Fix (fno, fl) + | C.CoFix (fno, fl) -> + let fl = List.map (fun (name,ty,bo) -> (name, merge_coercions ty, merge_coercions bo)) fl in + C.CoFix (fno, fl) + +let merge_coercions_in_obj obj = let module C = Cic in - let rec aux2 = (fun (u,t) -> u,aux t) - and aux = function - | C.Rel _ | C.Sort _ as t -> t - | C.Meta _ | C.Implicit _ -> assert false - | C.Cast (te,ty) -> C.Cast (aux te, aux ty) - | C.Prod (name,so,dest) -> - C.Prod (name, aux so, aux dest) - | C.Lambda (name,so,dest) -> - C.Lambda (name, aux so, aux dest) - | C.LetIn (name,so,dest) -> - C.LetIn (name, aux so, aux dest) - | (Cic.Appl [ c1 ; (Cic.Appl [c2; head]) ]) when - CoercGraph.is_a_coercion c1 && CoercGraph.is_a_coercion c2 -> - let source_carr = CoercGraph.source_of c2 in - let tgt_carr = CoercGraph.target_of c1 in - (match CoercGraph.look_for_coercion source_carr tgt_carr - with - | CoercGraph.SomeCoercion c -> Cic.Appl [ c ; head ] - | _ -> assert false) (* the composite coercion must exist *) - | C.Appl l -> C.Appl (List.map aux l) - | C.Var (uri,exp_named_subst) -> - let exp_named_subst = List.map aux2 exp_named_subst in - C.Var (uri, exp_named_subst) - | C.Const (uri,exp_named_subst) -> - let exp_named_subst = List.map aux2 exp_named_subst in - C.Const (uri, exp_named_subst) - | C.MutInd (uri,tyno,exp_named_subst) -> - let exp_named_subst = List.map aux2 exp_named_subst in - C.MutInd (uri,tyno,exp_named_subst) - | C.MutConstruct (uri,tyno,consno,exp_named_subst) -> - let exp_named_subst = List.map aux2 exp_named_subst in - C.MutConstruct (uri,tyno,consno,exp_named_subst) - | C.MutCase (uri,tyno,out,te,pl) -> - let pl = List.map aux pl in - C.MutCase (uri,tyno,aux out,aux te,pl) - | C.Fix (fno, fl) -> - let fl = List.map (fun (name,idx,ty,bo)->(name,idx,aux ty,aux bo)) fl in - C.Fix (fno, fl) - | C.CoFix (fno, fl) -> - let fl = List.map (fun (name,ty,bo) -> (name, aux ty, aux bo)) fl in - C.CoFix (fno, fl) - in match obj with | C.Constant (id, body, ty, params, attrs) -> let body = match body with | None -> None - | Some body -> Some (aux body) + | Some body -> Some (merge_coercions body) in - let ty = aux ty in + let ty = merge_coercions ty in C.Constant (id, body, ty, params, attrs) | C.Variable (name, body, ty, params, attrs) -> let body = match body with | None -> None - | Some body -> Some (aux body) + | Some body -> Some (merge_coercions body) in - let ty = aux ty in + let ty = merge_coercions ty in C.Variable (name, body, ty, params, attrs) | C.CurrentProof (_name, _conjectures, _body, _ty, _params, _attrs) -> assert false @@ -104,8 +111,8 @@ let merge_coercions obj = let indtys = List.map (fun (name, ind, arity, cl) -> - let arity = aux arity in - let cl = List.map (fun (name, ty) -> (name,aux ty)) cl in + let arity = merge_coercions arity in + let cl = List.map (fun (name, ty) -> (name,merge_coercions ty)) cl in (name, ind, arity, cl)) indtys in @@ -183,7 +190,7 @@ let add_single_obj uri obj ~basedir = if (*List.mem `Generated (CicUtil.attributes_of_obj obj) &&*) not (CoercGraph.is_a_coercion (Cic.Const (uri, []))) then - merge_coercions obj + merge_coercions_in_obj obj else obj in @@ -191,7 +198,16 @@ let add_single_obj uri obj ~basedir = if CicEnvironment.in_library uri then raise (AlreadyDefined uri) else begin + (*CicUniv.reset_spent_time (); + let before = Unix.gettimeofday () in*) typecheck_obj uri obj; (* 1 *) + (*let after = Unix.gettimeofday () in + let univ_time = CicUniv.get_spent_time () in + let total_time = after -. before in + prerr_endline + (Printf.sprintf "QED: %%univ = %2.5f, total = %2.5f, univ = %2.5f, %s\n" + (univ_time *. 100. /. total_time) (total_time) (univ_time) + (UriManager.name_of_uri uri));*) let _, ugraph, univlist = CicEnvironment.get_cooked_obj_with_univlist CicUniv.empty_ugraph uri in try @@ -308,6 +324,9 @@ let add_coercion ~basedir ~add_composites uri = in (* store that composite_uris are related to uri. the first component is the * stuff in the DB while the second is stuff for remove_obj *) + prerr_endline ("aggiungo: " ^ string_of_bool add_composites ^ UriManager.string_of_uri uri); + List.iter (fun u -> prerr_endline (UriManager.string_of_uri u)) + composite_uris; UriManager.UriHashtbl.add coercion_hashtbl uri (composite_uris,if add_composites then composite_uris else []); lemmas @@ -317,6 +336,9 @@ let remove_coercion uri = let (composites_in_db, composites_in_lib) = UriManager.UriHashtbl.find coercion_hashtbl uri in + prerr_endline ("removing: " ^UriManager.string_of_uri uri); + List.iter (fun u -> prerr_endline (UriManager.string_of_uri u)) + composites_in_db; UriManager.UriHashtbl.remove coercion_hashtbl uri; CoercDb.remove_coercion (fun (_,_,u) -> UriManager.eq uri u); (* remove from the DB *) @@ -340,7 +362,6 @@ let generate_projections ~basedir uri fields = CicTypeChecker.type_of_aux' [] [] bo CicUniv.empty_ugraph in let attrs = [`Class `Projection; `Generated] in let obj = Cic.Constant (name,Some bo,ty,[],attrs) in - add_single_obj ~basedir uri obj; let composites = if coercion then