* http://cs.unibo.it/helm/.
*)
-let hashtbl_add_time = ref 0.0;;
+type sort_kind = [ `Prop | `Set | `Type of CicUniv.universe | `CProp ]
+
+let string_of_sort = function
+ | `Prop -> "Prop"
+ | `Set -> "Set"
+ | `Type u -> "Type:" ^ string_of_int (CicUniv.univno u)
+ | `CProp -> "CProp"
+
+let sort_of_sort = function
+ | Cic.Prop -> `Prop
+ | Cic.Set -> `Set
+ | Cic.Type u -> `Type u
+ | 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
;;
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
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? *)
(*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" (* TASSI OK*)
- | C.Sort C.CProp -> "CProp"
- | C.Meta _ ->
-prerr_endline "Cic2acic: string_of_sort applied to a meta" ;
- "?"
+ C.Sort C.Prop -> `Prop
+ | C.Sort C.Set -> `Set
+ | C.Sort (C.Type u) -> `Type u
+ | C.Meta _ -> `Type (CicUniv.fresh())
+ | C.Sort C.CProp -> `CProp
| t ->
-prerr_endline ("Cic2acic: string_of_sort applied to: " ^ CicPp.ppterm t) ;
+ prerr_endline ("Cic2acic.sort_of applied to: " ^ CicPp.ppterm t) ;
assert false
in
let ainnertypes,innertype,innersort,expected_available =
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
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 (CicUniv.fresh())),"Type",false
+ let u = CicUniv.fresh() in
+ None,Cic.Sort (Cic.Type u),`Type u,false
(* TASSI non dovrebbe fare danni *)
(* *)
in
| _ -> "__" ^ 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
| C.Meta (n,l) ->
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
| 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
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
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
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
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)
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
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
) 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 =
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 sequent =
+ let i,canonical_context,term = sequent in
+ let canonical_context' =
+ List.fold_right
+ (fun d canonical_context' ->
+ let d =
+ match d with
+ None -> None
+ | Some (n, Cic.Decl t)->
+ Some (n, Cic.Decl (Unshare.unshare t))
+ | Some (n, Cic.Def (t,None)) ->
+ Some (n, Cic.Def ((Unshare.unshare t),None))
+ | Some (_,Cic.Def (_,Some _)) -> assert false
+ in
+ d::canonical_context'
+ ) canonical_context []
+ in
+ let term' = Unshare.unshare term in
+ (i,canonical_context',term')
+ in
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
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 t = if eta_fix then E.eta_fix metasenv context t else t in
+ Unshare.unshare t in
let aobj =
match obj with
- C.Constant (id,Some bo,ty,params) ->
+ 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) ->
+ ("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) ->
+ ("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
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' =
List.map
(function (i,canonical_context,term) ->
let canonical_context' =
List.fold_right
(fun d canonical_context' ->
- let d' =
+ let d =
match d with
None -> None
| Some (n, C.Decl t)->
| Some (_,C.Def (_,Some _)) -> assert false
in
d::canonical_context'
- ) [] canonical_context
+ ) canonical_context []
in
let term' = eta_fix conjectures canonical_context' term in
(i,canonical_context',term')
= 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
- xxx_add ids_to_hypotheses hid hyp ;
- incr hypotheses_seed ;
- match hyp with
- (Some (n,C.Decl t)) ->
- let final_idrefs,atl =
- aux (hyp::context) new_idrefs tl in
- let at =
- acic_term_of_cic_term_context'
- conjectures context idrefs t None
- in
- final_idrefs,(hid,Some (n,C.ADecl at))::atl
- | (Some (n,C.Def (t,_))) ->
- let final_idrefs,atl =
- aux (hyp::context) new_idrefs tl in
- let at =
- acic_term_of_cic_term_context'
- conjectures context idrefs t None
- in
- final_idrefs,(hid,Some (n,C.ADef at))::atl
- | None ->
- let final_idrefs,atl =
- aux (hyp::context) new_idrefs tl
- in
- final_idrefs,(hid,None)::atl
- in
- aux [] [] (List.rev canonical_context)
- in
- let aterm =
- acic_term_of_cic_term_context' conjectures
- canonical_context idrefs' term None
- in
- (cid,i,(List.rev revacanonical_context),aterm)
- ) conjectures' in *)
- let time1 = Sys.time () 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) ;
("++++++++++ 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 tys =
+ List.map
+ (fun (name,i,arity,cl) ->
+ (name,i,Unshare.unshare arity,
+ List.map (fun (name,ty) -> name,Unshare.unshare ty) cl)) tys in
let context =
List.map
- (fun (name,_,arity,_) -> Some (C.Name name, C.Decl arity)) tys in
+ (fun (name,_,arity,_) ->
+ Some (C.Name name, C.Decl (Unshare.unshare arity))) tys in
let idrefs = List.map (function _ -> gen_id seed) tys in
let atys =
List.map2
(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
;;
+let plain_acic_term_of_cic_term =
+ let module C = Cic in
+ let mk_fresh_id =
+ let id = ref 0 in
+ function () -> incr id; "i" ^ string_of_int !id in
+ let rec aux context t =
+ let fresh_id = mk_fresh_id () in
+ match t with
+ C.Rel n ->
+ let idref,id =
+ match get_nth context n with
+ idref,(Some (C.Name s,_)) -> idref,s
+ | idref,_ -> idref,"__" ^ string_of_int n
+ in
+ C.ARel (fresh_id, idref, n, id)
+ | C.Var (uri,exp_named_subst) ->
+ let exp_named_subst' =
+ List.map
+ (function i,t -> i, (aux context t)) exp_named_subst
+ in
+ C.AVar (fresh_id,uri,exp_named_subst')
+ | C.Implicit _
+ | C.Meta _ -> assert false
+ | C.Sort s -> C.ASort (fresh_id, s)
+ | C.Cast (v,t) ->
+ C.ACast (fresh_id, aux context v, aux context t)
+ | C.Prod (n,s,t) ->
+ C.AProd
+ (fresh_id, n, aux context s,
+ aux ((fresh_id, Some (n, C.Decl s))::context) t)
+ | C.Lambda (n,s,t) ->
+ C.ALambda
+ (fresh_id,n, aux context s,
+ aux ((fresh_id, Some (n, C.Decl s))::context) t)
+ | C.LetIn (n,s,t) ->
+ C.ALetIn
+ (fresh_id, n, aux context s,
+ aux ((fresh_id, Some (n, C.Def(s,None)))::context) t)
+ | C.Appl l ->
+ C.AAppl (fresh_id, List.map (aux context) l)
+ | C.Const (uri,exp_named_subst) ->
+ let exp_named_subst' =
+ List.map
+ (function i,t -> i, (aux context t)) exp_named_subst
+ in
+ C.AConst (fresh_id, uri, exp_named_subst')
+ | C.MutInd (uri,tyno,exp_named_subst) ->
+ let exp_named_subst' =
+ List.map
+ (function i,t -> i, (aux context t)) exp_named_subst
+ in
+ C.AMutInd (fresh_id, uri, tyno, exp_named_subst')
+ | C.MutConstruct (uri,tyno,consno,exp_named_subst) ->
+ let exp_named_subst' =
+ List.map
+ (function i,t -> i, (aux context t)) exp_named_subst
+ in
+ C.AMutConstruct (fresh_id, uri, tyno, consno, exp_named_subst')
+ | C.MutCase (uri, tyno, outty, term, patterns) ->
+ C.AMutCase (fresh_id, uri, tyno, aux context outty,
+ aux context term, List.map (aux context) patterns)
+ | C.Fix (funno, funs) ->
+ let tys =
+ List.map
+ (fun (name,_,ty,_) -> mk_fresh_id (), Some (C.Name name, C.Decl ty)) funs
+ in
+ C.AFix (fresh_id, funno,
+ List.map2
+ (fun (id,_) (name, indidx, ty, bo) ->
+ (id, name, indidx, aux context ty, aux (tys@context) bo)
+ ) tys funs
+ )
+ | C.CoFix (funno, funs) ->
+ let tys =
+ List.map (fun (name,ty,_) ->
+ mk_fresh_id (),Some (C.Name name, C.Decl ty)) funs
+ in
+ C.ACoFix (fresh_id, funno,
+ List.map2
+ (fun (id,_) (name, ty, bo) ->
+ (id, name, aux context ty, aux (tys@context) bo)
+ ) tys funs
+ )
+ in
+ aux
+;;
+let plain_acic_object_of_cic_object obj =
+ let module C = Cic in
+ let mk_fresh_id =
+ let id = ref 0 in
+ function () -> incr id; "it" ^ string_of_int !id
+ in
+ match obj with
+ C.Constant (id,Some bo,ty,params,attrs) ->
+ let abo = plain_acic_term_of_cic_term [] bo in
+ let aty = plain_acic_term_of_cic_term [] ty in
+ C.AConstant
+ ("mettereaposto",Some "mettereaposto2",id,Some abo,aty,params,attrs)
+ | C.Constant (id,None,ty,params,attrs) ->
+ let aty = plain_acic_term_of_cic_term [] ty in
+ C.AConstant
+ ("mettereaposto",None,id,None,aty,params,attrs)
+ | C.Variable (id,bo,ty,params,attrs) ->
+ let abo =
+ match bo with
+ None -> None
+ | Some bo -> Some (plain_acic_term_of_cic_term [] bo)
+ in
+ let aty = plain_acic_term_of_cic_term [] ty in
+ C.AVariable
+ ("mettereaposto",id,abo,aty,params,attrs)
+ | C.CurrentProof _ -> assert false
+ | C.InductiveDefinition (tys,params,paramsno,attrs) ->
+ let context =
+ List.map
+ (fun (name,_,arity,_) ->
+ mk_fresh_id (), Some (C.Name name, C.Decl arity)) tys in
+ let atys =
+ List.map2
+ (fun (id,_) (name,inductive,ty,cons) ->
+ let acons =
+ List.map
+ (function (name,ty) ->
+ (name,
+ plain_acic_term_of_cic_term context ty)
+ ) cons
+ in
+ (id,name,inductive,plain_acic_term_of_cic_term [] ty,acons)
+ ) context tys
+ in
+ C.AInductiveDefinition ("mettereaposto",atys,params,paramsno,attrs)
+;;