* http://cs.unibo.it/helm/.
*)
+let hashtbl_add_time = ref 0.0;;
+
+let xxx_add h k v =
+ let t1 = Sys.time () in
+ Hashtbl.add h k v ;
+ 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 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 ;
+ res
+;;
+
type anntypes =
{annsynthesized : Cic.annterm ; annexpected : Cic.annterm option}
;;
let fresh_id seed ids_to_terms ids_to_father_ids =
fun father t ->
let res = gen_id seed in
- Hashtbl.add ids_to_father_ids res father ;
- Hashtbl.add ids_to_terms res t ;
+ xxx_add ids_to_father_ids res father ;
+ xxx_add ids_to_terms res t ;
res
;;
let source_id_of_id id = "#source#" ^ id;;
exception NotEnoughElements;;
-exception NameExpected;;
(*CSC: cut&paste da cicPp.ml *)
(* get_nth l n returns the nth element of the list l if it exists or *)
ids_to_inner_types metasenv context idrefs t expectedty
=
let module D = DoubleTypeInference in
- let module T = CicTypeChecker 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 terms_to_types =
- D.double_type_of metasenv context t expectedty
+ let time0 = Sys.time () in
+ let prova = CicTypeChecker.type_of_aux' metasenv context t in
+ let time1 = Sys.time () in
+ prerr_endline ("*** Fine type_inference:" ^ (string_of_float (time1 -. time0)));
+ let res = D.double_type_of metasenv context t expectedty in
+ let time2 = Sys.time () in
+ prerr_endline ("*** Fine double_type_inference:" ^ (string_of_float (time2 -. time1)));
+ res
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? *)
(*CSC: computed again and again. *)
let string_of_sort t =
match CicReduction.whd context t with
- C.Sort C.Prop -> "Prop"
- | C.Sort C.Set -> "Set"
- | C.Sort C.Type -> "Type"
- | _ -> assert false
+ C.Sort C.Prop -> "Prop"
+ | C.Sort C.Set -> "Set"
+ | C.Sort (C.Type _) -> "Type" (* TASSI OK*)
+ | C.Sort C.CProp -> "CProp"
+ | C.Meta _ ->
+prerr_endline "Cic2acic: string_of_sort applied to a meta" ;
+ "?"
+ | _ -> assert false
in
let ainnertypes,innertype,innersort,expected_available =
(*CSC: Here we need the algorithm for Coscoy's double type-inference *)
(*CSC: type-inference, but the result is very poor. As a very weak *)
(*CSC: patch, I apply whd to the computed type. Full beta *)
(*CSC: reduction would be a much better option. *)
+(*CSC: solo per testare i tempi *)
+(*XXXXXXX *)
+ try
+(* *)
let {D.synthesized = synthesized; D.expected = expected} =
if computeinnertypes then
D.CicHash.find terms_to_types tt
(* We are already in an inner-type and Coscoy's double *)
(* type inference algorithm has not been applied. *)
{D.synthesized =
- CicReduction.whd context (T.type_of_aux' metasenv context tt) ;
- D.expected = None}
+(***CSC: patch per provare i tempi
+ CicReduction.whd context (xxx_type_of_aux' metasenv context tt) ; *)
+Cic.Sort (Cic.Type (CicUniv.fresh())); (* TASSI: non dovrebbe fare danni *)
+ D.expected = None}
in
- let innersort = T.type_of_aux' metasenv context synthesized in
+ 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
let annexpected,expected_available =
None,false
in
ainnertypes,synthesized, string_of_sort 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 (CicUniv.fresh())),"Type",false
+ (* TASSI non dovrebbe fare danni *)
+(* *)
in
let add_inner_type id =
match ainnertypes with
None -> ()
- | Some ainnertypes -> Hashtbl.add ids_to_inner_types id ainnertypes
+ | Some ainnertypes -> xxx_add ids_to_inner_types id ainnertypes
in
match tt with
C.Rel n ->
let id =
match get_nth context n with
(Some (C.Name s,_)) -> s
- | _ -> raise NameExpected
+ | _ -> "__" ^ string_of_int n
in
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
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) ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" && expected_available then
add_inner_type fresh_id'' ;
let exp_named_subst' =
let (_,canonical_context,_) =
List.find (function (m,_,_) -> n = m) metasenv
in
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" && expected_available then
add_inner_type fresh_id'' ;
C.AMeta (fresh_id'', n,
| Some _, None -> assert false (* due to typing rules *))
canonical_context l))
| C.Sort s -> C.ASort (fresh_id'', s)
- | C.Implicit -> C.AImplicit (fresh_id'')
+ | C.Implicit annotation -> C.AImplicit (fresh_id'', annotation)
| C.Cast (v,t) ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
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) ->
- Hashtbl.add ids_to_inner_sorts fresh_id''
+ xxx_add ids_to_inner_sorts fresh_id''
(string_of_sort innertype) ;
- let sourcetype = T.type_of_aux' metasenv context s in
- Hashtbl.add ids_to_inner_sorts (source_id_of_id fresh_id'')
+ 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) ;
let n' =
match n with
C.Anonymous -> n
| C.Name n' ->
- if D.does_not_occur 1 t then
+ if DoubleTypeInference.does_not_occur 1 t then
C.Anonymous
else
C.Name n'
(fresh_id'', n', aux' context idrefs s,
aux' ((Some (n, C.Decl s))::context) (fresh_id''::idrefs) t)
| C.Lambda (n,s,t) ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
- let sourcetype = T.type_of_aux' metasenv context s in
- Hashtbl.add ids_to_inner_sorts (source_id_of_id fresh_id'')
+ 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
begin
(fresh_id'',n, aux' context idrefs s,
aux' ((Some (n, C.Decl s)::context)) (fresh_id''::idrefs) t)
| C.LetIn (n,s,t) ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" then
add_inner_type fresh_id'' ;
C.ALetIn
(fresh_id'', n, aux' context idrefs s,
- aux' ((Some (n, C.Def s))::context) (fresh_id''::idrefs) t)
+ aux' ((Some (n, C.Def(s,None)))::context) (fresh_id''::idrefs) t)
| C.Appl l ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
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) ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" && expected_available then
add_inner_type fresh_id'' ;
let exp_named_subst' =
in
C.AMutInd (fresh_id'', uri, tyno, exp_named_subst')
| C.MutConstruct (uri,tyno,consno,exp_named_subst) ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" && expected_available then
add_inner_type fresh_id'' ;
let exp_named_subst' =
in
C.AMutConstruct (fresh_id'', uri, tyno, consno, exp_named_subst')
| C.MutCase (uri, tyno, outty, term, patterns) ->
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" then
add_inner_type fresh_id'' ;
C.AMutCase (fresh_id'', uri, tyno, aux' context idrefs outty,
let tys =
List.map (fun (name,_,ty,_) -> Some (C.Name name, C.Decl ty)) funs
in
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" then
add_inner_type fresh_id'' ;
C.AFix (fresh_id'', funno,
let tys =
List.map (fun (name,ty,_) -> Some (C.Name name, C.Decl ty)) funs
in
- Hashtbl.add ids_to_inner_sorts fresh_id'' innersort ;
+ xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" then
add_inner_type fresh_id'' ;
C.ACoFix (fresh_id'', funno,
) fresh_idrefs funs
)
in
- aux true None context idrefs t
+ 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
;;
let acic_of_cic_context metasenv context idrefs t =
ids_to_terms, ids_to_father_ids, ids_to_inner_sorts, ids_to_inner_types
;;
-let acic_object_of_cic_object obj =
+let aconjecture_of_conjecture seed ids_to_terms ids_to_father_ids
+ ids_to_inner_sorts ids_to_inner_types ids_to_hypotheses hypotheses_seed
+ metasenv (metano,context,goal) =
+ let acic_of_cic_context =
+ acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts
+ ids_to_inner_types metasenv in
+ let _, acontext,final_idrefs =
+ (List.fold_right
+ (fun binding (context, acontext,idrefs) ->
+ let hid = "h" ^ string_of_int !hypotheses_seed in
+ Hashtbl.add ids_to_hypotheses hid binding ;
+ incr hypotheses_seed ;
+ match binding with
+ Some (n,Cic.Def (t,None)) ->
+ let acic = acic_of_cic_context context idrefs t None in
+ (binding::context),
+ ((hid,Some (n,Cic.ADef acic))::acontext),(hid::idrefs)
+ | Some (n,Cic.Decl t) ->
+ let acic = acic_of_cic_context context idrefs t None in
+ (binding::context),
+ ((hid,Some (n,Cic.ADecl acic))::acontext),(hid::idrefs)
+ | None ->
+ (* Invariant: "" is never looked up *)
+ (None::context),((hid,None)::acontext),""::idrefs
+ | Some (_,Cic.Def (_,Some _)) -> assert false
+ ) context ([],[],[])
+ )
+ in
+ let agoal = acic_of_cic_context context final_idrefs goal None in
+ (metano,acontext,agoal)
+;;
+
+let asequent_of_sequent (metasenv:Cic.metasenv) (sequent:Cic.conjecture) =
+ let ids_to_terms = Hashtbl.create 503 in
+ let ids_to_father_ids = Hashtbl.create 503 in
+ let ids_to_inner_sorts = Hashtbl.create 503 in
+ let ids_to_inner_types = Hashtbl.create 503 in
+ let ids_to_hypotheses = Hashtbl.create 23 in
+ let hypotheses_seed = ref 0 in
+ let seed = ref 1 in (* 'i0' is used for the whole sequent *)
+ let (metano,acontext,agoal) =
+ aconjecture_of_conjecture seed ids_to_terms ids_to_father_ids
+ ids_to_inner_sorts ids_to_inner_types ids_to_hypotheses hypotheses_seed
+ metasenv sequent in
+ ("i0",metano,acontext,agoal),
+ ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,ids_to_hypotheses
+;;
+
+let acic_object_of_cic_object ?(eta_fix=true) obj =
let module C = Cic in
+ let module E = Eta_fixing in
let ids_to_terms = Hashtbl.create 503 in
let ids_to_father_ids = Hashtbl.create 503 in
let ids_to_inner_sorts = Hashtbl.create 503 in
acic_of_cic_context' seed ids_to_terms ids_to_father_ids ids_to_inner_sorts
ids_to_inner_types in
let acic_term_of_cic_term' = acic_term_of_cic_term_context' [] [] [] in
+ 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 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 abo = acic_term_of_cic_term' bo (Some ty) in
- let aty = acic_term_of_cic_term' ty None in
+ 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)
+ ("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params)
| C.Constant (id,None,ty,params) ->
- let aty = acic_term_of_cic_term' ty None in
+ let ty' = eta_fix [] [] ty in
+ let aty = acic_term_of_cic_term' ty' None in
C.AConstant
- ("mettereaposto",None,id,None,aty, params)
+ ("mettereaposto",None,id,None,aty,params)
| C.Variable (id,bo,ty,params) ->
+ let ty' = eta_fix [] [] ty in
let abo =
match bo with
None -> None
- | Some bo -> Some (acic_term_of_cic_term' bo (Some ty))
+ | Some bo ->
+ 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
+ let aty = acic_term_of_cic_term' ty' None in
C.AVariable
("mettereaposto",id,abo,aty, params)
| C.CurrentProof (id,conjectures,bo,ty,params) ->
- let aconjectures =
+ let conjectures' =
+ List.map
+ (function (i,canonical_context,term) ->
+ let 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 canonical_context' term in
+ (i,canonical_context',term')
+ ) conjectures
+ in
+ let aconjectures =
List.map
(function (i,canonical_context,term) as conjecture ->
let cid = "c" ^ string_of_int !conjectures_seed in
- Hashtbl.add ids_to_conjectures cid conjecture ;
+ xxx_add ids_to_conjectures cid conjecture ;
incr conjectures_seed ;
- let idrefs',revacanonical_context =
+ let (i,acanonical_context,aterm)
+ = aconjecture_of_conjecture' conjectures conjecture in
+ (cid,i,acanonical_context,aterm))
+ conjectures' in
+(* let idrefs',revacanonical_context =
let rec aux context idrefs =
function
[] -> idrefs,[]
| hyp::tl ->
let hid = "h" ^ string_of_int !hypotheses_seed in
let new_idrefs = hid::idrefs in
- Hashtbl.add ids_to_hypotheses hid hyp ;
+ xxx_add ids_to_hypotheses hid hyp ;
incr hypotheses_seed ;
match hyp with
(Some (n,C.Decl t)) ->
conjectures context idrefs t None
in
final_idrefs,(hid,Some (n,C.ADecl at))::atl
- | (Some (n,C.Def t)) ->
+ | (Some (n,C.Def (t,_))) ->
let final_idrefs,atl =
aux (hyp::context) new_idrefs tl in
let at =
in
final_idrefs,(hid,None)::atl
in
- aux [] [] (List.rev canonical_context)
+ aux [] [] (List.rev canonical_context)
in
let aterm =
acic_term_of_cic_term_context' conjectures
- canonical_context idrefs' term None
+ canonical_context idrefs' term None
in
- (cid,i,(List.rev revacanonical_context),aterm)
- ) conjectures 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 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
+ 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) ;
+ prerr_endline
+ ("++++++++++++ Tempi della type_of_aux'_add_time(" ^ string_of_int !number_new_type_of_aux' ^ "): " ^ string_of_float !type_of_aux'_add_time) ;
+ prerr_endline
+ ("++++++++++++ Tempi della type_of_aux'_add_time nella double_type_inference(" ^ string_of_int !DoubleTypeInference.number_new_type_of_aux'_double_work ^ ";" ^ string_of_int !DoubleTypeInference.number_new_type_of_aux'_prop ^ "/" ^ string_of_int !DoubleTypeInference.number_new_type_of_aux' ^ "): " ^ string_of_float !DoubleTypeInference.type_of_aux'_add_time) ;
+ prerr_endline
+ ("++++++++++++ Tempi della syntactic_equality_add_time: " ^ string_of_float !DoubleTypeInference.syntactic_equality_add_time) ;
+ prerr_endline
+ ("++++++++++ 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) ->
aobj,ids_to_terms,ids_to_father_ids,ids_to_inner_sorts,ids_to_inner_types,
ids_to_conjectures,ids_to_hypotheses
;;
+
+
projects / helm.git / blobdiff