X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2Focaml%2Fcic_omdoc%2Fcic2acic.ml;h=608f6d7c3aa8af0faf616c448a2f693bb75de074;hb=f981a524748846acc29b76b6e616af110b4ee13d;hp=495cb0405ddc55bcde5987b085132fdbe0df45db;hpb=fe99a52453c40c840cfaa718e9e2646eaab87763;p=helm.git diff --git a/helm/ocaml/cic_omdoc/cic2acic.ml b/helm/ocaml/cic_omdoc/cic2acic.ml index 495cb0405..608f6d7c3 100644 --- a/helm/ocaml/cic_omdoc/cic2acic.ml +++ b/helm/ocaml/cic_omdoc/cic2acic.ml @@ -23,23 +23,44 @@ * http://cs.unibo.it/helm/. *) -let hashtbl_add_time = ref 0.0;; +type sort_kind = [ `Prop | `Set | `Type | `CProp ] + +let sort_of_string = function + | "Prop" -> `Prop + | "Set" -> `Set + | "Type" -> `Type + | "CProp" -> `CProp + | _ -> assert false + +let string_of_sort = function + | `Prop -> "Prop" + | `Set -> "Set" + | `Type -> "Type" + | `CProp -> "CProp" + +let sort_of_sort = function + | Cic.Prop -> `Prop + | Cic.Set -> `Set + | Cic.Type _ -> `Type + | Cic.CProp -> `CProp + +(* let hashtbl_add_time = ref 0.0;; *) let xxx_add h k v = - let t1 = Sys.time () in +(* let t1 = Sys.time () in *) Hashtbl.add h k v ; - let t2 = Sys.time () in - hashtbl_add_time := !hashtbl_add_time +. t2 -. t1 +(* let t2 = Sys.time () in + hashtbl_add_time := !hashtbl_add_time +. t2 -. t1 *) ;; -let number_new_type_of_aux' = ref 0;; -let type_of_aux'_add_time = ref 0.0;; +(* let number_new_type_of_aux' = ref 0;; +let type_of_aux'_add_time = ref 0.0;; *) let xxx_type_of_aux' m c t = - let t1 = Sys.time () in - let res = CicTypeChecker.type_of_aux' m c t in - let t2 = Sys.time () in - type_of_aux'_add_time := !type_of_aux'_add_time +. t2 -. t1 ; +(* let t1 = Sys.time () in *) + let res,_ = CicTypeChecker.type_of_aux' m c t CicUniv.empty_ugraph in +(* let t2 = Sys.time () in + type_of_aux'_add_time := !type_of_aux'_add_time +. t2 -. t1 ; *) res ;; @@ -81,8 +102,9 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts let module D = DoubleTypeInference in let module C = Cic in let fresh_id' = fresh_id seed ids_to_terms ids_to_father_ids in - let time1 = Sys.time () in +(* let time1 = Sys.time () in *) let terms_to_types = +(* let time0 = Sys.time () in let prova = CicTypeChecker.type_of_aux' metasenv context t in let time1 = Sys.time () in @@ -91,10 +113,14 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts let time2 = Sys.time () in prerr_endline ("*** Fine double_type_inference:" ^ (string_of_float (time2 -. time1))); res +*) + D.double_type_of metasenv context t expectedty in +(* let time2 = Sys.time () in prerr_endline ("++++++++++++ Tempi della double_type_of: "^ string_of_float (time2 -. time1)) ; +*) let rec aux computeinnertypes father context idrefs tt = let fresh_id'' = fresh_id' father tt in (*CSC: computeinnertypes era true, il che e' proprio sbagliato, no? *) @@ -104,16 +130,16 @@ let acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts (*CSC: This is a very inefficient way of computing inner types *) (*CSC: and inner sorts: very deep terms have their types/sorts *) (*CSC: computed again and again. *) - let string_of_sort t = + let sort_of t = match CicReduction.whd context t with - C.Sort C.Prop -> "Prop" - | C.Sort C.Set -> "Set" - | C.Sort C.Type -> "Type" - | C.Sort C.CProp -> "CProp" - | C.Meta _ -> -prerr_endline "Cic2acic: string_of_sort applied to a meta" ; - "?" - | _ -> assert false + C.Sort C.Prop -> `Prop + | C.Sort C.Set -> `Set + | C.Sort (C.Type _) + | C.Meta _ -> `Type + | C.Sort C.CProp -> `CProp + | t -> + prerr_endline ("Cic2acic.sort_of applied to: " ^ CicPp.ppterm t) ; + assert false in let ainnertypes,innertype,innersort,expected_available = (*CSC: Here we need the algorithm for Coscoy's double type-inference *) @@ -134,10 +160,10 @@ prerr_endline "Cic2acic: string_of_sort applied to a meta" ; {D.synthesized = (***CSC: patch per provare i tempi CicReduction.whd context (xxx_type_of_aux' metasenv context tt) ; *) -Cic.Sort Cic.Type ; +Cic.Sort (Cic.Type (CicUniv.fresh())); (* TASSI: non dovrebbe fare danni *) D.expected = None} in - incr number_new_type_of_aux' ; +(* incr number_new_type_of_aux' ; *) let innersort = (*XXXXX *) xxx_type_of_aux' metasenv context synthesized (* Cic.Sort Cic.Prop *) in let ainnertypes,expected_available = if computeinnertypes then @@ -157,12 +183,13 @@ Cic.Sort Cic.Type ; else None,false in - ainnertypes,synthesized, string_of_sort innersort, expected_available + ainnertypes,synthesized, sort_of innersort, expected_available (*XXXXXXXX *) with Not_found -> (* l'inner-type non e' nella tabella ==> sort <> Prop *) (* CSC: Type or Set? I can not tell *) - None,Cic.Sort Cic.Type,"Type",false + None,Cic.Sort (Cic.Type (CicUniv.fresh())),`Type,false + (* TASSI non dovrebbe fare danni *) (* *) in let add_inner_type id = @@ -178,12 +205,12 @@ Cic.Sort Cic.Type ; | _ -> "__" ^ string_of_int n in xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" && expected_available then + if innersort = `Prop && expected_available then add_inner_type fresh_id'' ; C.ARel (fresh_id'', List.nth idrefs (n-1), n, id) | C.Var (uri,exp_named_subst) -> xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" && expected_available then + if innersort = `Prop && expected_available then add_inner_type fresh_id'' ; let exp_named_subst' = List.map @@ -191,11 +218,9 @@ Cic.Sort Cic.Type ; in C.AVar (fresh_id'', uri,exp_named_subst') | C.Meta (n,l) -> - let (_,canonical_context,_) = - List.find (function (m,_,_) -> n = m) metasenv - in + let (_,canonical_context,_) = CicUtil.lookup_meta n metasenv in xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" && expected_available then + if innersort = `Prop && expected_available then add_inner_type fresh_id'' ; C.AMeta (fresh_id'', n, (List.map2 @@ -209,15 +234,15 @@ Cic.Sort Cic.Type ; | C.Implicit annotation -> C.AImplicit (fresh_id'', annotation) | C.Cast (v,t) -> xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" then + if innersort = `Prop then add_inner_type fresh_id'' ; C.ACast (fresh_id'', aux' context idrefs v, aux' context idrefs t) | C.Prod (n,s,t) -> xxx_add ids_to_inner_sorts fresh_id'' - (string_of_sort innertype) ; + (sort_of innertype) ; let sourcetype = xxx_type_of_aux' metasenv context s in xxx_add ids_to_inner_sorts (source_id_of_id fresh_id'') - (string_of_sort sourcetype) ; + (sort_of sourcetype) ; let n' = match n with C.Anonymous -> n @@ -234,8 +259,8 @@ Cic.Sort Cic.Type ; xxx_add ids_to_inner_sorts fresh_id'' innersort ; let sourcetype = xxx_type_of_aux' metasenv context s in xxx_add ids_to_inner_sorts (source_id_of_id fresh_id'') - (string_of_sort sourcetype) ; - if innersort = "Prop" then + (sort_of sourcetype) ; + if innersort = `Prop then begin let father_is_lambda = match father with @@ -253,19 +278,19 @@ Cic.Sort Cic.Type ; aux' ((Some (n, C.Decl s)::context)) (fresh_id''::idrefs) t) | C.LetIn (n,s,t) -> xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" then + if innersort = `Prop then add_inner_type fresh_id'' ; C.ALetIn (fresh_id'', n, aux' context idrefs s, aux' ((Some (n, C.Def(s,None)))::context) (fresh_id''::idrefs) t) | C.Appl l -> xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" then + if innersort = `Prop then add_inner_type fresh_id'' ; C.AAppl (fresh_id'', List.map (aux' context idrefs) l) | C.Const (uri,exp_named_subst) -> xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" && expected_available then + if innersort = `Prop && expected_available then add_inner_type fresh_id'' ; let exp_named_subst' = List.map @@ -280,7 +305,7 @@ Cic.Sort Cic.Type ; C.AMutInd (fresh_id'', uri, tyno, exp_named_subst') | C.MutConstruct (uri,tyno,consno,exp_named_subst) -> xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" && expected_available then + if innersort = `Prop && expected_available then add_inner_type fresh_id'' ; let exp_named_subst' = List.map @@ -289,7 +314,7 @@ Cic.Sort Cic.Type ; C.AMutConstruct (fresh_id'', uri, tyno, consno, exp_named_subst') | C.MutCase (uri, tyno, outty, term, patterns) -> xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" then + if innersort = `Prop then add_inner_type fresh_id'' ; C.AMutCase (fresh_id'', uri, tyno, aux' context idrefs outty, aux' context idrefs term, List.map (aux' context idrefs) patterns) @@ -301,7 +326,7 @@ Cic.Sort Cic.Type ; List.map (fun (name,_,ty,_) -> Some (C.Name name, C.Decl ty)) funs in xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" then + if innersort = `Prop then add_inner_type fresh_id'' ; C.AFix (fresh_id'', funno, List.map2 @@ -318,7 +343,7 @@ Cic.Sort Cic.Type ; List.map (fun (name,ty,_) -> Some (C.Name name, C.Decl ty)) funs in xxx_add ids_to_inner_sorts fresh_id'' innersort ; - if innersort = "Prop" then + if innersort = `Prop then add_inner_type fresh_id'' ; C.ACoFix (fresh_id'', funno, List.map2 @@ -328,12 +353,15 @@ Cic.Sort Cic.Type ; ) fresh_idrefs funs ) in +(* let timea = Sys.time () in let res = aux true None context idrefs t in let timeb = Sys.time () in prerr_endline ("+++++++++++++ Tempi della aux dentro alla acic_of_cic: "^ string_of_float (timeb -. timea)) ; res +*) + aux true None context idrefs t ;; let acic_of_cic_context metasenv context idrefs t = @@ -414,59 +442,58 @@ let acic_object_of_cic_object ?(eta_fix=true) obj = let aconjecture_of_conjecture' = aconjecture_of_conjecture seed ids_to_terms ids_to_father_ids ids_to_inner_sorts ids_to_inner_types ids_to_hypotheses hypotheses_seed in - let eta_fix metasenv t = - if eta_fix then E.eta_fix metasenv t else t + let eta_fix metasenv context t = + if eta_fix then E.eta_fix metasenv context t else t in let aobj = match obj with - C.Constant (id,Some bo,ty,params) -> - let bo' = eta_fix [] bo in - let ty' = eta_fix [] ty in + C.Constant (id,Some bo,ty,params,attrs) -> + let bo' = eta_fix [] [] bo in + let ty' = eta_fix [] [] ty in let abo = acic_term_of_cic_term' bo' (Some ty') in let aty = acic_term_of_cic_term' ty' None in C.AConstant - ("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params) - | C.Constant (id,None,ty,params) -> - let ty' = eta_fix [] ty in + ("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params,attrs) + | C.Constant (id,None,ty,params,attrs) -> + let ty' = eta_fix [] [] ty in let aty = acic_term_of_cic_term' ty' None in C.AConstant - ("mettereaposto",None,id,None,aty,params) - | C.Variable (id,bo,ty,params) -> - let ty' = eta_fix [] ty in + ("mettereaposto",None,id,None,aty,params,attrs) + | C.Variable (id,bo,ty,params,attrs) -> + let ty' = eta_fix [] [] ty in let abo = match bo with None -> None | Some bo -> - let bo' = eta_fix [] bo in + let bo' = eta_fix [] [] bo in Some (acic_term_of_cic_term' bo' (Some ty')) in let aty = acic_term_of_cic_term' ty' None in C.AVariable - ("mettereaposto",id,abo,aty, params) - | C.CurrentProof (id,conjectures,bo,ty,params) -> + ("mettereaposto",id,abo,aty,params,attrs) + | C.CurrentProof (id,conjectures,bo,ty,params,attrs) -> let conjectures' = - (*CSC: This code is bugged, since it does a List.map instead - * of a List.fold, withouth calling eta_fixing with the - * current context. Indeed, eta_fix always starts now in the - * empty context. Instead of fixing this piece of code and - * adding a new argument to eta_fix, I just skip eta_fixing - * of the CurrentProof metasenv. Does this break well-typedness? List.map (function (i,canonical_context,term) -> let canonical_context' = - List.map - (function - None -> None - | Some (n, C.Decl t)-> Some (n, C.Decl (eta_fix conjectures t)) - | Some (n, C.Def (t,None)) -> - Some (n, C.Def ((eta_fix conjectures t),None)) - | Some (_,C.Def (_,Some _)) -> assert false - ) canonical_context + List.fold_right + (fun d canonical_context' -> + let d' = + match d with + None -> None + | Some (n, C.Decl t)-> + Some (n, C.Decl (eta_fix conjectures canonical_context' t)) + | Some (n, C.Def (t,None)) -> + Some (n, + C.Def ((eta_fix conjectures canonical_context' t),None)) + | Some (_,C.Def (_,Some _)) -> assert false + in + d::canonical_context' + ) [] canonical_context in - let term' = eta_fix conjectures term in + let term' = eta_fix conjectures canonical_context' term in (i,canonical_context',term') - ) conjectures *) - conjectures + ) conjectures in let aconjectures = List.map @@ -518,18 +545,21 @@ let acic_object_of_cic_object ?(eta_fix=true) obj = in (cid,i,(List.rev revacanonical_context),aterm) ) conjectures' in *) - let time1 = Sys.time () in - let bo' = eta_fix conjectures' bo in - let ty' = eta_fix conjectures' ty in +(* let time1 = Sys.time () in *) + let bo' = eta_fix conjectures' [] bo in + let ty' = eta_fix conjectures' [] ty in +(* let time2 = Sys.time () in prerr_endline ("++++++++++ Tempi della eta_fix: "^ string_of_float (time2 -. time1)) ; hashtbl_add_time := 0.0 ; type_of_aux'_add_time := 0.0 ; DoubleTypeInference.syntactic_equality_add_time := 0.0 ; +*) let abo = acic_term_of_cic_term_context' conjectures' [] [] bo' (Some ty') in let aty = acic_term_of_cic_term_context' conjectures' [] [] ty' None in +(* let time3 = Sys.time () in prerr_endline ("++++++++++++ Tempi della hashtbl_add_time: " ^ string_of_float !hashtbl_add_time) ; @@ -543,9 +573,10 @@ let acic_object_of_cic_object ?(eta_fix=true) obj = ("++++++++++ Tempi della acic_of_cic: " ^ string_of_float (time3 -. time2)) ; prerr_endline ("++++++++++ Numero di iterazioni della acic_of_cic: " ^ string_of_int !seed) ; +*) C.ACurrentProof - ("mettereaposto","mettereaposto2",id,aconjectures,abo,aty,params) - | C.InductiveDefinition (tys,params,paramsno) -> + ("mettereaposto","mettereaposto2",id,aconjectures,abo,aty,params,attrs) + | C.InductiveDefinition (tys,params,paramsno,attrs) -> let context = List.map (fun (name,_,arity,_) -> Some (C.Name name, C.Decl arity)) tys in @@ -563,7 +594,7 @@ let acic_object_of_cic_object ?(eta_fix=true) obj = (id,name,inductive,acic_term_of_cic_term' ty None,acons) ) (List.rev idrefs) tys in - C.AInductiveDefinition ("mettereaposto",atys,params,paramsno) + C.AInductiveDefinition ("mettereaposto",atys,params,paramsno,attrs) in aobj,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,ids_to_inner_types, ids_to_conjectures,ids_to_hypotheses