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 *)
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
C.Sort C.Prop -> "Prop"
| C.Sort C.Set -> "Set"
| C.Sort C.Type -> "Type"
- | C.Sort C.CProp -> "CProp"
+ | 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: patch per provare i tempi
CicReduction.whd context (xxx_type_of_aux' metasenv context tt) ; *)
Cic.Sort Cic.Type ;
- D.expected = None}
+ D.expected = None}
in
incr number_new_type_of_aux' ;
let innersort = (*XXXXX *) xxx_type_of_aux' metasenv context synthesized (* Cic.Sort Cic.Prop *) in
let id =
match get_nth context n with
(Some (C.Name s,_)) -> s
- | _ -> raise NameExpected
+ | _ -> "__" ^ string_of_int n
in
xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" && expected_available then
| 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) ->
xxx_add ids_to_inner_sorts fresh_id'' innersort ;
if innersort = "Prop" then
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
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 bo' = E.eta_fix [] bo in
- let ty' = E.eta_fix [] ty 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)
| C.Constant (id,None,ty,params) ->
- let ty' = E.eta_fix [] ty 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)
| C.Variable (id,bo,ty,params) ->
- let ty' = E.eta_fix [] ty in
+ let ty' = eta_fix [] [] ty in
let abo =
match bo with
None -> None
| Some bo ->
- let bo' = E.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
List.map
(function (i,canonical_context,term) ->
let canonical_context' =
- List.map
- (function
- None -> None
- | Some (n, C.Decl t)-> Some (n, C.Decl (E.eta_fix conjectures t))
- | Some (n, C.Def (t,None)) ->
- Some (n, C.Def ((E.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' = E.eta_fix conjectures term in
+ let term' = eta_fix conjectures canonical_context' term in
(i,canonical_context',term')
) conjectures
in
- let aconjectures =
+ let aconjectures =
List.map
(function (i,canonical_context,term) as conjecture ->
let cid = "c" ^ string_of_int !conjectures_seed in
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,[]
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' = E.eta_fix conjectures' bo in
- let ty' = E.eta_fix conjectures' ty 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
("++++++++++++ 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
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